更新

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -291,6 +291,7 @@ public class RfidController {
         Boolean hasSeqDim = warningDetailSelectVo.getSeqDim()!=null;
         Boolean hasInventoryResultsDim = warningDetailSelectVo.getInventoryResultsDim()!=null;
         Boolean hasCreateTimeDim = warningDetailSelectVo.getCreateTimeDim()!=null;
+        Boolean hasWarningHandle = warningDetailSelectVo.getWarningHandle()!=null;
         List<LibraryWarningLog> libraryWarningLogs = libraryWarningLogDao.findAll();
         List<WarningDetailListVo> warningDetailListVos = new ArrayList<>();
         for (LibraryWarningLog libraryWarningLog :libraryWarningLogs) {
@@ -305,7 +306,8 @@ public class RfidController {
                 Boolean containSeqDim = !hasSeqDim||warningDetailListVo.getDeviceLibraryEntity().getSeqNumber().contains(warningDetailSelectVo.getSeqDim());
                 Boolean containInventoryResultsDim = !hasInventoryResultsDim||warningDetailListVo.getInventoryResults().contains(warningDetailSelectVo.getInventoryResultsDim());
                 Boolean containCreateTimeDim = !hasCreateTimeDim||sdf.format(warningDetailListVo.getCreateTime()).contains(warningDetailSelectVo.getCreateTimeDim());
-                return containModelDim&&containNameDim&&containSeqDim&&containInventoryResultsDim&&containCreateTimeDim;
+                Boolean isHandle = !hasWarningHandle||warningDetailListVo.getWarningHandle().equals(warningDetailSelectVo.getWarningHandle());
+                return containModelDim&&containNameDim&&containSeqDim&&containInventoryResultsDim&&containCreateTimeDim&&isHandle;
             }).sorted(Comparator.comparing(WarningDetailListVo::getCreateTime).reversed()).collect(Collectors.toList());
         }
         return ResultUtil.success(PageUtil.getPerPage(warningDetailSelectVo.getPage(),warningDetailSelectVo.getSize(),warningDetailListVos,warningDetailSelectVo.getPageable()));

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/vo/WarningDetailSelectVo.java

@@ -33,4 +33,6 @@ public class WarningDetailSelectVo extends CustomPage {
     @ApiModelProperty(value = "告警时间模糊查询字段")
     private String createTimeDim;
 
+    @ApiModelProperty(value = "是否处理 0为否 1为是")
+    private Integer warningHandle;
 }