From cbd6f9248ae69d4f498e747f95aa2c6b96b288a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Tue, 23 Jan 2024 10:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=BB=93=E6=9D=9F=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9B=98=E7=82=B9=E7=85=A7=E7=89=87checkPic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zhehekeji/web/config/ConfigProperties.java    | 1 +
 web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java     | 1 +
 web/src/main/java/com/zhehekeji/web/service/PlcService.java     | 1 +
 .../main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java  | 2 ++
 .../main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java   | 1 +
 web/src/main/resources/application-prod.yml                     | 1 +
 6 files changed, 7 insertions(+)

diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
index 4a68610..35db85c 100644
--- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
+++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
@@ -100,6 +100,7 @@ public class ConfigProperties {
     public static class SavePath{
         private String mediaPath;
         private String mp4Path;
+        private String getPicPath = "http://127.0.0.1:9007/api/pic/";
     }
 
     @Data
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java b/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java
index eebbf4b..b43f445 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java
@@ -86,6 +86,7 @@ public class PlcCmdInfo {
 
     private Integer fromSide;
     private Integer toSide;
+    private String checkPic;
 
     public PlcCmdInfo(String plcId, String taskId, Integer side1, Integer leftRight1, Integer column1, Integer row1, Integer separation1, Integer side2, Integer leftRight2, Integer column2, Integer row2, Integer separation2,String lotnum) {
         this.taskId = taskId;
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 d28521e..2f2a6c5 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -656,6 +656,7 @@ public class PlcService {
         }
 
         String path = PathUtil.createFileNameByRowColumn("jpg", cameraId, plcCmdInfo.getRow1(), plcCmdInfo.getColumn1());
+        plcCmdInfo.setCheckPic(configProperties.getSavePath().getGetPicPath() + path);
         try {
 
             cameraCapture(cameraId, false, null, path);
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java
index 90ac787..cb53bab 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java
@@ -43,4 +43,6 @@ public class KsecDataInfo {
      * 盘点批次号
      */
     private String lotnum;
+
+    private String checkPic;
 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
index 0f08c8f..5ca0a4c 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
@@ -202,6 +202,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     log.info("盘点指令：{}", ksecInfo);
                     plcService.check(plcCmdInfo,ksecInfo.getType(),dataInfo.getCode(),dataInfo.getTrayCode());
                     ksecInfo.getData().setAckStatus(1);
+                    ksecInfo.getData().setCheckPic(plcCmdInfo.getCheckPic());
 
                     ctx.channel().writeAndFlush(ksecInfo);
                     log.info("盘点完成");
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index 79f7fa5..e5ba5be 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/web/src/main/resources/application-prod.yml
@@ -58,6 +58,7 @@ cameraConfig:
 savePath:
   mediaPath: d:\\data\media\
   mp4Path: d://data/mp4/
+  getPicPath: http://127.0.0.1:9007/api/pic/
 # ------------服务端类型  0：TCP(罗伯泰克)    1:KSEC(JSON)（昆船）
 serverMode: 1
 ksec: