diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/constant/Test.java b/pqs-process/process-api/src/main/java/com/njcn/process/constant/Test.java index cb555bf60..27d50f79a 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/constant/Test.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/constant/Test.java @@ -1,27 +1,27 @@ -package com.njcn.process.constant; - -import com.google.common.collect.Maps; -import com.njcn.device.pq.pojo.po.DataV; -import org.springframework.cglib.beans.BeanMap; - -import java.util.Map; - -/** - * Description: - * 接口文档访问地址：http://serverIP:port/swagger-ui.html - * Date: 2022/12/7 15:18【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public class Test { - public static void main(String[] args) { - - Map map = Maps.newHashMap ( ); - DataV d = new DataV ( ); - BeanMap beanMap = BeanMap.create (d); - for (Object key : beanMap.keySet ( )) { - } - } - -} +//package com.njcn.process.constant; +// +//import com.google.common.collect.Maps; +//import com.njcn.device.pq.pojo.po.DataV; +//import org.springframework.cglib.beans.BeanMap; +// +//import java.util.Map; +// +///** +// * Description: +// * 接口文档访问地址：http://serverIP:port/swagger-ui.html +// * Date: 2022/12/7 15:18【需求编号】 +// * +// * @author clam +// * @version V1.0.0 +// */ +//public class Test { +// public static void main(String[] args) { +// +// Map map = Maps.newHashMap ( ); +// DataV d = new DataV ( ); +// BeanMap beanMap = BeanMap.create (d); +// for (Object key : beanMap.keySet ( )) { +// } +// } +// +//} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java index 1be7f1d14..6d891cbc2 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java @@ -25,6 +25,10 @@ public class MonitorParam { @NotEmpty(message = "类型不能为空") private Integer type; + @ApiModelProperty(value = "等级 0.自动策略 1.手动策略 2.排他策略") + @NotEmpty(message = "等级不能为空") + private Integer grade; + @ApiModelProperty(value = "预警策略/告警策略id") @NotEmpty(message = "策略id集合不能为空") private List alarmId; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsDeptAlarm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsDeptAlarm.java index e1d72d6ec..4af9cfc71 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsDeptAlarm.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsDeptAlarm.java @@ -37,6 +37,10 @@ public class ThsDeptAlarm implements Serializable { @TableField("Alarm_Id") private String alarmId; + @ApiModelProperty(value = "等级（0：自动策略；1：手动策略；2：排他策略）") + @TableField("Grade") + private Integer Grade; + @ApiModelProperty(value = "监测点id") @TableField("Monitor_Id") private String monitorId; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java index 0c6b340b3..4bd620f4c 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java @@ -122,9 +122,11 @@ public class ThsWarnStrategyController extends BaseController { @GetMapping("/echoMonitor") @ApiOperation(value = "监测点回显") - public HttpResult echoMonitor(@Param("deptId") String deptId,@Param("type") Integer type) { + public HttpResult echoMonitor(@Param("deptId") String deptId, + @Param("type") Integer type, + @Param("grade") Integer grade) { String methodDescribe = getMethodDescribe("echoMonitor"); - StrategyParam.MonitorTree info = thsWarnStrategyService.echoMonitor(deptId, type); + StrategyParam.MonitorTree info = thsWarnStrategyService.echoMonitor(deptId, type,grade); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, info, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java index 36fdd19b8..5017abcfe 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java @@ -109,7 +109,7 @@ public interface ThsWarnStrategyService extends IService { * @param type * @return List */ - StrategyParam.MonitorTree echoMonitor(String org,Integer type); + StrategyParam.MonitorTree echoMonitor(String org,Integer type,Integer grade); /*** * 预警单/告警单删除 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java index 2bfc77393..1d76275f6 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java @@ -194,6 +194,7 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ThsDeptAlarm::getDeptId, param.getDeptId()); lambdaQueryWrapper.eq(ThsDeptAlarm::getType, param.getType()); + lambdaQueryWrapper.eq(ThsDeptAlarm::getGrade, param.getGrade()); thsDeptAlarmService.remove(lambdaQueryWrapper); //信息添加 @@ -210,6 +211,7 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl list = thsDeptAlarmService.list(new LambdaQueryWrapper() .eq(ThsDeptAlarm::getDeptId, org) .eq(ThsDeptAlarm::getType, type) + .eq(ThsDeptAlarm::getGrade, grade) ); StrategyParam.MonitorTree tree=new StrategyParam.MonitorTree(); List collect = list.stream().map(ThsDeptAlarm::getAlarmId).distinct().collect(Collectors.toList());