实体移动

pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LiteFlowJob.java

@@ -0,0 +1,46 @@
+package com.njcn.executor.handler;
+
+import cn.hutool.core.util.StrUtil;
+import com.njcn.energy.pojo.api.EleAirStrategyFeignClient;
+import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+import com.njcn.web.pojo.param.BaseParam;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * PMS/PQS
+ * 算法定时任务
+ * @author xuyang
+ * @date 2023/11/15
+ */
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LiteFlowJob {
+
+    private final LiteFlowFeignClient liteFlowFeignClient;
+
+    @XxlJob("measurementPointJob")
+    public void measurementPointJob() {
+        BaseParam baseParam = new BaseParam();
+
+
+
+
+    }
+
+    @XxlJob("orgJob")
+    public void orgJob() {
+
+    }
+
+    @XxlJob("substationJob")
+    public void substationJob() {
+
+    }
+
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/LiteFlowFeignClient.java

@@ -0,0 +1,34 @@
+package com.njcn.prepare.harmonic.api.liteflow;
+
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.prepare.harmonic.api.liteflow.fallback.LiteFlowFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xuyang
+ */
+@FeignClient(
+        value = ServerInfo.PREPARE_BOOT,//对应模块名
+        path = "/executor",//对应controller请求类
+        fallbackFactory = LiteFlowFeignClientFallbackFactory.class//服务降级处理类
+)
+public interface LiteFlowFeignClient {
+
+    @ApiOperation("监测点算法执行链")
+    @PostMapping("/measurementPointExecutor")
+    void measurementPointExecutor(@RequestBody BaseParam baseParam);
+
+    @ApiOperation("单位监测点算法执行链")
+    @PostMapping("/orgPointExecutor")
+    void orgPointExecutor(@RequestBody BaseParam baseParam);
+
+    @ApiOperation("变电站算法执行链")
+    @PostMapping("/substationExecutor")
+    void substationExecutor(@RequestBody BaseParam baseParam);
+
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/fallback/LiteFlowFeignClientFallbackFactory.java

@@ -0,0 +1,44 @@
+package com.njcn.prepare.harmonic.api.liteflow.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+import com.njcn.prepare.harmonic.utils.PrepareEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class LiteFlowFeignClientFallbackFactory implements FallbackFactory<LiteFlowFeignClient> {
+    @Override
+    public LiteFlowFeignClient create(Throwable throwable) {
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException)throwable.getCause();
+            exceptionEnum = PrepareEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new LiteFlowFeignClient() {
+            @Override
+            public void measurementPointExecutor(BaseParam baseParam) {
+                log.error("{}异常，降级处理，异常为：{}", "监测点算法执行链:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public void orgPointExecutor(BaseParam baseParam) {
+                log.error("{}异常，降级处理，异常为：{}", "单位监测点算法执行链:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public void substationExecutor(BaseParam baseParam) {
+                log.error("{}异常，降级处理，异常为：{}", "变电站算法执行链:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/BaseParam.java

@@ -1,4 +1,4 @@
-package com.njcn.prepare.bo;
+package com.njcn.prepare.harmonic.pojo.bo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/CalculatedParam.java

@@ -1,4 +1,4 @@
-package com.njcn.prepare.bo;
+package com.njcn.prepare.harmonic.pojo.bo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java

@@ -5,46 +5,35 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
-import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
-import com.njcn.prepare.bo.BaseParam;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.enums.PrepareResponseEnum;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.controller.BaseController;
-import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.flow.LiteflowResponse;
 import com.yomahub.liteflow.flow.entity.CmpStep;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/BaseExecutor.java

@@ -2,7 +2,7 @@ package com.njcn.prepare.executor;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.yomahub.liteflow.core.NodeComponent;
 
 import java.util.Set;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.executor;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.area.IRMpMonitorAlarmCountMService;
 import com.njcn.prepare.harmonic.service.mysql.area.RMpDevEvaluateDetailPOService;
 import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.executor;
 
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.area.RStatOrgService;
 import com.njcn.prepare.harmonic.service.mysql.line.PollutionService;
 import com.njcn.prepare.harmonic.service.mysql.newalgorithm.ROperatingIndexService;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java

@@ -1,11 +1,7 @@
 package com.njcn.prepare.executor;
 
-import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
-import com.njcn.prepare.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.service.mysql.area.RStatOrgService;
 import com.njcn.prepare.harmonic.service.mysql.line.PollutionService;
-import com.njcn.prepare.harmonic.service.mysql.newalgorithm.ROperatingIndexService;
 import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatSubstationService;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java

@@ -1,36 +1,26 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.area;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.github.jknack.handlebars.internal.antlr.misc.Array2DHashSet;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.harmonic.pojo.po.RMpDevEvaluateDetailPO;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpDevEvaluateDetailPOMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpMonitorEvaluateDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorDMapper;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
-import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
 import com.njcn.prepare.harmonic.pojo.po.RMpDevSolveDetailPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDevSignalDPO;
 import com.njcn.prepare.harmonic.service.mysql.area.RMpDevEvaluateDetailPOService;
 import com.njcn.prepare.harmonic.service.mysql.device.RMpDevSolveDetailPOService;
-import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.collections4.SetUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +28,10 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java

@@ -3,13 +3,12 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.dto.RMpMonitorAlarmCountMDTO;
 import com.njcn.harmonic.pojo.po.RMpMonitorAlarmCountMPO;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpMonitorAlarmCountMMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.area.IRMpMonitorAlarmCountMService;
 import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService;
 import lombok.AllArgsConstructor;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java

@@ -4,17 +4,13 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.common.utils.NjcnDateUtils;
 import com.njcn.device.pq.api.LineFeignClient;
-import com.njcn.harmonic.pojo.dto.RMpMonitorAlarmCountMDTO;
 import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO;
-import com.njcn.harmonic.pojo.po.RMpVThd;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO;
 import com.njcn.prepare.harmonic.pojo.dto.RMpTargetWarnDDTO;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService;
 import com.njcn.prepare.harmonic.service.mysql.line.AlarmDetailService;
 import com.njcn.prepare.harmonic.utils.PublicUtil;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java

@@ -7,18 +7,19 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.harmonic.pojo.po.*;
+import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO;
+import com.njcn.harmonic.pojo.po.RStatOrgDPO;
+import com.njcn.harmonic.pojo.po.RStatOrgMPO;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.*;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
-
 import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgQPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgYPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO;
-
 import com.njcn.prepare.harmonic.service.mysql.area.*;
 import com.njcn.prepare.harmonic.utils.PublicUtil;
 import com.njcn.system.api.DicDataFeignClient;
@@ -35,7 +36,10 @@ import org.springframework.util.CollectionUtils;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java

@@ -1,39 +1,34 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.device;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.mapper.mysql.device.RStatDevSignalDPOMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpMonitorEvaluateDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
-import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
+import com.njcn.prepare.harmonic.pojo.po.RStatDevSignalDPO;
+import com.njcn.prepare.harmonic.service.mysql.device.RStatDevSignalDPOService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-
-import com.njcn.prepare.harmonic.mapper.mysql.device.RStatDevSignalDPOMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDevSignalDPO;
-import com.njcn.prepare.harmonic.service.mysql.device.RStatDevSignalDPOService;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java

@@ -3,10 +3,10 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.pms.api.DistributionMonitorClient;
 import com.njcn.device.pms.api.MonitorClient;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.*;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpTargetDiffDPO;
 import com.njcn.prepare.harmonic.service.mysql.line.AlarmDetailService;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java

@@ -12,7 +12,7 @@ import com.njcn.influx.imapper.day.*;
 import com.njcn.influx.pojo.po.*;
 import com.njcn.influx.pojo.po.day.*;
 import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.day.*;
 import com.njcn.prepare.harmonic.service.mysql.line.DayDataService;
 import lombok.RequiredArgsConstructor;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java

@@ -14,8 +14,8 @@ import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.pojo.po.DataV;
 import com.njcn.influx.query.InfluxQueryWrapper;
 import com.njcn.influx.utils.InfluxDbUtils;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService;
 import com.njcn.user.api.DeptFeignClient;
 import lombok.AllArgsConstructor;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java

@@ -14,8 +14,8 @@ import com.njcn.influx.imapper.*;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.pojo.po.*;
 import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.LimitRatePOMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.LimitRateService;
 import lombok.AllArgsConstructor;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java

@@ -10,8 +10,8 @@ import com.njcn.harmonic.pojo.po.LimitRate;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 import com.njcn.influx.utils.InfluxDbUtils;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatLimitTargetDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService;
@@ -25,7 +25,6 @@ import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.InfluxDBResultMapper;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java

@@ -10,15 +10,17 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
-import com.njcn.device.biz.pojo.dto.*;
+import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
+import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
+import com.njcn.device.biz.pojo.dto.LineDevGetBandDTO;
+import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
-import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.harmonic.pojo.dto.PublicDTO;
 import com.njcn.harmonic.pojo.po.*;
 import com.njcn.harmonic.pojo.po.day.*;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.*;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.dto.PollutionDTO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.day.*;
@@ -31,14 +33,12 @@ import com.njcn.user.pojo.po.Dept;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections4.ListUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.BinaryOperator;
 import java.util.stream.Collectors;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailDServiceImpl.java

@@ -1,6 +1,5 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -8,20 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
 import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailDMapper;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailDService;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailMService;
-import com.yomahub.liteflow.exception.LiteFlowException;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailServiceImpl.java

@@ -1,13 +1,13 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
-import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.*;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
 import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailDService;
@@ -23,11 +23,9 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java

@@ -11,15 +11,14 @@ import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.pojo.po.PmsAbnormalRules;
 import com.njcn.influx.pojo.po.DataFlicker;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.PmsAbnormalRulesMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpMonitorEvaluateDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.dto.DataVFiveItemDTO;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
 import com.njcn.prepare.harmonic.service.influxdb.DataIntegrityRateInfluxService;
 import com.njcn.prepare.harmonic.service.influxdb.DataVInfluxdbService;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpMonitorEvaluateDService;
-import com.yomahub.liteflow.exception.LiteFlowException;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.ListUtils;
@@ -29,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java

@@ -2,14 +2,10 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.common.utils.NjcnDateUtils;
 import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailDService;
-import com.njcn.prepare.harmonic.utils.PublicUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -18,9 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 类的介绍：

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java

@@ -6,8 +6,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailMMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailMService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java

@@ -5,25 +5,19 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.commApi.CommLineClient;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.device.pq.api.LineFeignClient;
-import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
-import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
 import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
 import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
-import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO;
@@ -31,7 +25,6 @@ import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.line.*;
 import com.njcn.prepare.harmonic.utils.PublicUtil;
-import com.njcn.system.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java

@@ -3,8 +3,8 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailDService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java

@@ -6,8 +6,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailMMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailMService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java

@@ -4,8 +4,8 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.RMpVThd;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpVThdMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IRMpVThdService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java

@@ -1,22 +1,18 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.commApi.CommLineClient;
 import com.njcn.device.biz.pojo.dto.LineDTO;
-import com.njcn.device.pq.pojo.po.RStatAbnormalD;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpMonitorEvaluateDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RStatAbnormalDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.RStatAbnormalDPO;
-import com.njcn.prepare.harmonic.service.mysql.line.RMpMonitorEvaluateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorService;
-import com.njcn.prepare.harmonic.service.mysql.line.RStatAbnormalDService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -26,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorMServiceImpl.java

@@ -7,14 +7,13 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorMService;
-import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -23,9 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RStatAbnormalDServiceImpl.java

@@ -1,28 +1,19 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RStatAbnormalDMapper;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RStatAbnormalDPO;
-import com.njcn.prepare.harmonic.service.mysql.line.RMpMonitorEvaluateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.RStatAbnormalDService;
-import com.njcn.system.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/IRMpMonitorAlarmCountMService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.area;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * <p>

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpDevEvaluateDetailPOService.java

@@ -2,9 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.area;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.harmonic.pojo.po.RMpDevEvaluateDetailPO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
-
 
 /**
  * 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java

@@ -1,10 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.area;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.harmonic.pojo.dto.RMpMonitorAlarmCountMDTO;
 import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 import java.util.List;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RStatOrgService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.area;
 
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 import java.util.List;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/RStatDevSignalDPOService.java

@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.device;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
 import com.njcn.prepare.harmonic.pojo.po.RStatDevSignalDPO;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimBusGlobalDService.java

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalD;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * <p>

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusGlobalDServiceImpl.java

@@ -2,24 +2,20 @@ package com.njcn.prepare.harmonic.service.mysql.dim.impl;
 
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
-import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
-import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
-import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalD;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.mapper.mysql.area.PmsMonitorPOMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.dim.GeneratrixWireMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusGlobalDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.service.mysql.dim.IRDimBusGlobalDService;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
@@ -28,7 +24,6 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/AlarmDetailService.java

@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 import java.util.List;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * Description:

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailDService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * @author xy

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailMService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 public interface IRMpPartHarmonicDetailMService {
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailDService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * @author xy

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailMService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 public interface IRMpSurplusHarmonicDetailMService {
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpVThdService.java

@@ -1,6 +1,5 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
-
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.bo.CalculatedParam;
 
 public interface IRMpVThdService {
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 /**
  * @author xiaoyao

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitRateService.java

@@ -1,8 +1,5 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
-
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.bo.CalculatedParam;
-
-import java.util.List;
 
 /**
  * @author xuyang

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 import java.util.List;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/PollutionService.java

@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailDService.java

@@ -2,8 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 import java.util.List;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailService.java

@@ -1,8 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.njcn.prepare.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpMonitorEvaluateDService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
 
 import java.util.List;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java

@@ -1,12 +1,10 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
-import java.util.List;
-
 /**
  *
  * Description:

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorMService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
 
 import java.util.List;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RStatAbnormalDService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.RStatAbnormalDPO;
 
 import java.util.List;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/ROperatingIndexService.java

@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.newalgorithm;
 
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 
 import java.util.List;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatSubstationService.java

@@ -1,9 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.newalgorithm;
 
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.bo.CalculatedParam;
-
-import java.util.List;
 
 /**
  * @author zbj

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/ROperatingIndexServiceImpl.java

@@ -7,23 +7,24 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.device.pms.pojo.po.RDnOperatingIndexY;
-import com.njcn.device.pms.pojo.po.RDnOperatingPO;
 import com.njcn.harmonic.pojo.po.ROperatingIndexMPO;
 import com.njcn.harmonic.pojo.po.ROperatingIndexQPO;
 import com.njcn.harmonic.pojo.po.ROperatingIndexYPO;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
-import com.njcn.prepare.harmonic.pojo.param.OrgParam;
+import com.njcn.prepare.harmonic.pojo.po.RDnOperatingIndexMPO;
-import com.njcn.prepare.harmonic.pojo.po.*;
+import com.njcn.prepare.harmonic.pojo.po.RDnOperatingQPO;
-import com.njcn.prepare.harmonic.service.mysql.Impl.line.ROperatingMonitorDServiceImpl;
+import com.njcn.prepare.harmonic.pojo.po.RDnOperatingYPO;
 import com.njcn.prepare.harmonic.service.mysql.area.ROperatingIndexMPOService;
 import com.njcn.prepare.harmonic.service.mysql.area.ROperatingIndexQPOService;
 import com.njcn.prepare.harmonic.service.mysql.area.ROperatingIndexYPOService;
 import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorMService;
 import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorService;
-import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*;
+import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RDnOperatingIndexMPOService;
+import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RDnOperatingQPOService;
+import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RDnOperatingYPOService;
+import com.njcn.prepare.harmonic.service.mysql.newalgorithm.ROperatingIndexService;
 import com.njcn.prepare.harmonic.utils.PublicUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -33,11 +34,13 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.management.Query;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatSubstationServiceImpl.java

@@ -1,32 +1,21 @@
 package com.njcn.prepare.harmonic.service.mysql.newalgorithm.impl;
 
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
-import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetBandDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
+import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
-import com.njcn.harmonic.pojo.po.RStatOrgDPO;
-import com.njcn.harmonic.pojo.po.RStatOrgMPO;
-import com.njcn.prepare.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.mapper.mysql.area.*;
 import com.njcn.prepare.harmonic.mapper.mysql.line.*;
-import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventDPOMapper;
-import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventMPOMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatSubstationDPOMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatSubstationMPOMapper;
-import com.njcn.prepare.harmonic.pojo.po.*;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.po.RStatSubstationDPO;
+import com.njcn.prepare.harmonic.pojo.po.RStatSubstationMPO;
+import com.njcn.prepare.harmonic.pojo.po.RStatSubstationQPO;
+import com.njcn.prepare.harmonic.pojo.po.RStatSubstationYPO;
 import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -37,13 +26,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.util.ArrayList;
-import java.time.format.DateTimeFormatter;
+import java.util.List;
-import java.util.*;
+import java.util.Map;
-import java.util.function.Function;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/liteflow/NjcnNodeComponent.java

@@ -2,7 +2,7 @@ package com.njcn.prepare.liteflow;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.yomahub.liteflow.core.NodeComponent;
 
 import java.util.Set;