From 7e7d10ad23b4ad201ad305f508b82ea8854464bd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 13:43:29 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/system/controller/RoleController.java    |   24 ++-
 src/main/java/com/zy/system/service/impl/RoleServiceImpl.java |   12 +
 src/main/resources/mapper/RoleMapper.xml                      |   33 ++++
 src/main/java/com/zy/asrs/entity/TaskWrk.java                 |    7 +
 src/main/java/com/zy/system/service/RoleService.java          |    6 
 src/main/resources/application-prod.yml                       |    8 
 src/main/java/com/zy/system/entity/Permission.java            |    2 
 src/main/java/com/zy/asrs/controller/CrnController.java       |   13 +
 src/main/resources/mapper/TaskWrkMapper.xml                   |    1 
 pom.xml                                                       |    2 
 src/main/java/com/zy/asrs/entity/ChartBean.java               |    3 
 src/main/java/com/zy/system/mapper/RoleMapper.java            |    9 +
 src/main/java/com/zy/core/model/protocol/StaProtocol.java     |    3 
 src/main/java/com/zy/common/web/AuthController.java           |    2 
 src/main/java/com/zy/core/thread/SiemensDevpThread.java       |  269 +++++++++----------------------------
 15 files changed, 172 insertions(+), 222 deletions(-)

diff --git a/pom.xml b/pom.xml
index aaa5938..0702162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <cool.version>3.2.0</cool.version>
+        <cool.version>3.6.0</cool.version>
         <mysql-driver.version>5.1.47</mysql-driver.version>
         <mybatis-plus.version>2.3.2</mybatis-plus.version>
         <fastjson.version>1.2.58</fastjson.version>
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 2bb0d19..3046c66 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -288,7 +288,11 @@
                     vo.setLocNo(wrkMast.getLocNo());    //  鐩爣搴撲綅
                 }
             } else {
-                vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
+                if (Cools.isEmpty(crnProtocol.modeType)){
+                    vo.setDeviceStatus(CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
+                } else {
+                    vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
+                }
             }
             vo.setXspeed(crnProtocol.getXSpeed());  //  璧拌閫熷害锛坢/min)
             vo.setYspeed(crnProtocol.getYSpeed());  //  鍗囬檷閫熷害锛坢/min)
@@ -297,8 +301,11 @@
             vo.setYdistance(crnProtocol.getYDistance());  //  鍗囬檷璺濈(Km)
             vo.setXduration(crnProtocol.getXDuration());    //  璧拌鏃堕暱(H)
             vo.setYduration(crnProtocol.getYDuration());    //  鍗囬檷鏃堕暱(H)
-
-            vo.setStatusType(crnProtocol.modeType.desc);   //  妯″紡鐘舵��
+            if (Cools.isEmpty(crnProtocol.modeType)){
+                vo.setStatusType(CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
+            } else {
+                vo.setStatusType(crnProtocol.modeType.desc);   //  妯″紡鐘舵��
+            }
             vo.setWrkStatus(crnProtocol.getStatusType().id);     //  浠诲姟鐘舵��
             vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿");  //  鏈夌墿
             vo.setBay(crnProtocol.getBay());    //  鍒�
diff --git a/src/main/java/com/zy/asrs/entity/ChartBean.java b/src/main/java/com/zy/asrs/entity/ChartBean.java
index 5946916..ef5c46d 100644
--- a/src/main/java/com/zy/asrs/entity/ChartBean.java
+++ b/src/main/java/com/zy/asrs/entity/ChartBean.java
@@ -1,5 +1,8 @@
 package com.zy.asrs.entity;
 
+import lombok.Data;
+
+@Data
 public class ChartBean {
 	private String name;
 	private double y;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index d2149bd..ce9f34c 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -187,6 +187,13 @@
     @TableField("CRN_NO")
     private Integer crnNo;
 
+    /**
+     * 鎸囦护鎵ц姝ュ簭
+     */
+    @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+    @TableField("COMMAND_STEP")
+    private Integer commandStep;
+
     @ApiModelProperty(value = "绉诲簱鏍囪")
     @TableField("TRANSFER_MARK")
     private Integer transferMark;
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index fff96c3..e616094 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -240,7 +240,7 @@
         functions.put("spread", true);
         List<Map> funcs = new ArrayList<>();
         functions.put("children", funcs);
-        List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
+        List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("STATUS", 1));
         for (Permission permission : permissions) {
             Map<String, Object> func = new HashMap<>();
             func.put("title", permission.getName());
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 463846a..0e14a7c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -81,6 +81,9 @@
     // Super鏈夋棤淇℃伅
     private boolean loadingSuper = true;
 
+    //鎸囦护ID
+    private Integer commandId;
+
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c50efbf..110e093 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,7 +9,6 @@
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.CommandInfo;
 import com.zy.asrs.entity.CommandInfoLog;
@@ -19,7 +18,6 @@
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CommandStatusType;
 import com.zy.core.enums.IoModeType;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
@@ -50,30 +48,11 @@
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
         add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);
     }};
