From 271f8ac3fc635fcf96d3226dc7d37f81c9755c2b Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 28 六月 2024 02:21:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 8
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 32 ++--
src/main/java/com/zy/core/thread/JarThread.java | 29 +++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 56 ++++----
src/main/resources/mapper/BasJarMastMapper.xml | 42 +++++++
src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java | 30 ++++
src/main/java/com/zy/asrs/service/BasJarMastService.java | 4
src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java | 5
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 46 +++---
src/main/resources/application.yml | 80 +++++++++++++
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 2
11 files changed, 253 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
index d2c7770..7696029 100644
--- a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
@@ -19,10 +19,15 @@
List<BasJarMast> getJarMastByJarIdAndStatusList(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+ List<BasJarMast> getJarMastByJarIdAndStatusListB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+
BasJarMast getJarMastByJarIdMax(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+ BasJarMast getJarMastByJarIdMaxB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
BasJarMast getJarMastByJarIdMin(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+ BasJarMast getJarMastByJarIdMinB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+
Integer getJarMastByJarIdCount(@Param("jarId") Integer jarId);
Integer selectJarMastOperationByStatusList(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
diff --git a/src/main/java/com/zy/asrs/service/BasJarMastService.java b/src/main/java/com/zy/asrs/service/BasJarMastService.java
index 924f6af..dd00056 100644
--- a/src/main/java/com/zy/asrs/service/BasJarMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasJarMastService.java
@@ -15,15 +15,19 @@
List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,List<Integer> statusList);
+ List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList);
+
List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type);
BasJarMast getJarMastByJarIdMax(Integer jarId);
BasJarMast getJarMastByJarIdMax(Integer jarId,Integer statusStart,Integer statusEnd);
+ BasJarMast getJarMastByJarIdMaxB(Integer jarId,Integer statusStart,Integer statusEnd);
BasJarMast getJarMastByJarIdMin(Integer jarId);
BasJarMast getJarMastByJarIdMin(Integer jarId,Integer statusStart,Integer statusEnd);
+ BasJarMast getJarMastByJarIdMinB(Integer jarId,Integer statusStart,Integer statusEnd);
Integer getJarMastByJarIdCount(Integer jarId);
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
index d0f5819..b320e29 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -39,6 +39,11 @@
}
@Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.getJarMastByJarIdAndStatusListB(jarId,statusList);
+ }
+
+ @Override
public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type) {
ArrayList<Integer> statusList = new ArrayList<>();
switch (type){
@@ -54,7 +59,8 @@
if (type!=6){
statusList.add(12);//鍐峰嵈瀹屾垚
}
- statusList.add(13);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
+// statusList.add(13);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
+ statusList.add(13);//鍑哄簱涓�
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
@@ -110,6 +116,16 @@
return this.baseMapper.getJarMastByJarIdMax(jarId,statusList);
}
+ @Override
+ public BasJarMast getJarMastByJarIdMaxB(Integer jarId,Integer statusStart,Integer statusEnd) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ return this.baseMapper.getJarMastByJarIdMaxB(jarId,statusList);
+ }
+
+
/*
* 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
* */
@@ -131,6 +147,18 @@
return this.baseMapper.getJarMastByJarIdMin(jarId,statusList);
}
+ /*
+ * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
+ * */
+ @Override
+ public BasJarMast getJarMastByJarIdMinB(Integer jarId,Integer statusStart,Integer statusEnd) {
+ List<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ return this.baseMapper.getJarMastByJarIdMinB(jarId,statusList);
+ }
+
@Override
public Integer getJarMastByJarIdCount(Integer jarId) {
return this.baseMapper.getJarMastByJarIdCount(jarId);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3213d0b..e83ec31 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -56,7 +56,7 @@
public static final long COMMAND_TIMEOUT = 5 * 1000;
// private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
- private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{9,3},{10,4},{11,4}};
+ private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
@Autowired
private CommonService commonService;
@@ -4710,13 +4710,11 @@
//闂ㄤ綔涓� 鏃�
//鑷姩銆佺┖闂层�佸彸闂ㄥ叧闂�� Other宸﹂棬鍏抽棴
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0){
- switch (sign){
- case 5:
- if (jarWrkMastExecuteGenerate5(jarSlave,sign)){
- signExecute[jarSlave.getId()-5] = true;
- break;//鍑虹～鍖栫綈 ===銆� 鍏ュ喎鍗存Ы
- }
+ if (jarWrkMastExecuteGenerate5(jarSlave,sign)){
+ signExecute[jarSlave.getId()-5] = true;
+ //鍑虹～鍖栫綈 ===銆� 鍏ュ喎鍗存Ы
}
+ return signExecute;
}
} catch (Exception e){
log.error("{}鍙风～鍖栫綈JarWrkMastExecute浠诲姟鍒涘缓寮傚父,寮傚父鍘熷洜={}",jarSlave.getId(),e.getMessage());
@@ -5111,26 +5109,26 @@
if (wrkMastExecuteService.getWrkMastExecuteByJarIdCount(jarSlave.getId())!=0){
return false;
}
- List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
- add(14);//鍐峰嵈瀹屾垚
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListB(jarSlave.getId(), new ArrayList<Integer>() {{
+ add(12);//鍐峰嵈瀹屾垚
}});
if (basJarMastList.isEmpty()){
return false;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),7)!=0){
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),6)!=0){
return false;
}
- BasJarMast jarMastByJarIdMin = basJarMastService.getJarMastByJarIdMin(jarSlave.getId(),14,14);
+ BasJarMast jarMastByJarIdMin = basJarMastService.getJarMastByJarIdMinB(jarSlave.getId(),12,12);
if (Cools.isEmpty(jarMastByJarIdMin)){
return false;
}
-
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
- return false;
- }
+//
+// //鍒ゆ柇灏忚溅鐘舵��
+// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),3,SteStatusType.IDLE)){
+// return false;
+// }
//鍒ゆ柇RGV鐘舵��
JarSlave.RgvStn rgvStn = jarSlave.getJarOutRgv().get(0);
@@ -5154,8 +5152,8 @@
//闂ㄤ綔涓� 鏃�
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0){
- //鍏宠繘鏂欓棬
- if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByJarIdMin,basJar.getBurial(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),3,1})){
+ //鍐峰嵈瀹屾垚涓婅緭閫佺嚎
+ if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByJarIdMin,basJar.getBurial(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),9,1})){
log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByJarIdMin));
}
return true;
@@ -6249,7 +6247,7 @@
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocolOther.getJarNo())){
//鍒ゆ柇灏忚溅鐘舵��
if (wrkMastExecute.getIoType()==7){ //7 B=>C
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
+ if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
//璋冭溅 == > 绉诲姩
if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_MOVE_14,false,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
@@ -6471,7 +6469,7 @@
log.error("9锛氬嚭鍐峰嵈妲絋wo==>浠诲姟涓嬪彂===>琛�={}",6468);
// 涓嬪彂绔欑偣淇℃伅
staProtocol.setWorkNo(wrkMastExecute.getWrkNo().intValue());
- staProtocol.setStaNo(staProtocol.getStaNo());
+ staProtocol.setStaNo(wrkMastExecute.getOutStaNo());
if (!MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol))) {
return false;
}
@@ -6549,7 +6547,7 @@
//绉昏蛋 == > 2
if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
return true;
}
@@ -6566,20 +6564,20 @@
//璋冭溅 == > 绉诲姩
if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false,wrkMastExecute.getJarId())){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
}
} else {//11:B=>A
@@ -6587,20 +6585,20 @@
//璋冭溅 == > 绉诲姩
if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false,wrkMastExecute.getJarId())){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
} else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
}
}
@@ -6609,13 +6607,13 @@
//璋冭溅 == > endRow
if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
- wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
}
return true;
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index 874258a..6860f3b 100644
--- a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
+++ b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
@@ -8,7 +8,7 @@
* RGV浣嶇疆鏄惁涓庣～鍖栫綈姝ｅ
*/
public static boolean steAndJarNowRow(short steNowRow , Integer jarNo){
- return (steNowRow==(short) 1 && (jarNo == 2 || jarNo == 4)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3));
+ return (steNowRow==(short) 1 && (jarNo == 2 || jarNo == 4 || jarNo == 5 || jarNo == 6)) || (steNowRow==(short)3 && (jarNo == 1 || jarNo == 3));
}
/**
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index c0a5e5d..8fdd966 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -118,6 +118,21 @@
private void readStatus(){
try {
if (slave.getId()>4){
+ if (null == jarProtocol) {
+ jarProtocol = new JarProtocol();
+ jarProtocol.setJarNo(slave.getId());
+ }
+ jarProtocol.setMode(2);//妯″紡
+ jarProtocol.setStatus((short)0);//鐘舵��
+ jarProtocol.setAutoing(true);//鑷姩
+
+ jarProtocol.setRightDoor(true);//宸﹂棬鐘舵�� //鍑烘枡闂�
+ jarProtocol.setLeftDoor(true);//鍙抽棬鐘舵�� //杩涙枡闂�
+
+ jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+ jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+ jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+ jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
return;
}
OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
@@ -157,7 +172,7 @@
//
// jarProtocol.setMode(2);//妯″紡
-// jarProtocol.setStatus((short)1);//鐘舵��
+// jarProtocol.setStatus((short)6);//鐘舵��
// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
@@ -251,7 +266,7 @@
do {
try{
if(!result1.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -263,14 +278,14 @@
if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){
break;
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -286,7 +301,7 @@
do {
try{
if(!result2.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
@@ -298,14 +313,14 @@
if (transInt16 == resultS1 || transInt16 == (short) 3){
break;
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS2);
Thread.sleep(100);
writeCount++;
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index b3d3f21..3c0703b 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -371,8 +371,8 @@
if (result != null && result.IsSuccess) {
Thread.sleep(200);
this.readStatus();
- log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
return true;
} else {
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -430,8 +430,8 @@
if (result != null && result.IsSuccess) {
Thread.sleep(200);
this.readStatus();
- log.info("RGV 宸ヤ綅2鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅2鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ log.info("RGV 宸ヤ綅2鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅2鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
return true;
} else {
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅2鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 0929642..0adeb16 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -357,7 +357,7 @@
do {
try{
if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result = siemensNet.Write("DB100.0", array);
Thread.sleep(100);
writeCount++;
@@ -380,12 +380,12 @@
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
){
try{
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
}catch (Exception e){
try{
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
}catch (Exception e1){
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
}
}
try{
@@ -393,12 +393,12 @@
}catch (Exception e){
}
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result = siemensNet.Write("DB100.0", array);
writeCount++;
continue;
} else {
- log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
break;
}
}
@@ -455,8 +455,8 @@
if (result != null && result.IsSuccess) {
Thread.sleep(200);
this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
return true;
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -498,7 +498,7 @@
do {
try{
if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result = siemensNet.Write("DB100.20", array);
Thread.sleep(100);
writeCount++;
@@ -521,12 +521,12 @@
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
){
try{
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
}catch (Exception e){
try{
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
}catch (Exception e1){
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+ log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
}
}
try{
@@ -534,12 +534,12 @@
}catch (Exception e){
}
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
result = siemensNet.Write("DB100.20", array);
writeCount++;
continue;
} else {
- log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
break;
}
}
@@ -596,8 +596,8 @@
if (result != null && result.IsSuccess) {
Thread.sleep(200);
this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
return true;
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 12bcefd..31a3a75 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -563,7 +563,7 @@
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSONString(staProtocol));
}
}
@@ -623,7 +623,7 @@
do {
try{
if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -635,14 +635,14 @@
if (status == 1){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -667,7 +667,7 @@
do {
try{
if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
@@ -680,14 +680,14 @@
if (status == resultS2){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
writeCount++;
@@ -769,7 +769,7 @@
do {
try{
if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -782,14 +782,14 @@
if (statusR1 == resultS1){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -808,7 +808,7 @@
do {
try{
if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
writeCount++;
@@ -821,7 +821,7 @@
if (statusR1 == resultS2){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
@@ -829,7 +829,7 @@
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
Thread.sleep(100);
writeCount++;
@@ -886,7 +886,7 @@
do {
try{
if(!result1.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -898,14 +898,14 @@
if (transInt16 == resultS1){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result1 = siemensS7Net.Write(resultV1, resultS1);
Thread.sleep(100);
writeCount++;
@@ -921,7 +921,7 @@
do {
try{
if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS1);
Thread.sleep(100);
writeCount++;
@@ -933,14 +933,14 @@
if (transInt16 == resultS1){
break;
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS1);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV2, resultS1);
Thread.sleep(100);
writeCount++;
@@ -954,11 +954,11 @@
if (!result1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSONString(staProtocol)));
+ log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSONString(staProtocol));
} else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(staProtocol)));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSONString(staProtocol));
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f1ee57..3a68efc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -522,6 +522,86 @@
devpPlcId: ${wcs-slave.devp[1].id}
steNo: 2
row: 2
+ # JAR4
+ jar[4]:
+ id: 5
+ ip: 10.10.10.190
+ port: 120
+ jarOtherId: 2
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 612
+ rgvNo: 623
+ steNo: 1
+ row: 3
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 623
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 625
+ row: 1
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 1
+ row: 1
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 1
+ row: 1
+ # JAR4
+ jar[5]:
+ id: 6
+ ip: 10.10.10.193
+ port: 120
+ jarOtherId: 3
+ # 纭寲缃愬叆搴撶珯鐐�
+ jarInSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
+ # 纭寲缃愬嚭搴撶珯鐐�
+ jarOutSta[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
+ row: 1
+ # 纭寲缃愬叆搴揜GV
+ jarInRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 624
+ row: 1
+ # 纭寲缃愬嚭搴揜GV
+ jarOutRgv[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ rgvNo: 626
+ row: 2
+ # 纭寲缃愬叆搴撶┛姊澘
+ jarInSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
+ # 纭寲缃愬嚭搴撶┛姊澘
+ jarOutSte[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ steNo: 2
+ row: 2
# ste1
ste[0]:
id: 1
diff --git a/src/main/resources/mapper/BasJarMastMapper.xml b/src/main/resources/mapper/BasJarMastMapper.xml
index ae49b0b..6b72f0e 100644
--- a/src/main/resources/mapper/BasJarMastMapper.xml
+++ b/src/main/resources/mapper/BasJarMastMapper.xml
@@ -53,6 +53,20 @@
order by jar_loc_digit desc
</select>
+ <select id="getJarMastByJarIdAndStatusListB" resultMap="BaseResultMap">
+ select * from asr_bas_jar_mast
+ where 1=1
+ and
+ (
+ status in
+ <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ )
+ and burial = #{jarId}
+ order by jar_loc_digit desc
+ </select>
+
<select id="getJarMastByJarIdMax" resultMap="BaseResultMap">
select top 1 * from asr_bas_jar_mast
where 1=1
@@ -67,6 +81,20 @@
order by jar_loc_digit desc
</select>
+ <select id="getJarMastByJarIdMaxB" resultMap="BaseResultMap">
+ select top 1 * from asr_bas_jar_mast
+ where 1=1
+ and
+ (
+ status in
+ <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ )
+ and burial = #{jarId}
+ order by jar_loc_digit desc
+ </select>
+
<select id="getJarMastByJarIdMin" resultMap="BaseResultMap">
select top 1 * from asr_bas_jar_mast
where 1=1
@@ -81,6 +109,20 @@
order by jar_loc_digit asc
</select>
+ <select id="getJarMastByJarIdMinB" resultMap="BaseResultMap">
+ select top 1 * from asr_bas_jar_mast
+ where 1=1
+ and
+ (
+ status in
+ <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ )
+ and burial = #{jarId}
+ order by jar_loc_digit asc
+ </select>
+
<select id="getJarMastByJarIdCount" resultType="Integer">
select count(1) from asr_bas_jar_mast
where 1=1
--
Gitblit v1.9.1