化学品优化

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/RemoteLaboratoryService.java

@@ -563,7 +563,7 @@ public interface RemoteLaboratoryService {
 
     @ApiOperation("根据keyId获取过期提醒次数")
     @GetMapping("/warningNoticeLog/getRemindData")
-    ResultData getRemindData(@RequestParam("keyId") Long keyId);
+    ResultData getRemindData(@RequestParam("keyId") Long keyId,@RequestParam("type") Integer type);
 
     @GetMapping("/warningConfig/getByType")
     @ApiOperation("根据类型查询报警配置信息-预警类型(1算法识别 2化学品 3气瓶)")

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteLaboratoryFallbackFactory.java

@@ -538,7 +538,7 @@ public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLa
             }
 
             @Override
-            public ResultData getRemindData(Long keyId) {
+            public ResultData getRemindData(Long keyId, Integer type) {
                 return ResultData.fail("获取告警次数失败！"+ cause.getMessage());
             }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -1117,7 +1117,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
     private void expired(List<HxpStockVO> expiredStock,WarningConfigDto warningConfigDto) {
         Optional.ofNullable(expiredStock).orElseGet(Collections::emptyList).stream().forEach(hxpStock -> {
             HxpChemicalJoinCabinet hxpChemicalJoinCabinet = hxpChemicalJoinCabinetMapper.selectHxpChemicalJoinCabinetById(hxpStock.getJoinId());
-            ResultData resultData = remoteLaboratoryService.getRemindData(hxpStock.getId());
+            ResultData resultData = remoteLaboratoryService.getRemindData(hxpStock.getId(),2);
             if (HttpStatus.SUCCESS != resultData.getCode()) {
                 logger.error("获取提醒日志数据失败！");
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -117,8 +117,9 @@ public class WarningNoticeLogController extends AbstractController {
 
     @GetMapping("/getRemindData")
     @ApiOperation("根据keyId获取过期提醒次数")
-    public ResultData getRemindData(@RequestParam("keyId") Long keyId) {
-        List<WarningNoticeLog> list = warningNoticeLogService.list(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId, keyId));
+    public ResultData getRemindData(@RequestParam(name = "keyId 各类型id",value = "keyId") Long keyId,
+                                    @RequestParam(name = "预警类型(1算法识别 2化学品 3气瓶 4预案)",value = "type") Integer type) {
+        List<WarningNoticeLog> list = warningNoticeLogService.list(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId, keyId).eq(WarningNoticeLog::getWarningType,type));
         List<WarningNoticeLogDto> warningNoticeLogDtos = com.zd.common.core.utils.BeanUtils.copyList2List(list, WarningNoticeLogDto.class);
         return ResultData.success(warningNoticeLogDtos);
     }