-    /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-        add(200);add(201);add(202);add(203);
-        add(204);add(205);add(206);add(207);
-        add(208);add(209);add(210);add(211);
-        add(212);add(213);add(214);add(215);
-        add(216);add(217);add(218);add(219);
-        add(220);add(221);add(222);add(223);
-        add(224);add(225);add(226);add(227);
-        add(228);add(229);add(230);add(231);
-        add(232);add(233);add(234);add(235);
-    }};
-    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
-        add(300);add(301);add(302);add(303);
-        add(304);add(305);add(306);add(307);
-    }};
-    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
-        add(400);add(401);add(402);add(403);
-        add(404);add(405);add(406);add(407);
-    }};*/
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 7;
+    private int barcodeSize = 4;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -84,17 +63,11 @@
      * 4.鍑哄簱妯″紡
      */
     public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
+    //    public IoModeType ioMode = IoModeType.NONE;
     private ArrayList<Integer> getStaNo() {
         switch (slave.getId()) {
             case 1:
                 return staNos1;
-            /*case 2:
-                return staNos2;
-            case 3:
-                return staNos3;
-            case 4:
-                return staNos4;*/
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -123,7 +96,6 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol)task.getData());
-                        read();
                         break;
                     default:
                         break;
@@ -207,7 +179,7 @@
                 }
                 staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8 + 4));   // 鐩爣绔�
+                staProtocol.setStaNo((int)siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 鐩爣绔�
 
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
@@ -225,133 +197,21 @@
             }
         }
 
