diff --git a/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java b/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java index 3821962..36c0a30 100644 --- a/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java +++ b/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java @@ -27,7 +27,7 @@ public class CacheConfig { List caches = new ArrayList(); caches.add(new ConcurrentMapCache("street")); caches.add(new ConcurrentMapCache("ptz")); - caches.add(new ConcurrentMapCache("streetByPlc")); + caches.add(new ConcurrentMapCache("streetByPlcId")); caches.add(new ConcurrentMapCache("getStreetCount")); simpleCacheManager.setCaches(caches); //把各个cache注册到cacheManager中，GuavaCache实现了org.springframework.cache.Cache接口 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 7d2fc40..235d0e7 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -41,6 +41,8 @@ public class ConfigProperties { private String cameraUser; private Integer cameraPort; + + private String videoServer; } @Data diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java index 02dc483..dda7097 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.controller; import com.zhehekeji.core.pojo.Result; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.pojo.realTime.RealTime; import com.zhehekeji.web.service.RealTimeService; import io.swagger.annotations.Api; @@ -17,6 +18,8 @@ public class RealTimeController { @Resource private RealTimeService realTimeService; + @Resource + private ConfigProperties configProperties; @PostMapping("") @ApiOperation(value = "实时列表") @@ -25,5 +28,11 @@ public class RealTimeController { return Result.success(realTimeService.realTimes()); } + @GetMapping("/videoServer") + @ApiOperation(value = "视频服务器地址") + public Result getVideoServer(){ + return Result.success(configProperties.getCameraConfig().getVideoServer()); + } + } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/zhehekeji/web/entity/Stock.java index a95f08c..1760105 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Stock.java @@ -25,13 +25,19 @@ public class Stock { @ApiModelProperty("品规名称") private String category; - @ApiModelProperty("货架号") - private String shelveId; - @TableField(value = "`count`") @ApiModelProperty("数量") private Integer count; + private String wmsCode; + + private String wmsCategory; + + private Integer wmsCount; + + @ApiModelProperty("货架号") + private String shelveId; + @TableField(value = "`row`") @ApiModelProperty("行号") private Integer row; diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 7701cfd..13aa599 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -55,6 +55,7 @@ public class CameraService { camera.setPassword(configProperties.getCameraConfig().getCameraPassword()); camera.setPort(configProperties.getCameraConfig().getCameraPort()); camera.setUpdateTime(LocalDateTime.now()); + camera.setRtsp("rtsp://"+configProperties.getCameraConfig().getCameraUser()+":"+configProperties.getCameraConfig().getCameraPassword()+"@"+camera.getIp()+":554/cam/realmonitor?channel=1&subtype=0"); try { cameraMapper.insert(camera); } catch (DuplicateKeyException e) { 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 0a64af5..d953c75 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -433,8 +433,8 @@ public class PlcService { * @param boxNumSys * @param boxNumAlgo */ - public void recordStock(PlcCmdInfo plcCmdInfo, String plcId, String barCodeSys, int boxNumSys, int boxNumAlgo) { - Street street = streetService.getStreetByPlcId(plcId); + public void recordStock(PlcCmdInfo plcCmdInfo, String barCodeSys, int boxNumSys, int boxNumAlgo) { + Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); if (street == null) { return; } 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 64b1505..9faa02d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -129,6 +129,7 @@ public class StockService { stock.setColumn(stockCheck.getColumn()); stock.setRow(stockCheck.getRow()); stock.setShelveId(stockCheck.getShelveId()); + stock.setStatus(0); } return stock; } diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java index c06679a..276b563 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java @@ -38,6 +38,9 @@ public class StreetService { put = { @CachePut(value = {"street"},key = "#street.id"), @CachePut(value = {"streetByPlcId"},key = "#street.plcId"), + }, + evict = { + @CacheEvict(value = "getStreetCount") } ) public Street add(Street street) { 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 731d80c..961b25c 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 @@ -86,7 +86,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { } else if ("E".equals(ksecInfo.getType())) { //盘点 //找到该货位的最后一张照片与现在的照片比照 - plcService.recordStock(plcCmdInfo, srmNumber, dataInfo.getCode(), 0, 0); + plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0); } } in.release(); diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java index 17fd8dc..28766c7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java @@ -114,7 +114,7 @@ public class ProtocolDecoder extends FixedLengthFrameDecoder { } else { log.info("盘点模式"); log.info("Verification mode. Code er(algorithm):{}", barCodeSys, boxNumSys, boxNumAlgo); - plcService.recordStock(plcCmdInfo,plcId,barCodeSys,boxNumSys,boxNumAlgo); + plcService.recordStock(plcCmdInfo,barCodeSys,boxNumSys,boxNumAlgo); } } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index c20d17f..5fe5cc2 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -28,9 +28,11 @@ userUrl: http://115.236.65.98:11001 cameraConfig: # ------------球機選擇--- 0:中威 1：海康 cameraType: 1 - cameraPassword: admin123 + cameraPassword: a1234567 cameraUser: admin cameraPort: 37777 + videoServer: 127.0.0.1:8083 + # ------------ # -----图片 mp4下载地址 savePath: diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index a6f7824..5351ea3 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -28,9 +28,10 @@ userUrl: http://115.236.65.98:11001 cameraConfig: # ------------球機選擇--- 0:中威 1：海康 cameraType: 0 - cameraPassword: admin123 + cameraPassword: a1234567 cameraUser: admin cameraPort: 37777 + videoServer: 127.0.0.1:8083 # ------------ # -----图片 mp4下载地址 savePath: diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml index a6f7824..5351ea3 100644 --- a/web/src/main/resources/application-test.yml +++ b/web/src/main/resources/application-test.yml @@ -28,9 +28,10 @@ userUrl: http://115.236.65.98:11001 cameraConfig: # ------------球機選擇--- 0:中威 1：海康 cameraType: 0 - cameraPassword: admin123 + cameraPassword: a1234567 cameraUser: admin cameraPort: 37777 + videoServer: 127.0.0.1:8083 # ------------ # -----图片 mp4下载地址 savePath: