From 1295cdd46312aabe74937f1064560a48f64252c2 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 4 May 2023 13:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8=E8=A1=A8r?= =?UTF-8?q?=5Fstat=5Flimit=5Frate=5Fd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/mysql/line/LimitRateMapper.java | 36 +- .../mysql/Impl/line/LimitRateServiceImpl.java | 40 +- .../Impl/line/ThsSuperviseServiceImpl.java | 25 +- .../mysql/day/IRStatLimitRateDService.java | 3 +- .../service/mysql/line/LimitRateService.java | 32 +- .../mysql/line/ThsSuperviseService.java | 10 +- .../com/njcn/process/pojo/po/LimitRate.java | 818 +++++++++--------- .../service/impl/ThsSuperviseServiceImpl.java | 176 ++-- 8 files changed, 569 insertions(+), 571 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java index 7ec94f897..1fda68624 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java @@ -1,18 +1,18 @@ -package com.njcn.prepare.harmonic.mapper.mysql.line; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.process.pojo.po.LimitRate; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author lxp - * @since 2023-03-16 - */ -@Mapper -public interface LimitRateMapper extends BaseMapper { - -} +//package com.njcn.prepare.harmonic.mapper.mysql.line; +// +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.njcn.process.pojo.po.LimitRate; +//import org.apache.ibatis.annotations.Mapper; +// +///** +// *

+// * Mapper 接口 +// *

+// * +// * @author lxp +// * @since 2023-03-16 +// */ +//@Mapper +//public interface LimitRateMapper extends BaseMapper { +// +//} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java index 0b6ace362..fa3d2b327 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java @@ -1,20 +1,20 @@ -package com.njcn.prepare.harmonic.service.mysql.Impl.line; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.prepare.harmonic.mapper.mysql.line.LimitRateMapper; -import com.njcn.prepare.harmonic.service.mysql.line.LimitRateService; -import com.njcn.process.pojo.po.LimitRate; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author lxp - * @since 2023-03-16 - */ -@Service -public class LimitRateServiceImpl extends ServiceImpl implements LimitRateService { - -} +//package com.njcn.prepare.harmonic.service.mysql.Impl.line; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import com.njcn.prepare.harmonic.mapper.mysql.line.LimitRateMapper; +//import com.njcn.prepare.harmonic.service.mysql.line.LimitRateService; +//import com.njcn.process.pojo.po.LimitRate; +//import org.springframework.stereotype.Service; +// +///** +// *

+// * 服务实现类 +// *

+// * +// * @author lxp +// * @since 2023-03-16 +// */ +//@Service +//public class LimitRateServiceImpl extends ServiceImpl implements LimitRateService { +// +//} 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 ccc831a8a..86ed6074a 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 @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; import com.njcn.harmonic.pojo.vo.SourceSteadyIndicator; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.oss.utils.FileStorageUtil; @@ -21,12 +21,12 @@ import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService; 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.api.FlowableDefineFeignClient; -import com.njcn.process.pojo.po.LimitRate; import com.njcn.process.pojo.po.ThsWarnStrategyAss; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.pojo.po.DictData; @@ -37,7 +37,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -68,7 +67,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap = this.verifyLimit(limitRate, steady); //构建监督数据 @@ -272,7 +271,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { + public void buildData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, RStatLimitRateDPO limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { if (CollectionUtil.isNotEmpty(limitBoolMap)) { if (OperationEnum.AND.getCode().equals(steady.getOperation())) { for (Map.Entry entry : limitBoolMap.entrySet()) { @@ -302,7 +301,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { + public void buildSuperviseData(SourceSteadyIndicator steady, Monitor monitor, RStatLimitRateDPO limitRate, Map limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { if (thsSupervise != null && StringUtils.isBlank(thsSupervise.getSupIndex())) { thsSupervise.setSupIndex(IdUtil.simpleUUID()); thsSupervise.setDeptId(steady.getDeptId()); @@ -316,13 +315,13 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap, Integer initType, List thsOverRunLogs) { + public void buildOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, RStatLimitRateDPO limitRate, Map limitBoolMap, Integer initType, List thsOverRunLogs) { ThsOverRunLog thsOverRunLog = new ThsOverRunLog(); thsOverRunLog.setId(IdUtil.simpleUUID()); thsOverRunLog.setSupIndex(thsSupervise.getSupIndex()); thsOverRunLog.setLineIndex(monitor.getId()); thsOverRunLog.setName(monitor.getPowerrName() + "_" + monitor.getName() + "_" + DateUtil.today() + "_" + monitor.getId()); - thsOverRunLog.setUpdateTime(limitRate.getCreatTime()); + thsOverRunLog.setUpdateTime(limitRate.getTime()); thsOverRunLog.setCreateTime(new Date()); List descriptionList = (List) limitBoolMap.get(DESCRIPTION); thsOverRunLog.setDescription(StringUtils.join(descriptionList, ",")); @@ -332,9 +331,9 @@ public class ThsSuperviseServiceImpl extends ServiceImpl().eq(LimitRate::getLineId, monitorId) - .between(LimitRate::getCreatTime, + public RStatLimitRateDPO queryLimitTargetData(String monitorId) { + RStatLimitRateDPO limitRate = rateDService.getOne(new LambdaQueryWrapper().eq(RStatLimitRateDPO::getLineId, monitorId) + .between(RStatLimitRateDPO::getTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1)), DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))).last("limit 1")); return limitRate; @@ -347,7 +346,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl verifyLimit(LimitRate limitRate, SourceSteadyIndicator steady) { + private Map verifyLimit(RStatLimitRateDPO limitRate, SourceSteadyIndicator steady) { if (limitRate != null) { List steadyIndicator = steady.getSteadyIndicator(); Map limitBoolMap = new HashedMap(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java index 744dc2ea3..fb9e2b4b0 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; import java.util.List; -public interface IRStatLimitRateDService { +public interface IRStatLimitRateDService extends IMppService { void insert(List list); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitRateService.java index 60f9df265..0c349fe42 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitRateService.java @@ -1,16 +1,16 @@ -package com.njcn.prepare.harmonic.service.mysql.line; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.process.pojo.po.LimitRate; - -/** - *