-        OperateResultExOne<byte[]> resultAgvAndPlc = siemensS7Net.Read("DB102.0", (short) 30);
-        if (resultAgvAndPlc.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                int sign =(i+2)/2-1;
-                if ((i+2)%2!=0){
-                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                    StaProtocol staProtocol = station.get(siteId);
-                    if (null == staProtocol) {
-                        staProtocol = new StaProtocol();
-                        staProtocol.setSiteId(siteId);
-                        station.put(siteId, staProtocol);
-                    }
-//                    staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4));     // 鍏佽鍙栬揣
-//                    staProtocol.setAgvStartPlace((short)0);   // 鍏佽鏀捐揣
-                    continue;
-                }
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-//                staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6));     // 鍏佽鍙栬揣
-//                staProtocol.setAgvStartPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2));   // 鍏佽鏀捐揣
-            }
-        }
-
-        OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB132.0", (short) 30);
-        if (resultAgvAndPlcOk.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                int sign =(i+2)/2-1;
-                if ((i+2)%2!=0){
-                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                    StaProtocol staProtocol = station.get(siteId);
-                    if (null == staProtocol) {
-                        staProtocol = new StaProtocol();
-                        staProtocol.setSiteId(siteId);
-                        station.put(siteId, staProtocol);
-                    }
-//                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6+4));     // 鍏佽鍙栬揣
-//                    staProtocol.setAgvTargetPlace((short)0);   // 鍏佽鏀捐揣
-                    continue;
-                }
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-//                try{
-//                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6));     // 鍙栬揣瀹屾垚
-//                    if (staProtocol.getAgvTargetPick()!=0){
-//                        System.out.println(staProtocol.getAgvTargetPick());
-//                    }
-//                    staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6 + 2));   // 鏀捐揣瀹屾垚
-//                    if (staProtocol.getAgvTargetPlace()!=0){
-//                        System.out.println(staProtocol.getAgvTargetPlace());
-//                    }
-//                }catch (Exception e){
-//                    log.error(""+e);
-//                }
-            }
-        }
-
-
-        if (slave.getId() == 1) {
-            //鏉$爜
-            //Thread.sleep(200);
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 32);
-            if (result2.IsSuccess) {
-                for (int i = 0; i < 4; i++) {
-                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
-                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                        barcodeThread.setBarcode(barcode);
-                    }
-                }
-            }
-
-
-            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB13.2", (short) (staNoSize * 4));
-            if (resultErr.IsSuccess) {
-                for (int i = 0; i < staNoSize; i++) {
-                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1);
-                    StaProtocol staProtocol = station.get(siteId);
-//                    staProtocol.setBreakerErr(status[0]);
-//                    staProtocol.setInfraredErr(status[1]);
-//                    staProtocol.setOutTimeErr(status[2]);
-//                    staProtocol.setSeizeSeatErr(status[3]);
-//                    staProtocol.setWrkYgoodsN(status[4]);
-//                    staProtocol.setInverterErr(status[5]);
-//                    staProtocol.setContactErr(status[6]);
-//                    staProtocol.setUpcontactErr(status[7]);
-
+        //鏉$爜
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0",(short) (barcodeSize*8));
+        if (result2.IsSuccess) {
+            for (int i = 0; i < barcodeSize; i++) {
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
                 }
             }
 
         }
 
-
-//        //RGV鍙拌溅浣嶇疆
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4);
-//        if (result3.IsSuccess) {
-//            for (int i = 0; i < 2; i++) {
-//                Integer siteId = i==0 ? 1 : 2; // 绔欑偣缂栧彿
-//                StaProtocol staProtocol = station.get(siteId);
-//                if (null == staProtocol) {
-//                    staProtocol = new StaProtocol();
-//                    staProtocol.setSiteId(siteId);
-//                    station.put(siteId, staProtocol);
-//                }
-//                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2)));
-////                String aa = staProtocol.getNearbySta();
-////                System.out.println(siteId + "===>>" + staProtocol.getNearbySta());
-//            }
-//        }
-
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
-//        }
-
-        if (result.IsSuccess ) {
+        if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -383,6 +243,9 @@
         }
     }
 
+    /**
+     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+     */
     private void write(StaProtocol staProtocol) throws InterruptedException {
         if (null == staProtocol) {
             return;
@@ -391,21 +254,47 @@
 
         int index = staNos.indexOf(staProtocol.getSiteId());
 
+        //鏇存柊鍛戒护鏃ュ織
+        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+        CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
+        CommandInfoLog commandInfoLog = new CommandInfoLog();
+        if (commandInfo != null) {
+            commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+            commandInfoLog.setId(null);
+        }else {
+            Date now = new Date();
+            commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
+            commandInfoLog.setCommandStatus(3);
+            commandInfoLog.setStartTime(now);
+            commandInfoLog.setExecuteTime(now);
+            commandInfoLog.setCompleteTime(now);
+            commandInfoLog.setDevice(SlaveType.Devp.toString());
+            commandInfoLog.setWrkNo(9999);
+            commandInfoLog.setTaskNo("9999");
+            commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+        }
+
         OperateResult writeResult;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
         boolean writeFlag = false;
         while(writeCount < 5){
-            OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6,  staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+            OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
             OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo());    // 鐩爣绔�
             if(writeResult1.IsSuccess && writeResult2.IsSuccess){
                 Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*6, (short)6);
+                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB101.0" + index*8, (short)4);
+
+                //鏇存柊鎸囦护鏃ュ織
+                commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+                commandInfoLogService.insert(commandInfoLog);
+
                 if(readResult.IsSuccess){
                     Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-                    if(workNo.equals(staProtocol.getWorkNo().intValue()) && staProtocol.getStaNo().equals(staNo)){
+//                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
+                    if(staProtocol.getWorkNo().equals(workNo)){
                         //浠诲姟鍛戒护鍐欏叆鎴愬姛
                         writeFlag = true;
                         log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -427,6 +316,10 @@
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
                         slave.getId(), JSON.toJSON(staProtocol),writeCount));
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+                //鏇存柊鎸囦护鏃ュ織
+                commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+                commandInfoLogService.insert(commandInfoLog);
             }
             Thread.sleep(200);
         }
@@ -440,58 +333,30 @@
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
             log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
 
-//            //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
-//            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
-//            read();//璇诲彇1娆¤澶囩姸鎬�
+            //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
+            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+            read();//璇诲彇1娆¤澶囩姸鎬�
+            return;
         } 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));
 
