[update] 优化故障告警列表过滤条件

signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java

@@ -200,8 +200,8 @@ public class SituationDetectionController extends BaseController {
     @AspectLog(description = "查询信号机故障列表", operationType = BaseEnum.OperationTypeEnum.QUERY)
     @ApiOperation(value = "查询信号机故障列表", notes = "查询信号机故障列表")
     @GetMapping("/listSignalFaultInfos")
-    public JsonViewObject listSignalFaultInfos() throws Exception {
-        List<SignalFaultInfoVO> signalFaultInfoVOS = situationDetectionService.listSignalFaultInfos();
+    public JsonViewObject listSignalFaultInfos(String dealStatus) throws Exception {
+        List<SignalFaultInfoVO> signalFaultInfoVOS = situationDetectionService.listSignalFaultInfos(dealStatus);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         return jsonViewObject.success(signalFaultInfoVOS);
     }

signal-control-service/src/main/java/net/wanji/web/service/SituationDetectionService.java

@@ -40,7 +40,7 @@ public interface SituationDetectionService {
 
     List<AreaListVO> selectAreaList(Integer areaId);
 
-    List<SignalFaultInfoVO> listSignalFaultInfos() throws Exception;
+    List<SignalFaultInfoVO> listSignalFaultInfos(String dealStatus) throws Exception;
 
     DeviceFaultCountVO countSignalFaultInfos();
 

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -570,7 +570,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     }
 
     @Override
-    public List<SignalFaultInfoVO> listSignalFaultInfos() throws Exception {
+    public List<SignalFaultInfoVO> listSignalFaultInfos(String dealStatus) throws Exception {
         List<TDeviceStatusInfo> tDeviceStatusInfos = allDeviceStatusMapper.selectByEntity(new TDeviceStatusInfo());
         List<CrossInfoOutVo> crossInfoOutVoList = getCrossInfoOutVoList(new CrossInfoPageVO());
 
@@ -592,7 +592,13 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
             }
             signalFaultInfoVOS.add(signalFaultInfoVO);
         });
-        return signalFaultInfoVOS;
+        List<SignalFaultInfoVO> result = null;
+        if (StringUtils.isNotEmpty(dealStatus)) {
+            result = signalFaultInfoVOS.stream().filter(signalFaultInfoVO -> StringUtils.equals(dealStatus, signalFaultInfoVO.getDealStatus())).collect(Collectors.toList());
+        } else {
+            result = signalFaultInfoVOS;
+        }
+        return result;
     }
 
     @Override

signal-control-service/src/main/resources/mapper/AllDeviceStatusMapper.xml

@@ -32,6 +32,12 @@
             <if test="entity.code != null and entity.code != ''">
                 code = #{entity.code}
             </if>
+            <if test="entity.faultType != null and entity.faultType != ''">
+                fault_type = #{entity.faultType}
+            </if>
+            <if test="entity.status != null and entity.status != ''">
+                status = #{entity.status}
+            </if>
         </where>
     </select>