告警列表新增处理状态过滤

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java

@@ -29,9 +29,9 @@ public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterW
 
     TdHygfJpInverterWarnDto getByTime(@Param("createdTime") long createdTime);
 
-    List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size);
+    List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus);
 
-    int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content);
+    int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content,String handlerStatus);
 
     @Select("SELECT  *  from td_hygf_jp_inverter_warn  WHERE (third_station_id = #{thirdStationId} AND sn_code = #{sncode} AND created_time = #{createdTime})")
     TdHygfJpInverterWarn getInverTerWarnByparams(@Param("createdTime") long createdTime, @Param("sncode") String snCode, @Param("thirdStationId") String thirdStationId);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -72,7 +72,10 @@
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
-				AND `handler_status` = #{state}
+				AND `state` = #{state}
+			</if>
+			<if test="handlerStatus != null and handlerStatus != ''">
+				AND handler_status = #{handlerStatus}
 			</if>
 			<if test="level != null and level != ''">
 				AND `level` = #{level}
@@ -115,6 +118,9 @@
 			<if test="state != null and state != ''">
 				AND handler_status = #{state}
 			</if>
+			<if test="handlerStatus != null and handlerStatus != ''">
+				AND handler_status = #{handlerStatus}
+			</if>
 			<if test="level != null and level != ''">
 				AND level = #{level}
 			</if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -234,6 +234,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	@GetMapping(value = "/selectWarnList")
 	@UserLimits
 	public ResponseModel<Page<TdHygfJpInverterWarnDto>> selectWarnList(@RequestParam(required = false) String state,
+																@RequestParam(required = false) String handlerStatus,
 																@RequestParam(required = false) String level,
 																@RequestParam(required = false) String stationName,
 																@RequestParam(required = false) String minvalue,
@@ -284,7 +285,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 		if (StringUtils.isNotEmpty(content)){
 			content = '%'+content+'%';
 		}
-		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size);
+		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size,handlerStatus);
 		for (TdHygfJpInverterWarnDto map : maps) {
 			if (nameMaps.containsKey(map.getThirdStationId())){
 				map.setStationName(nameMaps.get(map.getThirdStationId()));
@@ -293,7 +294,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 			map.setTimeLongFormat(te);
 		}
 
-		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content));
+		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus));
 		result.setRecords(maps);
 		return ResponseHelper.buildResponse(result);
 	}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java

@@ -139,10 +139,10 @@ public class TdHygfJpInverterWarnServiceImpl
 		return tdHygfJpInverterWarnDto;
 	}
 
-	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size){
-	return this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size);
+	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus){
+	return this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
 	}
-	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content){
-		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content);
+	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content,String handlerStatus){
+		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus);
 	}
 }
\ No newline at end of file