From 916e07a081c9534a8cfafde5421f426b0212f651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 29 Mar 2024 13:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=8F=E8=A1=8C=E6=8B=8D?= =?UTF-8?q?=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/service/PlcService.java | 9 +++++++++ .../zhehekeji/web/service/client/Decoder.java | 2 -- .../web/service/client/TransmissionPojo.java | 19 +++++++++++++++++-- .../web/service/client/TransmissionType.java | 2 ++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index b677bdd..4d8130c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/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 { diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java index 5873152..f4b3391 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java +++ b/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) { diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java index ab7a70c..1fba997 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java +++ b/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]; } diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionType.java b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionType.java index a6273a7..40d82f6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionType.java +++ b/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 ,