-//            Integer siteId = staProtocol.getSiteId();
-//            staProtocol = station.get(siteId);
-//            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
-//                staProtocol.setPakMk(true);
-//            }
+            Integer siteId = staProtocol.getSiteId();
+            staProtocol = station.get(siteId);
+            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
+                staProtocol.setPakMk(true);
+            }
+
+            //鏇存柊浠诲姟姝ュ簭
+            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+            TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
+            if (taskWrk != null) {
+                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+                taskWrkService.updateById(taskWrk);
+            }
         }
 
-
     }
-
-//    /**
-//     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
-//     */
-//    private void write(StaProtocol staProtocol) throws InterruptedException {
-//        if (null == staProtocol) {
-//            return;
-//        }
-//        int index = staNos.indexOf(staProtocol.getSiteId());
-//        short[] array = new short[2];
-//        array[0] = staProtocol.getWorkNo();
-//        array[1] = staProtocol.getStaNo();
-//        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-//
-////        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-////        Thread.sleep(500);
-////        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
-//
-//        if (!write.IsSuccess) {
-//            staProtocol = station.get(staProtocol.getSiteId());
-//            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
-//                staProtocol.setPakMk(true);
-//            }
-//            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-//            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));
-//
-//            Integer siteId = staProtocol.getSiteId();
-//            staProtocol = station.get(siteId);
-//            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
-//                staProtocol.setPakMk(true);
-//            }
-//        }
-//    }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..f0b17e0 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -37,28 +37,32 @@
         excludeTrash(param);
         EntityWrapper<Role> wrapper = new EntityWrapper<>();
         convert(param, wrapper);
-        wrapper.orderBy("id", false);
+        wrapper.orderBy("ID", false);
 
         if (9527 == getUserId()) {
-            return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+            List<Role> roleList = roleService.selectRoleList(null,curr,limit);
+            Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
+            page.setTotal(roleService.selectRoleListTotal(null));
+            return R.ok(page);
         }
         Long roleId = getUser().getRoleId();
         Role role = roleService.selectById(roleId);
         Long leaderId = role.getLeader();
+        List<Long> leaderIdList = new ArrayList<>();
+
         if (null != leaderId) {
-            List<Long> leaderIds = new ArrayList<>();
-            leaderIds.add(roleId);
+            leaderIdList.add(roleId);
             while (leaderId != null) {
                 Role leader = roleService.selectById(leaderId);
-                leaderIds.add(leader.getId());
+                leaderIdList.add(leader.getId());
                 leaderId = leader.getLeader();
             }
-            wrapper.notIn("id", leaderIds);
         }
-//        if (null != role.getLevel()) {
-//            wrapper.gt("level", role.getLevel());
-//        }
-        return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+
+        List<Role> roleList = roleService.selectRoleList(leaderIdList,curr,limit);
+        Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
+        page.setTotal(roleService.selectRoleListTotal(leaderIdList));
+        return R.ok(page);
     }
 
     private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 8e7a1c3..488e360 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -42,7 +42,7 @@
     /**
      * 鐘舵�� 1: 姝e父  0: 绂佺敤  
      */
