重庆项目修改

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -594,21 +594,12 @@ public class PlcService {
         });
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
 
-        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
+        gyrateCameraByCode(cameraId, cmdCode);
-            //内测
+        try {
-            String c = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+            Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
-            log.info("camera ptz"+c);
+        } catch (InterruptedException e) {
-            gyrateCameraByCode(cameraId, c);
+            e.printStackTrace();
-        }else {
-            gyrateCameraByCode(cameraId, cmdCode);
-            try {
-                Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
         }
-
-
         String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
         cameraCapture(cameraId,false,null,path);
         //托盘码

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -162,23 +162,22 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     }
                 } else if (Cmd.D.name().equals(ksecInfo.getType())) {
 
-                    //柳州去掉告警
+                    String code = dataInfo.getCmdName();
-//                String code = dataInfo.getCmdName();
+                    if(code.equals(Cmd.D1.name())){
-//                if(code.equals(Cmd.D1.name())){
+                        log.info("plcId:{},warn start",plcCmdInfo.getPlcId());
-//                    log.info("plcId:{},warn start",plcCmdInfo.getPlcId());
+                        //根据告警code转动camera
-//                    //根据告警code转动camera
+                        String warnCode = dataInfo.getWarnCode();
-//                    String warnCode = dataInfo.getWarnCode();
+                        if(!StringUtils.isEmpty(warnCode)){
-//                    if(!StringUtils.isEmpty(warnCode)){
+                            String warnCode0 = Cmd.D1.name()+"-"+warnCode.split(",")[0];
-//                        String warnCode0 = Cmd.D1.name()+"-"+warnCode.split(",")[0];
+                            plcService.warnAction(plcCmdInfo,warnCode0);
-//                        plcService.warnAction(plcCmdInfo,warnCode0);
+                        }
-//                    }
+                        plcService.warnStart(plcCmdInfo.getPlcId(),dataInfo.getWarnCode());
-//                    plcService.warnStart(plcCmdInfo.getPlcId(),dataInfo.getWarnCode());
+                    }else if(code.equals(Cmd.D2.name())){
-//                }else if(code.equals(Cmd.D2.name())){
+                        log.info("plcId:{},warn stop",plcCmdInfo.getPlcId());
-//                    log.info("plcId:{},warn stop",plcCmdInfo.getPlcId());
+                        plcService.warnStop(plcCmdInfo.getPlcId());
-//                    plcService.warnStop(plcCmdInfo.getPlcId());
+                    }else {
-//                }else {
+                        log.info("other D code :{}",code);
-//                    log.info("other D code :{}",code);
+                    }
-//                }
                 } else if (Cmd.E.name().equals(ksecInfo.getType())) {
 
                     //盘点