- * 服务类 - *

- * - * @author lxp - * @since 2023-03-16 - */ -public interface LimitRateService extends IService { - -} +//package com.njcn.prepare.harmonic.service.mysql.line; +// +//import com.baomidou.mybatisplus.extension.service.IService; +//import com.njcn.process.pojo.po.LimitRate; +// +///** +// *

+// * 服务类 +// *

+// * +// * @author lxp +// * @since 2023-03-16 +// */ +//public interface LimitRateService extends IService { +// +//} 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 1d490d02d..13822fbbe 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 @@ -3,13 +3,13 @@ package com.njcn.prepare.harmonic.service.mysql.line; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; import com.njcn.harmonic.pojo.vo.SourceSteadyIndicator; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.prepare.enums.TypeEnum; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; -import com.njcn.process.pojo.po.LimitRate; import com.njcn.process.pojo.po.ThsWarnStrategyAss; import com.njcn.user.pojo.po.Dept; @@ -43,14 +43,14 @@ public interface ThsSuperviseService extends IService { * * @param monitorId */ - LimitRate queryLimitTargetData(String monitorId); + RStatLimitRateDPO queryLimitTargetData(String monitorId); /** * 生成监督数据 * * @param limitBoolMap */ - void buildData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); + void buildData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, RStatLimitRateDPO limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); /** * 查询策略绑定的干扰源列表或指标参数列表 @@ -68,7 +68,7 @@ public interface ThsSuperviseService extends IService { * @param monitor * @return */ - void buildSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); + void buildSuperviseData(SourceSteadyIndicator steady, Monitor monitor, RStatLimitRateDPO limitRate, Map limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); /** * 生成 告警/预警监测点列表 数据 @@ -77,7 +77,7 @@ public interface ThsSuperviseService extends IService { * @param thsSupervise * @param monitor */ - void buildOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, List thsOverRunLogs); + void buildOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, RStatLimitRateDPO limitRate, Map limitBoolMap, Integer initType, List thsOverRunLogs); /** 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 7e6cd9912..ed3d30cf8 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 @@ -1,409 +1,409 @@ -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; - -/** - *

- * - *

