From 29c56f3793dff560ad32990ff12ab0fff886dc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 18 Mar 2024 09:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=9B=BE=E7=89=87=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=8D=E7=85=A7=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=81=B5=E9=97=AA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/modules.xml | 12 --- springbootstart.iml | 93 ------------------- .../web/service/EmptyCheckService.java | 3 + .../com/zhehekeji/web/service/PlcService.java | 4 +- .../zhehekeji/web/service/client/Encoder.java | 2 +- 5 files changed, 6 insertions(+), 108 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 springbootstart.iml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e3626d2..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/springbootstart.iml b/springbootstart.iml deleted file mode 100644 index 69d5b97..0000000 --- a/springbootstart.iml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java index 874e1af..2e70ea3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java +++ b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java @@ -23,6 +23,7 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; @Service @Slf4j @@ -45,8 +46,10 @@ public class EmptyCheckService { * @return */ public Order visualJudgment(Transmission transmission,String code,Street street){ + ConcurrentHashMap synchronizedMap = new ConcurrentHashMap(); if(street!= null){ Order order = orderMapper.getOneByStreetId(street.getId()); + transmission.setUrl(transmission.getUrl().replace("E:","").replace("D:","")); order.setStatus(transmission.getSuccess()? 1 : 0); order.setPicPaths(order.getPicPaths()!=null ? order.getPicPaths() + "," +transmission.getUrl(): transmission.getUrl()); if(transmission.getNumber() != null ){ 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 b4f798b..d2102d7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -802,11 +802,11 @@ public class PlcService { }else if(times == 4){ Thread.sleep(configProperties.getCameraConfig().getC4DelayCaptureTime()); - ClientChanel.sendMessage(dataInfo.getSRMNumber(), "C3:1"); + ClientChanel.sendMessage(dataInfo.getSRMNumber(), "C4:1"); }else if(times == 3){ Thread.sleep(configProperties.getCameraConfig().getC3DelayCaptureTime()); - ClientChanel.sendMessage(dataInfo.getSRMNumber(), "C4:1"); + ClientChanel.sendMessage(dataInfo.getSRMNumber(), "C3:1"); LocalDateTime endDownLoadTime = endTime.plusSeconds(5); Duration duration = Duration.between(order.getStartTime(),endDownLoadTime); //录像 diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Encoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Encoder.java index c305527..1f9bbb1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Encoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/Encoder.java @@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets; * 客户端传输协议 以>结尾 */ public class Encoder extends MessageToByteEncoder { - private static String END_STRING = ">"; + private static String END_STRING = ""; private static final Logger tcpLogger = LoggerFactory.getLogger("tcp"); @Override