diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java index 0e6135f..a28069b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java @@ -44,7 +44,9 @@ public class CheckLogService { for (CheckLog checkLog :stockChecks){ checkLog.setStreetName(streetMap.get(checkLog.getStreetId())); - checkLog.setPics(checkLog.getPic().split(";")); + if (checkLog.getPic() != null && checkLog.getPic().length() > 0) { + checkLog.setPics(checkLog.getPic().split(";")); + } } return new PageInfo<>(stockChecks); 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 f8ab50e..094f914 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/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().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++) { 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 72d7bbf..28b372c 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 @@ -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; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java index 36a64be..9571bd7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/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()); diff --git a/web/src/main/resources/libs/RXTXcomm.jar b/web/src/main/resources/libs/RXTXcomm.jar index 84e5f01..e1e7503 100644 Binary files a/web/src/main/resources/libs/RXTXcomm.jar and b/web/src/main/resources/libs/RXTXcomm.jar differ diff --git a/web/src/main/resources/libs/connect-lib.jar b/web/src/main/resources/libs/connect-lib.jar new file mode 100644 index 0000000..19180d6 Binary files /dev/null and b/web/src/main/resources/libs/connect-lib.jar differ diff --git a/web/src/main/resources/libs/javaRFID-helloworld.jar b/web/src/main/resources/libs/javaRFID-helloworld.jar new file mode 100644 index 0000000..0e90d9f Binary files /dev/null and b/web/src/main/resources/libs/javaRFID-helloworld.jar differ diff --git a/web/src/main/resources/libs/lib_reader.jar b/web/src/main/resources/libs/lib_reader.jar new file mode 100644 index 0000000..cb23ff1 Binary files /dev/null and b/web/src/main/resources/libs/lib_reader.jar differ