- * - * @author lxp - * @since 2023-03-16 - */ -@Data -@TableName("limit_rate") -@ToString -public class LimitRate { - - private static final long serialVersionUID = 1L; - - /** - * 创建时间 - */ - @TableField(value = "creat_time") - private Date creatTime; - - /** - * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示A - */ - @TableField(value = "phasic_type") - private String phasicType; - - /** - * 监测点ID合格率的变电站/装置/母线/线路序号 - */ - @TableField(value = "line_id") - private String lineId; - - /** - * 总计算次数 - */ - @TableField(value = "alltime") - private Integer alltime; - - /** - * 闪变总计算次数 - */ - @TableField(value = "flicket_alltime") - private Integer flicketAlltime; - - /** - * 频率偏差越限次数 - */ - private Integer freqDevOvertime; - - /** - * 电压偏差越限次数 - */ - private Integer voltageDevOvertime; - - /** - * 电压不平衡度越限次数 - */ - private Integer ubalanceOvertime; - - /** - * 闪变越限次数 - */ - private Integer flickerOvertime; - - /** - * 电压谐波畸变率越限次数 - */ - private Integer uaberranceOvertime; - /** - * 负序电流限值次数 - */ - private Integer iNegOvertime; - - /** - * 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; - -} +//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; +// +///** +// *

+// * +// *

+// * +// * @author lxp +// * @since 2023-03-16 +// */ +//@Data +//@TableName("limit_rate") +//@ToString +//public class LimitRate { +// +// private static final long serialVersionUID = 1L; +// +// /** +// * 创建时间 +// */ +// @TableField(value = "creat_time") +// private Date creatTime; +// +// /** +// * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示A +// */ +// @TableField(value = "phasic_type") +// private String phasicType; +// +// /** +// * 监测点ID合格率的变电站/装置/母线/线路序号 +// */ +// @TableField(value = "line_id") +// private String lineId; +// +// /** +// * 总计算次数 +// */ +// @TableField(value = "alltime") +// private Integer alltime; +// +// /** +// * 闪变总计算次数 +// */ +// @TableField(value = "flicket_alltime") +// private Integer flicketAlltime; +// +// /** +// * 频率偏差越限次数 +// */ +// private Integer freqDevOvertime; +// +// /** +// * 电压偏差越限次数 +// */ +// private Integer voltageDevOvertime; +// +// /** +// * 电压不平衡度越限次数 +// */ +// private Integer ubalanceOvertime; +// +// /** +// * 闪变越限次数 +// */ +// private Integer flickerOvertime; +// +// /** +// * 电压谐波畸变率越限次数 +// */ +// private Integer uaberranceOvertime; +// /** +// * 负序电流限值次数 +// */ +// private Integer iNegOvertime; +// +// /** +// * 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-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index 24e595357..8c110fe21 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -32,7 +32,6 @@ import com.njcn.process.enums.*; import com.njcn.process.mapper.*; import com.njcn.process.pojo.param.FileParam; import com.njcn.process.pojo.po.FlowableAss; -import com.njcn.process.pojo.po.LimitRate; import com.njcn.process.pojo.po.ThsAlarmFormwork; import com.njcn.process.pojo.vo.flowable.FlowTaskVo; import com.njcn.process.service.ThsSuperviseService; @@ -50,7 +49,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.flowable.task.api.Task; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -615,93 +613,93 @@ public class ThsSuperviseServiceImpl extends ServiceImpl verifyLimit(LimitRate limitRate, SourceSteadyIndicator steady) { - if (limitRate != null) { - List steadyIndicator = steady.getSteadyIndicator(); - Map limitBoolMap = new HashedMap(); - List descriptionList = new ArrayList<>(); - steadyIndicator.forEach(id -> { - HttpResult dicDataById = dicDataFeignClient.getDicDataById(id); - if (CommonResponseEnum.SUCCESS.getCode().equals(dicDataById.getCode()) && dicDataById.getData() != null) { - SteadyIndicatorEnum steadyIndicatorEnum = SteadyIndicatorEnum.getSteadyIndicatorEnumByCode(dicDataById.getData().getCode()); - if (null != steadyIndicatorEnum) { - switch (steadyIndicatorEnum) { - case Negative_Voltage://负序电压不平衡度 - if (limitRate.getUbalanceOvertime() > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Negative_Voltage.getMessage().concat(limitRate.getUbalanceOvertime() + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), false); - } - break; - case Interhar_Voltage://间谐波电压 - Integer interharVoltageOvertime = this.maxOverTime(limitRate, InterharVoltage.class); - if (interharVoltageOvertime > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Interhar_Voltage.getMessage().concat(interharVoltageOvertime + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), false); - } - break; - case Neg_Current://负序电流 - if (limitRate.getINegOvertime() > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Neg_Current.getMessage().concat(limitRate.getINegOvertime() + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), false); - } - break; - case Fre_Deviation://频率偏差 - if (limitRate.getFreqDevOvertime() > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Fre_Deviation.getMessage().concat(limitRate.getFreqDevOvertime() + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), false); - } - break; - case Voltage_Dev://电压偏差 - if (limitRate.getVoltageDevOvertime() > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Voltage_Dev.getMessage().concat(limitRate.getVoltageDevOvertime() + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), false); - } - break; - case Har_Current://谐波电流 - Integer harCurrentOvertime = this.maxOverTime(limitRate, HarCurrent.class); - if (harCurrentOvertime > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Har_Current.getMessage().concat(harCurrentOvertime + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), false); - } - break; - case Voltage_Fluc://电压波动与闪变 - if (limitRate.getFlickerOvertime() > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Voltage_Fluc.getMessage().concat(limitRate.getFlickerOvertime() + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), false); - } - break; - case Har_Voltage://谐波电压 - Integer harVoltageOvertime = this.maxOverTime(limitRate, HarVoltage.class); - if (harVoltageOvertime > 0) { - limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), true); - descriptionList.add(SteadyIndicatorEnum.Har_Voltage.getMessage().concat(harVoltageOvertime + "次")); - } else { - limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), false); - } - break; - } - } - } - }); - limitBoolMap.put(DESCRIPTION, descriptionList); - return limitBoolMap; - } - return null; - } +// private Map verifyLimit(LimitRate limitRate, SourceSteadyIndicator steady) { +// if (limitRate != null) { +// List steadyIndicator = steady.getSteadyIndicator(); +// Map limitBoolMap = new HashedMap(); +// List descriptionList = new ArrayList<>(); +// steadyIndicator.forEach(id -> { +// HttpResult dicDataById = dicDataFeignClient.getDicDataById(id); +// if (CommonResponseEnum.SUCCESS.getCode().equals(dicDataById.getCode()) && dicDataById.getData() != null) { +// SteadyIndicatorEnum steadyIndicatorEnum = SteadyIndicatorEnum.getSteadyIndicatorEnumByCode(dicDataById.getData().getCode()); +// if (null != steadyIndicatorEnum) { +// switch (steadyIndicatorEnum) { +// case Negative_Voltage://负序电压不平衡度 +// if (limitRate.getUbalanceOvertime() > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Negative_Voltage.getMessage().concat(limitRate.getUbalanceOvertime() + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Negative_Voltage.getCode(), false); +// } +// break; +// case Interhar_Voltage://间谐波电压 +// Integer interharVoltageOvertime = this.maxOverTime(limitRate, InterharVoltage.class); +// if (interharVoltageOvertime > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Interhar_Voltage.getMessage().concat(interharVoltageOvertime + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), false); +// } +// break; +// case Neg_Current://负序电流 +// if (limitRate.getINegOvertime() > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Neg_Current.getMessage().concat(limitRate.getINegOvertime() + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), false); +// } +// break; +// case Fre_Deviation://频率偏差 +// if (limitRate.getFreqDevOvertime() > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Fre_Deviation.getMessage().concat(limitRate.getFreqDevOvertime() + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), false); +// } +// break; +// case Voltage_Dev://电压偏差 +// if (limitRate.getVoltageDevOvertime() > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Voltage_Dev.getMessage().concat(limitRate.getVoltageDevOvertime() + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), false); +// } +// break; +// case Har_Current://谐波电流 +// Integer harCurrentOvertime = this.maxOverTime(limitRate, HarCurrent.class); +// if (harCurrentOvertime > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Har_Current.getMessage().concat(harCurrentOvertime + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), false); +// } +// break; +// case Voltage_Fluc://电压波动与闪变 +// if (limitRate.getFlickerOvertime() > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Voltage_Fluc.getMessage().concat(limitRate.getFlickerOvertime() + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), false); +// } +// break; +// case Har_Voltage://谐波电压 +// Integer harVoltageOvertime = this.maxOverTime(limitRate, HarVoltage.class); +// if (harVoltageOvertime > 0) { +// limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), true); +// descriptionList.add(SteadyIndicatorEnum.Har_Voltage.getMessage().concat(harVoltageOvertime + "次")); +// } else { +// limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), false); +// } +// break; +// } +// } +// } +// }); +// limitBoolMap.put(DESCRIPTION, descriptionList); +// return limitBoolMap; +// } +// return null; +// } /*** * 获取越限最大值