diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/AlarmTypeEnum.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/AlarmTypeEnum.java new file mode 100644 index 000000000..c3388a64f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/AlarmTypeEnum.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.enums; + +import lombok.Getter; + +@Getter +public enum AlarmTypeEnum { + EARLY_WARN(0, "电能质量技术预警单"), + REPORT_WARN(1, "电能质量技术告警单"); + private final Integer code; + + private final String message; + + AlarmTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + public static AlarmTypeEnum getAlarmTypeEnumByCode(Integer code) { + for (AlarmTypeEnum alarmTypeEnum : AlarmTypeEnum.values()) { + if (alarmTypeEnum.getCode().equals(code)) { + return alarmTypeEnum; + } + } + return null; + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java index ddbbd0462..4ab2e21c0 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java @@ -9,14 +9,14 @@ import org.apache.commons.lang3.StringUtils; @Getter public enum SteadyIndicatorEnum { - Negative_Voltage("Negative_Voltage", "与负序电压不平衡度"), - Interhar_Voltage("Interhar_Voltage", "间谐波电压"), - Neg_Current("Neg_Current", "负序电流"), - Fre_Deviation("Fre_Deviation", "频率偏差"), - Voltage_Dev("Voltage_Dev", "电压偏差"), - Har_Current("Har_Current", "谐波电流"), - Voltage_Fluc("Voltage_Fluc", "电压波动与闪变"), - Har_Voltage("Har_Voltage", "谐波电压"); + Negative_Voltage("Negative_Voltage", "负序电压不平衡度越限"), + Interhar_Voltage("Interhar_Voltage", "间谐波电压越限"), + Neg_Current("Neg_Current", "负序电流越限"), + Fre_Deviation("Fre_Deviation", "频率偏差越限"), + Voltage_Dev("Voltage_Dev", "电压偏差越限"), + Har_Current("Har_Current", "谐波电流越限"), + Voltage_Fluc("Voltage_Fluc", "电压波动与闪变越限"), + Har_Voltage("Har_Voltage", "谐波电压越限"); private final String code; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java index f6c1c9b6e..a48c8b506 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java @@ -19,16 +19,21 @@ import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.prepare.enums.*; import com.njcn.prepare.harmonic.mapper.mysql.line.*; import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService; +import com.njcn.process.annotaion.HarCurrent; +import com.njcn.process.annotaion.HarVoltage; +import com.njcn.process.annotaion.InterharVoltage; import com.njcn.process.pojo.po.*; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import com.njcn.web.utils.RequestUtil; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -63,6 +68,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl initSupervise(Integer initType) { if (initType == null) { @@ -73,6 +80,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl> deptMap = thsStrategyList.stream().collect(Collectors.groupingBy(ThsStrategyVo::getDeptId)); for (Map.Entry> entry : deptMap.entrySet()) { + String depId = entry.getKey(); List deptList = entry.getValue(); List oneLevel = deptList.stream().filter(r -> !GradeEnum.THREE_LEVEL.getCode().equals(r.getGrade())).collect(Collectors.toList());//一级或二级策略集合 List oneSourceSteadyIndicatorList = new ArrayList<>(); @@ -100,28 +108,30 @@ public class ThsSuperviseServiceImpl extends ServiceImpl iterator = oneSourceSteadyIndicatorList.iterator(); while (iterator.hasNext()) { SourceSteadyIndicator sourceSteady = iterator.next(); - if (StringUtils.equals(threeStrategyVo.getMonitorId(), sourceSteady.getMonitorId())) { - List interferenceSourceAsses = this.queryWarnStrategyAss(threeStrategyVo.getId(), TypeEnum.SOURCE_TYPE); - //干扰源类型id - List threeInterferenceSourceIds = interferenceSourceAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); - List threeSteadyIndicatorAsses = this.queryWarnStrategyAss(threeStrategyVo.getId(), TypeEnum.INTERFERENCE_TYPE); - //指标类型id - List steadyIndicatorIds = threeSteadyIndicatorAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); - for (String threeInterferenceSourceId : threeInterferenceSourceIds) { - if (OperationEnum.AND.getCode().equals(threeStrategyVo.getOperation())) {//处理三级策略的与 - if (OperationEnum.AND.getCode().equals(sourceSteady.getOperation())) { - if (StringUtils.equals(threeInterferenceSourceId, sourceSteady.getInterferenceSource()) && - steadyIndicatorIds.containsAll(sourceSteady.getSteadyIndicator())) { - iterator.remove(); + if (sourceSteady.getType().equals(threeStrategyVo.getType())) { + if (StringUtils.equals(threeStrategyVo.getMonitorId(), sourceSteady.getMonitorId())) { + List interferenceSourceAsses = this.queryWarnStrategyAss(threeStrategyVo.getId(), TypeEnum.SOURCE_TYPE); + //干扰源类型id + List threeInterferenceSourceIds = interferenceSourceAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); + List threeSteadyIndicatorAsses = this.queryWarnStrategyAss(threeStrategyVo.getId(), TypeEnum.INTERFERENCE_TYPE); + //指标类型id + List steadyIndicatorIds = threeSteadyIndicatorAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); + for (String threeInterferenceSourceId : threeInterferenceSourceIds) { + if (OperationEnum.AND.getCode().equals(threeStrategyVo.getOperation())) {//处理三级策略的与 + if (OperationEnum.AND.getCode().equals(sourceSteady.getOperation())) { + if (StringUtils.equals(threeInterferenceSourceId, sourceSteady.getInterferenceSource()) && + steadyIndicatorIds.containsAll(sourceSteady.getSteadyIndicator())) { + iterator.remove(); + } } - } - } else {//处理三级策略的或 - if (StringUtils.equals(threeInterferenceSourceId, sourceSteady.getInterferenceSource())) { - if (steadyIndicatorIds.containsAll(sourceSteady.getSteadyIndicator())) { - iterator.remove(); - } else { - List steadyIndicator = sourceSteady.getSteadyIndicator(); - steadyIndicator.removeAll(steadyIndicatorIds); + } else {//处理三级策略的或 + if (StringUtils.equals(threeInterferenceSourceId, sourceSteady.getInterferenceSource())) { + if (steadyIndicatorIds.containsAll(sourceSteady.getSteadyIndicator())) { + iterator.remove(); + } else { + List steadyIndicator = sourceSteady.getSteadyIndicator(); + steadyIndicator.removeAll(steadyIndicatorIds); + } } } } @@ -131,6 +141,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { Monitor monitor = pmsMonitorMapper.selectById(steady.getMonitorId()); if (monitor != null) { @@ -138,7 +150,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap = this.verifyLimit(limitRate, steady); + Map limitBoolMap = this.verifyLimit(limitRate, steady); //生成监督数据 this.creatSuperviseData(steady, limitBoolMap, monitor, limitRate); } @@ -147,8 +159,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { + this.deleteTodayData(depId); //查询部门下所有监测点基本信息 PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); pmsDeviceInfoParam.setDeptIndex(depId); @@ -210,7 +221,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap = this.verifyLimit(limitRate, steady); + Map limitBoolMap = this.verifyLimit(limitRate, steady); //生成监督数据 this.creatSuperviseData(steady, limitBoolMap, monitor, limitRate); } @@ -258,37 +269,26 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap, Monitor monitor, LimitRate limitRate) { + public void creatSuperviseData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate) { if (CollectionUtil.isNotEmpty(limitBoolMap)) { if (OperationEnum.AND.getCode().equals(steady.getOperation())) { - for (Map.Entry entry : limitBoolMap.entrySet()) { - if (!entry.getValue()) { + for (Map.Entry entry : limitBoolMap.entrySet()) { + if (entry.getValue() instanceof Boolean && !(boolean) entry.getValue()) { return; } } - //判断今日是否已经生成了监督数据 - LambdaQueryWrapper superviseQueryWrapper = new LambdaQueryWrapper<>(); - superviseQueryWrapper.between(ThsSupervise::getCreateTime, - DateUtil.beginOfDay(new Date()), - DateUtil.endOfDay(new Date())) - .eq(ThsSupervise::getDeptId, steady.getDeptId()) - .eq(ThsSupervise::getType, steady.getType()) - .last("limit 1"); - ThsSupervise thsSupervise = thsSuperviseMapper.selectOne(superviseQueryWrapper); - if (thsSupervise == null) { - //生成监督数据 - thsSupervise = this.insertSuperviseData(steady, monitor, limitRate); - } + //生成监督数据 + ThsSupervise thsSupervise = this.insertSuperviseData(steady, monitor, limitRate, limitBoolMap); //生成告警/预警监测点列表数据 - this.insertOverRunLog(steady, thsSupervise, monitor, limitRate); + this.insertOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap); } if (OperationEnum.OR.getCode().equals(steady.getOperation())) { - for (Map.Entry entry : limitBoolMap.entrySet()) { - if (entry.getValue()) { + for (Map.Entry entry : limitBoolMap.entrySet()) { + if (entry.getValue() instanceof Boolean && (boolean) entry.getValue()) { //生成监督数据 - ThsSupervise thsSupervise = this.insertSuperviseData(steady, monitor, limitRate); + ThsSupervise thsSupervise = this.insertSuperviseData(steady, monitor, limitRate, limitBoolMap); //生成告警/预警监测点列表数据 - this.insertOverRunLog(steady, thsSupervise, monitor, limitRate); + this.insertOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap); break; } } @@ -298,16 +298,30 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap) { + //判断今日是否已经生成了监督数据 + LambdaQueryWrapper superviseQueryWrapper = new LambdaQueryWrapper<>(); + superviseQueryWrapper.between(ThsSupervise::getCreateTime, + DateUtil.beginOfDay(new Date()), + DateUtil.endOfDay(new Date())) + .eq(ThsSupervise::getDeptId, steady.getDeptId()) + .eq(ThsSupervise::getType, steady.getType()) + .last("limit 1"); + ThsSupervise supervise = thsSuperviseMapper.selectOne(superviseQueryWrapper); + if (supervise != null) { + return supervise; + } ThsSupervise thsSupervise = new ThsSupervise(); thsSupervise.setSupIndex(IdUtil.simpleUUID()); - thsSupervise.setName(monitor.getPowerrName() + "_" + monitor.getName() + "_" + DateUtil.today() + "_" + monitor.getId()); + AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getAlarmTypeEnumByCode(steady.getType()); + thsSupervise.setName(DateUtil.today() + monitor.getPowerrName() + (alarmTypeEnum == null ? "" : "_" + alarmTypeEnum.getMessage())); thsSupervise.setDeptId(steady.getDeptId()); - thsSupervise.setCreateUser(steady.getCreateBy()); thsSupervise.setCreateTime(new Date()); thsSupervise.setType(steady.getType()); - thsSupervise.setCreateUser(steady.getCreateBy()); + thsSupervise.setCreateUser(RequestUtil.getUsername()); thsSupervise.setProgress(ProgressEnum.START.getCode()); + List descriptionList = (List) limitBoolMap.get(DESCRIPTION); + thsSupervise.setDescription(StringUtils.join(descriptionList, ",")); thsSuperviseMapper.insert(thsSupervise); return thsSupervise; } @@ -315,8 +329,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap) { ThsOverRunLog thsOverRunLog = new ThsOverRunLog(); thsOverRunLog.setId(IdUtil.simpleUUID()); thsOverRunLog.setSupIndex(thsSupervise.getSupIndex()); @@ -324,6 +337,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl descriptionList = (List) limitBoolMap.get(DESCRIPTION); + thsOverRunLog.setDescription(StringUtils.join(descriptionList, ",")); thsOverRunLogMapper.insert(thsOverRunLog); } @@ -338,16 +353,37 @@ public class ThsSuperviseServiceImpl extends ServiceImpl().eq(ThsSupervise::getDeptId, depId) + .between(ThsSupervise::getCreateTime, + DateUtil.beginOfDay(new Date()), + DateUtil.endOfDay(new Date())).last("limit 1")); + if (thsSupervise != null) { + thsOverRunLogMapper.delete(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, thsSupervise.getSupIndex())); + } + thsSuperviseMapper.delete(new LambdaQueryWrapper().eq(ThsSupervise::getDeptId, depId) + .between(ThsSupervise::getCreateTime, + DateUtil.beginOfDay(new Date()), + DateUtil.endOfDay(new Date()))); + } + /** * 判断监测数据是否超标 * * @param limitRate * @param steady */ - private Map verifyLimit(LimitRate limitRate, SourceSteadyIndicator steady) { + private Map verifyLimit(LimitRate limitRate, SourceSteadyIndicator steady) { if (limitRate != null) { List steadyIndicator = steady.getSteadyIndicator(); - Map limitBoolMap = new HashedMap(); + Map limitBoolMap = new HashedMap(); + List discreptionList = new ArrayList<>(); steadyIndicator.forEach(id -> { HttpResult dicDataById = dicDataFeignClient.getDicDataById(id); if (CommonResponseEnum.SUCCESS.getCode().equals(dicDataById.getCode()) && dicDataById.getData() != null) { @@ -357,28 +393,16 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Negative_Voltage.getMessage().concat(limitRate.getUbalanceOvertime() + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), false); } break; case Interhar_Voltage://间谐波电压 - if (limitRate.getInuharm1Overtime() > 0 || - limitRate.getInuharm2Overtime() > 0 || - limitRate.getInuharm3Overtime() > 0 || - limitRate.getInuharm4Overtime() > 0 || - limitRate.getInuharm5Overtime() > 0 || - limitRate.getInuharm6Overtime() > 0 || - limitRate.getInuharm7Overtime() > 0 || - limitRate.getInuharm8Overtime() > 0 || - limitRate.getInuharm9Overtime() > 0 || - limitRate.getInuharm10Overtime() > 0 || - limitRate.getInuharm11Overtime() > 0 || - limitRate.getInuharm12Overtime() > 0 || - limitRate.getInuharm13Overtime() > 0 || - limitRate.getInuharm14Overtime() > 0 || - limitRate.getInuharm15Overtime() > 0 || - limitRate.getInuharm16Overtime() > 0) { + Integer interharVoltageOvertime = this.maxValue(limitRate, InterharVoltage.class); + if (interharVoltageOvertime > 0) { limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Interhar_Voltage.getMessage().concat(interharVoltageOvertime + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), false); } @@ -386,6 +410,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Neg_Current.getMessage().concat(limitRate.getINegOvertime() + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), false); } @@ -393,6 +418,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Fre_Deviation.getMessage().concat(limitRate.getFreqDevOvertime() + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), false); } @@ -400,36 +426,16 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Voltage_Dev.getMessage().concat(limitRate.getVoltageDevOvertime() + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), false); } break; case Har_Current://谐波电流 - if (limitRate.getIharm2Overtime() > 0 || - limitRate.getIharm3Overtime() > 0 || - limitRate.getIharm4Overtime() > 0 || - limitRate.getIharm5Overtime() > 0 || - limitRate.getIharm6Overtime() > 0 || - limitRate.getIharm7Overtime() > 0 || - limitRate.getIharm8Overtime() > 0 || - limitRate.getIharm9Overtime() > 0 || - limitRate.getIharm10Overtime() > 0 || - limitRate.getIharm11Overtime() > 0 || - limitRate.getIharm12Overtime() > 0 || - limitRate.getIharm13Overtime() > 0 || - limitRate.getIharm14Overtime() > 0 || - limitRate.getIharm15Overtime() > 0 || - limitRate.getIharm16Overtime() > 0 || - limitRate.getIharm17Overtime() > 0 || - limitRate.getIharm18Overtime() > 0 || - limitRate.getIharm19Overtime() > 0 || - limitRate.getIharm20Overtime() > 0 || - limitRate.getIharm21Overtime() > 0 || - limitRate.getIharm22Overtime() > 0 || - limitRate.getIharm23Overtime() > 0 || - limitRate.getIharm24Overtime() > 0 || - limitRate.getIharm25Overtime() > 0) { + Integer harCurrentOvertime = this.maxValue(limitRate, HarCurrent.class); + if (harCurrentOvertime > 0) { limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Har_Current.getMessage().concat(harCurrentOvertime + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), false); } @@ -437,36 +443,16 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Voltage_Fluc.getMessage().concat(limitRate.getFlickerOvertime() + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), false); } break; case Har_Voltage://谐波电压 - if (limitRate.getUharm2Overtime() > 0 || - limitRate.getUharm3Overtime() > 0 || - limitRate.getUharm4Overtime() > 0 || - limitRate.getUharm5Overtime() > 0 || - limitRate.getUharm6Overtime() > 0 || - limitRate.getUharm7Overtime() > 0 || - limitRate.getUharm8Overtime() > 0 || - limitRate.getUharm9Overtime() > 0 || - limitRate.getUharm10Overtime() > 0 || - limitRate.getUharm11Overtime() > 0 || - limitRate.getUharm12Overtime() > 0 || - limitRate.getUharm13Overtime() > 0 || - limitRate.getUharm14Overtime() > 0 || - limitRate.getUharm15Overtime() > 0 || - limitRate.getUharm16Overtime() > 0 || - limitRate.getUharm17Overtime() > 0 || - limitRate.getUharm18Overtime() > 0 || - limitRate.getUharm19Overtime() > 0 || - limitRate.getUharm20Overtime() > 0 || - limitRate.getUharm21Overtime() > 0 || - limitRate.getUharm22Overtime() > 0 || - limitRate.getUharm23Overtime() > 0 || - limitRate.getUharm24Overtime() > 0 || - limitRate.getUharm25Overtime() > 0) { + Integer harVoltageOvertime = this.maxValue(limitRate, HarVoltage.class); + if (harVoltageOvertime > 0) { limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), true); + discreptionList.add(SteadyIndicatorEnum.Har_Voltage.getMessage().concat(harVoltageOvertime + "次")); } else { limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), false); } @@ -475,9 +461,38 @@ public class ThsSuperviseServiceImpl extends ServiceImpl maxValue) { + maxValue = (Integer) objValue; + } + } + } + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return maxValue; + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java index 537829152..d11cf311f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java @@ -41,7 +41,7 @@ public interface ThsSuperviseService extends IService { * * @param limitBoolMap */ - void creatSuperviseData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate); + void creatSuperviseData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate); List queryWarnStrategyAss(String id, TypeEnum typeEnum); @@ -52,7 +52,7 @@ public interface ThsSuperviseService extends IService { * @param monitor * @return */ - ThsSupervise insertSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate); + ThsSupervise insertSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate,Map limitBoolMap); /** * 生成 告警/预警监测点列表 数据 @@ -61,7 +61,7 @@ public interface ThsSuperviseService extends IService { * @param thsSupervise * @param monitor */ - void insertOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate); + void insertOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate,Map limitBoolMap); void initCommonStrategy(List thsStrategyList); } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarCurrent.java b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarCurrent.java new file mode 100644 index 000000000..8b223a814 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarCurrent.java @@ -0,0 +1,9 @@ +package com.njcn.process.annotaion; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface HarCurrent { +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarVoltage.java b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarVoltage.java new file mode 100644 index 000000000..895e4d45b --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/HarVoltage.java @@ -0,0 +1,9 @@ +package com.njcn.process.annotaion; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface HarVoltage { +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/InterharVoltage.java b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/InterharVoltage.java new file mode 100644 index 000000000..34674bb10 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/annotaion/InterharVoltage.java @@ -0,0 +1,9 @@ +package com.njcn.process.annotaion; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface InterharVoltage { +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/LimitRate.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/LimitRate.java index 974abd636..7e6cd9912 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/LimitRate.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/LimitRate.java @@ -2,7 +2,11 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.process.annotaion.HarCurrent; +import com.njcn.process.annotaion.HarVoltage; +import com.njcn.process.annotaion.InterharVoltage; import lombok.Data; +import lombok.ToString; import java.util.Date; @@ -16,6 +20,7 @@ import java.util.Date; */ @Data @TableName("limit_rate") +@ToString public class LimitRate { private static final long serialVersionUID = 1L; @@ -82,260 +87,323 @@ public class LimitRate { /** * 2次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_2_overtime") private Integer uharm2Overtime; /** * 3次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_3_overtime") private Integer uharm3Overtime; /** * 4次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_4_overtime") private Integer uharm4Overtime; /** * 5次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_5_overtime") private Integer uharm5Overtime; /** * 6次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_6_overtime") private Integer uharm6Overtime; /** * 7次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_7_overtime") private Integer uharm7Overtime; /** * 8次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_8_overtime") private Integer uharm8Overtime; /** * 9次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_9_overtime") private Integer uharm9Overtime; /** * 10次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_10_overtime") private Integer uharm10Overtime; /** * 11次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_11_overtime") private Integer uharm11Overtime; /** * 12次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_12_overtime") private Integer uharm12Overtime; /** * 13次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_13_overtime") private Integer uharm13Overtime; /** * 14次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_14_overtime") private Integer uharm14Overtime; /** * 15次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_15_overtime") private Integer uharm15Overtime; /** * 16次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_16_overtime") private Integer uharm16Overtime; /** * 17次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_17_overtime") private Integer uharm17Overtime; /** * 18次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_18_overtime") private Integer uharm18Overtime; /** * 19次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_19_overtime") private Integer uharm19Overtime; /** * 20次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_20_overtime") private Integer uharm20Overtime; /** * 21次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_21_overtime") private Integer uharm21Overtime; /** * 22次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_22_overtime") private Integer uharm22Overtime; /** * 23次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_23_overtime") private Integer uharm23Overtime; /** * 24次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_24_overtime") private Integer uharm24Overtime; /** * 25次电压谐波含有率越限次数 */ + @HarVoltage @TableField(value = "uharm_25_overtime") private Integer uharm25Overtime; /** * 2次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_2_overtime") private Integer iharm2Overtime; /** * 3次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_3_overtime") private Integer iharm3Overtime; /** * 4次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_4_overtime") private Integer iharm4Overtime; /** * 5次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_5_overtime") private Integer iharm5Overtime; /** * 6次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_6_overtime") private Integer iharm6Overtime; /** * 7次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_7_overtime") private Integer iharm7Overtime; /** * 8次电流谐波幅值越限次数 */ + @HarCurrent @TableField(value = "iharm_8_overtime") private Integer iharm8Overtime; + @HarCurrent @TableField(value = "iharm_9_overtime") private Integer iharm9Overtime; + @HarCurrent @TableField(value = "iharm_10_overtime") private Integer iharm10Overtime; + @HarCurrent @TableField(value = "iharm_11_overtime") private Integer iharm11Overtime; + @HarCurrent @TableField(value = "iharm_12_overtime") private Integer iharm12Overtime; + @HarCurrent @TableField(value = "iharm_13_overtime") private Integer iharm13Overtime; + @HarCurrent @TableField(value = "iharm_14_overtime") private Integer iharm14Overtime; + @HarCurrent @TableField(value = "iharm_15_overtime") private Integer iharm15Overtime; + @HarCurrent @TableField(value = "iharm_16_overtime") private Integer iharm16Overtime; + @HarCurrent @TableField(value = "iharm_17_overtime") private Integer iharm17Overtime; + @HarCurrent @TableField(value = "iharm_18_overtime") private Integer iharm18Overtime; + @HarCurrent @TableField(value = "iharm_19_overtime") private Integer iharm19Overtime; + @HarCurrent @TableField(value = "iharm_20_overtime") private Integer iharm20Overtime; + @HarCurrent @TableField(value = "iharm_21_overtime") private Integer iharm21Overtime; + @HarCurrent @TableField(value = "iharm_22_overtime") private Integer iharm22Overtime; + @HarCurrent @TableField(value = "iharm_23_overtime") private Integer iharm23Overtime; + @HarCurrent @TableField(value = "iharm_24_overtime") private Integer iharm24Overtime; + @HarCurrent @TableField(value = "iharm_25_overtime") private Integer iharm25Overtime; /** * 0.5次间谐波电压限值次数 */ + @InterharVoltage @TableField(value = "inuharm_1_overtime") private Integer inuharm1Overtime; + @InterharVoltage @TableField(value = "inuharm_2_overtime") private Integer inuharm2Overtime; + @InterharVoltage @TableField(value = "inuharm_3_overtime") private Integer inuharm3Overtime; + @InterharVoltage @TableField(value = "inuharm_4_overtime") private Integer inuharm4Overtime; + @InterharVoltage @TableField(value = "inuharm_5_overtime") private Integer inuharm5Overtime; + @InterharVoltage @TableField(value = "inuharm_6_overtime") private Integer inuharm6Overtime; + @InterharVoltage @TableField(value = "inuharm_7_overtime") private Integer inuharm7Overtime; + @InterharVoltage @TableField(value = "inuharm_8_overtime") private Integer inuharm8Overtime; + @InterharVoltage @TableField(value = "inuharm_9_overtime") private Integer inuharm9Overtime; + @InterharVoltage @TableField(value = "inuharm_10_overtime") private Integer inuharm10Overtime; + @InterharVoltage @TableField(value = "inuharm_11_overtime") private Integer inuharm11Overtime; + @InterharVoltage @TableField(value = "inuharm_12_overtime") private Integer inuharm12Overtime; + @InterharVoltage @TableField(value = "inuharm_13_overtime") private Integer inuharm13Overtime; + @InterharVoltage @TableField(value = "inuharm_14_overtime") private Integer inuharm14Overtime; + @InterharVoltage @TableField(value = "inuharm_15_overtime") private Integer inuharm15Overtime; /** * 15.5次间谐波电压限值次数 */ + @InterharVoltage @TableField(value = "inuharm_16_overtime") private Integer inuharm16Overtime; - } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsOverRunLog.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsOverRunLog.java index 85354744e..187ab3934 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsOverRunLog.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsOverRunLog.java @@ -42,7 +42,7 @@ public class ThsOverRunLog { /** * 描述 */ - private String describe; + private String description; /** * 预/告警单