增加随行拍照

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

@@ -120,6 +120,11 @@ public class PlcService {
      */
     public void orderStop(PlcCmdInfo plcCmdInfo) {
 
+
+
+
+
+
     }
 
     public void orderStopByWarn(String orderNum) {
@@ -238,6 +243,10 @@ public class PlcService {
                 delayTime = configProperties.getCameraConfig().getC3DelayCaptureTime();
 
             } else if (code.startsWith("C4")) {
+
+                TransmissionPojo transmissionPojo = new TransmissionPojo( street, plcCmdInfo.getRow2(), plcCmdInfo.getColumn2());
+
+                ClientChanel.get(street.getPlcId()).writeAndFlush(transmissionPojo.toString(TransmissionType.GPS));
                 if (sep == 1) {
                     delayTime = configProperties.getCameraConfig().getC4DelayCaptureTime();
                 } else {

web/src/main/java/com/zhehekeji/web/service/client/Decoder.java

@@ -99,7 +99,6 @@ public class Decoder extends DelimiterBasedFrameDecoder {
             //获取照片后发送进行计算逻辑，并在拍照队列中取出拍照发送
             else if(GET_PHOTO_END.equals(transmissionPojo.getHeader())){
                 ClientChanel.get(transmissionPojo.getStreetNumber()).writeAndFlush(transmissionPojo.toString(TransmissionType.RTS));
-
                 try {
                     Thread.sleep(50L);
                 } catch (InterruptedException e) {
@@ -107,7 +106,6 @@ public class Decoder extends DelimiterBasedFrameDecoder {
                 }
                 //删除队列的拍照数据
                 GetPhotoDelayExecutor.remove(transmissionPojo.getStreetNumber(),transmissionPojo.toString(TransmissionType.GPS));
-
                 //发送给上位机
                 CameraDelayTask cameraDelayTask =  GetPhotoDelayExecutor.getNext(transmissionPojo.getStreetNumber());
                 if (cameraDelayTask != null) {

web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.UUID;
 
 @Data
 public class TransmissionPojo {
@@ -17,6 +18,7 @@ public class TransmissionPojo {
     private String streetNumber;//巷道标识符
 
     private Integer row;//行
+    private Integer column;//列
 
     private String pcd;//点位文件路径
     private String taskId;
@@ -33,19 +35,31 @@ public class TransmissionPojo {
         this.streetNumber = street.getPlcId();
         this.taskId = checkLog.getLotnum();
         this.row = checkLog.getRow();
+        this.column = checkLog.getColumn();
         this.direction = checkLog.getDirection();
         this.count = checkLog.getCount();
         this.category = checkLog.getCategory().split("/")[0];
 
+    }
+
+    public TransmissionPojo( Street street,Integer row , Integer column){
+        this.streetNumber = street.getPlcId();
+        this.row = row;
+        this.column = column;
+        this.checkId = 0;
+        this.taskId = "0";
+
     }
     public String toString(TransmissionType type) {
         this.header = type.toString();
         if (type == TransmissionType.ST) {
             return "ST&" + streetNumber + "&" + checkId + "&" + taskId + "&" + direction ;
         }else if (type == TransmissionType.GPS) {
-            return "GPS&" + streetNumber +"/"+row+ "&" + checkId + "&" + taskId + "&" + direction+ "&" + category + "&" + count;
+            return "GPS&" + streetNumber +"/"+row +"/"+column+ "&" + checkId + "&" + taskId + "&" + direction+ "&" + category + "&" + count;
         }else if (type == TransmissionType.RTS) {
-            return "RTS&" +  streetNumber +"/"+row+  "&" + checkId + "&" + taskId + "&" + direction  + "&" + category + "&" + count;
+            return "RTS&" +  streetNumber +"/"+row +"/"+column+  "&" + checkId + "&" + taskId + "&" + direction  + "&" + category + "&" + count;
+        }else if (type == TransmissionType.SGPS) {
+            return "SRTS&" +  streetNumber +"/"+row +"/"+column+  "&" + checkId + "&" + taskId + "&" + direction ;
         }
         return "";
     }
@@ -59,6 +73,7 @@ public class TransmissionPojo {
             String[] dataArr = dataArray[1].split("/");
             this.streetNumber = dataArr[0];
             this.row = Integer.valueOf(dataArr[1]);
+            this.column = Integer.valueOf(dataArr[2]);
         }else {
             this.streetNumber = dataArray[1];
         }

web/src/main/java/com/zhehekeji/web/service/client/TransmissionType.java

@@ -4,6 +4,8 @@ public enum TransmissionType {
     ST   ,
     GPS  ,
     GPE  ,
+    SGPS  ,
+    SGPE  ,
     RTS  ,
     RTE   ,
     EN   ,