-    @TableField("LOC_DESC")
+    @TableField("STATUS")
     private Short status;
 
     public Permission() {}
diff --git a/src/main/java/com/zy/system/mapper/RoleMapper.java b/src/main/java/com/zy/system/mapper/RoleMapper.java
index 7900402..94df1b8 100644
--- a/src/main/java/com/zy/system/mapper/RoleMapper.java
+++ b/src/main/java/com/zy/system/mapper/RoleMapper.java
@@ -3,10 +3,19 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.system.entity.Role;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 @Mapper
 @Repository
 public interface RoleMapper extends BaseMapper<Role> {
 
+    List<Role> selectRoleList(@Param("leaderIdList") List<Long> leaderIdList,
+                              @Param("pageNumber") Integer curr,
+                              @Param("pageSize") Integer limit);
+
+    Long selectRoleListTotal(@Param("leaderIdList") List<Long> leaderIdList);
+
 }
diff --git a/src/main/java/com/zy/system/service/RoleService.java b/src/main/java/com/zy/system/service/RoleService.java
index 8a23ead..91c9929 100644
--- a/src/main/java/com/zy/system/service/RoleService.java
+++ b/src/main/java/com/zy/system/service/RoleService.java
@@ -3,6 +3,12 @@
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.system.entity.Role;
 
+import java.util.List;
+
 public interface RoleService extends IService<Role> {
 
+    List<Role> selectRoleList(List<Long> leaderIdList, Integer curr, Integer limit);
+
+    Long selectRoleListTotal(List<Long> leaderIdList);
+
 }
diff --git a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
index f86c513..3b4157b 100644
--- a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
@@ -6,7 +6,19 @@
 import com.zy.system.service.RoleService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("roleService")
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
+    @Override
+    public List<Role> selectRoleList(List<Long> leaderIdList, Integer curr, Integer limit){
+        return this.baseMapper.selectRoleList(leaderIdList,curr,limit);
+    };
+
+    @Override
+    public Long selectRoleListTotal(List<Long> leaderIdList){
+        return this.baseMapper.selectRoleListTotal(leaderIdList);
+    };
+
 }
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 126999f..e066e7a 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,6 +3,10 @@
   doubleLocs: 3,6,7,10,13 #鍙屾繁搴撲綅鎺掑彿 3,6,7,10,13
   groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   crn[0]: #鍫嗗灈鏈�1
+    ip: 192.168.4.250
+    id: 1
+    slot: 0
+    demo: false
     rack: 0
     offset: 2    #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     port: 102
@@ -12,16 +16,12 @@
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 192.168.4.250
     crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
       staNo: 100
       row: 1
       bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
-    id: 1
-    slot: 0
-    demo: false
   barcode[0]: #鏉$爜鎵弿浠�1
     port: 51236
     ip: 10.10.10.52
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 86248f9..f346f81 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -12,4 +12,37 @@
 
     </resultMap>
 
+    <sql id="batchSeq">
+        <if test="id != null and id != 0">
+            and a.ID = #{id}
+        </if>
+        <if test="name != null and name != ''">
+            and a.NAME = #{name}
+        </if>
+    </sql>
+
+    <select id="selectRoleList" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."sys_role"
+        WHERE 1=1
+        <if test="leaderIdList != null and leaderIdList != ''">
+            and ID not in
+            <foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ORDER BY ID DESC
+        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+    </select>
+
+    <select id="selectRoleListTotal" resultType="Long">
+        SELECT count(1) FROM "SOURCE"."wcs_api_config"
+        WHERE 1=1
+        <if test="leaderIdList != null and leaderIdList != ''">
+            and ID not in
+            <foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index a8ad7dc..c11c07d 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -25,6 +25,7 @@
         <result column="CANCEL_TIME" property="cancelTime" />
         <result column="WRK_STS" property="wrkSts" />
         <result column="CRN_NO" property="crnNo" />
+        <result column="COMMAND_STEP" property="commandStep" />
         <result column="TRANSFER_MARK" property="transferMark" />
 
     </resultMap>

--
Gitblit v1.9.1