diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java index 766b3f2..af1c0b9 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java @@ -301,6 +301,23 @@ public class CameraControlController { return Result.success(); } + + @PostMapping("/picFor/{id}") + @ApiOperation(value = "立即拍照") + public Result picFor(@PathVariable Integer id) { + checkLogin(id); + for (int i= 0;i<10;i++) { + String path = "D:\\work\\" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) +"_"+i+ ".jpeg"; + try { + Thread.sleep(200); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + TaskDelayExecutor.addPicDelayTask(id, path, 2000L); + } + return Result.success(); + } + @Resource private ConfigProperties configProperties; @Resource 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 0e8287e..c29c3ff 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -758,8 +758,7 @@ public class PlcService { CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId()); Stock stock = stockMapper.selectOne(new QueryWrapper().eq("check_Num", checkLog.getId())); Street street = streetService.getStreetByPlcId(transmissionPojo.getStreetNumber()); - if( stock.getCategory() != null && stock.getCategory().length() != 6) { - + if( stock.getCategory() != null && "20".equals(stock.getCategory())) { checkLog.setStatus(StockStatus.OTHER.getStatus()); stock.setStatus(StockStatus.OTHER.getStatus()); }else if (transmissionPojo.getResult() != null && transmissionPojo.getResult() == 1) { diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 0335bd4..b1c0cb8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -356,7 +356,7 @@ public class StockService { // String shelveId = streetService.getShevelId(stockCheckSearch.getSRMNumber(),stockCheckSearch.getDirection(),stockCheckSearch.getSeparation()); // Assert.notNull(shelveId,"无该货架信息"); Street street = streetService.getStreetByPlcId(stockCheckSearch.getSRMNumber()); - Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(),stockCheckSearch.getDirection(),stockCheckSearch.getSeparation(),stockCheckSearch.getRow(),stockCheckSearch.getColumn()); + Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(),stockCheckSearch.getDirection(),1,stockCheckSearch.getRow(),stockCheckSearch.getColumn()); if(stock != null && stock.getCheckPic()!=null){ stock.setCheckPics(stock.getCheckPic().split(";")); } 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 145e06f..1f25b7e 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,9 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; import java.util.*; @Data @@ -158,6 +161,20 @@ public class TransmissionPojo { } public static void main(String[] args) { + String filePath = "D:\\WeChet\\WeChat Files\\wxid_ttkf0xgmyihv22\\FileStorage\\File\\2024-11\\duoji-web-tcp.log"; // 替换为你的文件路径 + + try (BufferedReader br = new BufferedReader(new FileReader(filePath))) { + String line; + while ((line = br.readLine()) != null) { + if (line.contains("RTE")) { + line = line.substring(line.indexOf("client:"),line.indexOf("data length:")); + + System.out.println(line); + } + } + } catch (IOException e) { + e.printStackTrace(); + } //2024-05-31 17:52:07,909 INFO (Decoder.java:96)- receive client:RTE&001/1/9&2812&&2&0341&30&1&.\fileData\\2812\4.PNG;\fileData\\2812\2_0341_rlt.jpg&.\fileData\\2812\4.pcd, data length:106 TransmissionPojo transmissionPojo = new TransmissionPojo("RTE&001/1/9&2812&&2&0341&30&1&.\\fileData\\\\2812\\4.PNG;\\fileData\\\\2812\\2_0341_rlt.jpg&.\\fileData\\\\2812\\4.pcd>"); System.out.println(transmissionPojo);