1.判断数据库内的是否为空

2.照片位置使用ip

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

@@ -44,8 +44,10 @@ public class CheckLogService {
 
         for (CheckLog checkLog :stockChecks){
             checkLog.setStreetName(streetMap.get(checkLog.getStreetId()));
+            if (checkLog.getPic() != null && checkLog.getPic().length() > 0) {
                 checkLog.setPics(checkLog.getPic().split(";"));
             }
+        }
 
         return new PageInfo<>(stockChecks);
     }

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

@@ -32,6 +32,7 @@ import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 /**
@@ -680,6 +681,7 @@ public class PlcService {
     public void visualCalculationResults(TransmissionPojo transmissionPojo) {
         CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId());
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("check_Num",checkLog.getId()));
+        Street street = streetService.getStreetByPlcId(transmissionPojo.getStreetNumber());
         if(transmissionPojo.getResult() != null && transmissionPojo.getResult() == 1){
             checkLog.setStatus(StockStatus.SUCCESS.getStatus());
             stock.setStatus(StockStatus.SUCCESS.getStatus());
@@ -688,13 +690,17 @@ public class PlcService {
             stock.setStatus(StockStatus.ERROR.getStatus());
         }
         if (transmissionPojo.getPicsPath() != null && transmissionPojo.getPicsPath().length > 0){
-            String pics = join(transmissionPojo.getPicsPath(), ";");
+
+            String pics = Arrays.stream(transmissionPojo.getPicsPath()).map(v->{
+                return street.getPlcIp() + ":8007" + v;
+            }).collect(Collectors.joining(";"));
             checkLog.setPic(pics);
             stock.setCheckPic(pics);
         }
         checkLogMapper.updateById(checkLog);
         stockMapper.updateById(stock);
     }
+
     public static String join(String[] array, String separator) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < array.length; i++) {

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

@@ -19,7 +19,7 @@ public class TransmissionPojo {
     private Integer direction;//左右
     private Integer count; //数量
     private String category; //品规
-    private String[] picsPath; //品规
+    private String[] picsPath; //照片
 
 
     private Integer result;

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

@@ -68,6 +68,9 @@ public class KsecNettyClient {
             e.printStackTrace();
         }
         while (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) {
+            if (channel != null) {
+                channel.close();
+            }
 
             try {
                 Thread.sleep(ksec.getReconnectInterval());