fix(user): 更新用户消息默认配置中的谐波信息设置

- 将用户的谐波信息默认值从0修改为1
- 保持其他消息类型配置不变

pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java

@@ -129,10 +129,10 @@ public class EventRelevantAnalysisController extends BaseController {
     @PostMapping("/updateEventToAss")
     @ApiOperation("把暂降事件添加到指定事件中去")
     public HttpResult<Page<AdvanceEventDetailVO>> updateEventToAss(@RequestBody Map<String,Object> map){
-      if(!map.containsKey("eventId") || !map.containsKey("assId")){
-          throw new BusinessException("参数异常");
-      }
         String methodDescribe = getMethodDescribe("updateEventToAss");
+        if(!map.containsKey("eventId") || !map.containsKey("assId")){
+            throw new BusinessException("参数异常");
+        }
         List<String> eventIds = (List<String>) map.get("eventId");
         if(CollectionUtil.isEmpty(eventIds)){
             throw new BusinessException("暂降事件不可为空");

pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java

@@ -25,6 +25,8 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author hongawen
@@ -42,10 +44,14 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
 
     private final FileStorageUtil fileStorageUtil;
 
+    private final Lock lock = new ReentrantLock();
 
     @Override
     public EventAnalysisDTO analysisCauseAndType(EventAnalysisDTO eventAnalysis) {
-        WaveDataDTO waveDataDTO;
+        //由于计算原因是异步操作，这里需要加锁不然JNI调用ddl文件会存在内存Invalid memory access
+        lock.lock();
+        try {
+            WaveDataDTO waveDataDTO;
         String waveName = eventAnalysis.getWaveName();
         String wlFilePath = eventAnalysis.getWlFilePath();
         String cfgPath, datPath, cfgPath2, datPath2;
@@ -181,6 +187,9 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
         }
         System.out.println("暂降原因分析完毕===============");
         System.out.println("cause:" + eventAnalysis);
+        } finally {
+            lock.unlock(); // 释放锁
+        }
         return eventAnalysis;
     }
 

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java

@@ -168,7 +168,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
                         EntityGroupEvtData[] arrayObj = Arrays.copyOfRange(entityGroupEvtData,
                                 i * FinalData.MAX_EVT_NUM, to);
                         EntityMtrans entityMtrans = mEntry.getValue();
-                        EntityGroupData entityGroupData = handleEvent.translate(arrayObj,entityMtrans);
+                        EntityGroupData entityGroupData = handleEvent.translate(arrayObj, entityMtrans);
                         // 处理分析结果
                         handleEvent.show_group_info(entityGroupData, listSagEvent, listEventAssObj, date);
                     }
@@ -177,51 +177,44 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
         }
 
 
+        disposeNonStandardData(handleEvent, baseList, listEventAssObj, listSagEvent, date);
 
 
-
-
-
-
-            disposeNonStandardData(handleEvent, baseList, listEventAssObj, listSagEvent, date);
-
-
-            int listSize = listEventAssObj.size();
-            int toIndex = 1000;
-            for (int i = 0; i < listSize; i += 1000) {
-                //作用为toIndex最后没有toIndex条数据则剩余几条newList中就装几条
-                if (i + 1000 > listSize) {
-                    toIndex = listSize - i;
-                }
-                //分割lst
-                List<EventAssObj> newList = listEventAssObj.subList(i, i + toIndex);
-                //写入添加方法,需要写你的新增方法，把newList分切后的数据新增进入数据库。
-                rmpEventDetailAssMapper.insertEventAssData(newList);
+        int listSize = listEventAssObj.size();
+        int toIndex = 1000;
+        for (int i = 0; i < listSize; i += 1000) {
+            //作用为toIndex最后没有toIndex条数据则剩余几条newList中就装几条
+            if (i + 1000 > listSize) {
+                toIndex = listSize - i;
             }
+            //分割lst
+            List<EventAssObj> newList = listEventAssObj.subList(i, i + toIndex);
+            //写入添加方法,需要写你的新增方法，把newList分切后的数据新增进入数据库。
+            rmpEventDetailAssMapper.insertEventAssData(newList);
+        }
 
-            List<RmpEventDetailPO> eventUpdateList = new ArrayList<>();
-            for (int i = 0; i < listSagEvent.size(); i++) {
-                RmpEventDetailPO rmp = new RmpEventDetailPO();
-                rmp.setEventId(listSagEvent.get(i).getIndexEventDetail());
-                rmp.setEventassIndex(listSagEvent.get(i).getIndexEventAss());
-                rmp.setDealTime(listSagEvent.get(i).getDealTime());
-                eventUpdateList.add(rmp);
-                if ((i + 1) % 1000 == 0) {
-                    this.updateBatchById(eventUpdateList);
-                    eventUpdateList.clear();
-                } else if (i == listSagEvent.size() - 1) {
-                    this.updateBatchById(eventUpdateList);
-                }
+        List<RmpEventDetailPO> eventUpdateList = new ArrayList<>();
+        for (int i = 0; i < listSagEvent.size(); i++) {
+            RmpEventDetailPO rmp = new RmpEventDetailPO();
+            rmp.setEventId(listSagEvent.get(i).getIndexEventDetail());
+            rmp.setEventassIndex(listSagEvent.get(i).getIndexEventAss());
+            rmp.setDealTime(listSagEvent.get(i).getDealTime());
+            eventUpdateList.add(rmp);
+            if ((i + 1) % 1000 == 0) {
+                this.updateBatchById(eventUpdateList);
+                eventUpdateList.clear();
+            } else if (i == listSagEvent.size() - 1) {
+                this.updateBatchById(eventUpdateList);
             }
+        }
 
-            // 增加策略记录
-            String describe = "用户" + RequestUtil.getUserNickname() + "进行了关联分析";
-            PqsRelevanceLog entityPqsRelevance = new PqsRelevanceLog();
-            entityPqsRelevance.setContentDes(describe);
-            entityPqsRelevance.setState(DataStateEnum.ENABLE.getCode());
-            entityPqsRelevance.setTimeId(date);
-            relevantLogMapper.insert(entityPqsRelevance);
-
+        // 增加策略记录
+        String describe = "用户" + RequestUtil.getUserNickname() + "进行了关联分析";
+        PqsRelevanceLog entityPqsRelevance = new PqsRelevanceLog();
+        entityPqsRelevance.setContentDes(describe);
+        entityPqsRelevance.setState(DataStateEnum.ENABLE.getCode());
+        entityPqsRelevance.setTimeId(date);
+        relevantLogMapper.insert(entityPqsRelevance);
 
 
         log.info("事件关联分析用时：" + timeInterval.interval() / 1000 + "秒");
@@ -230,224 +223,6 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
 
 
-
-
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public void processEvents(LocalDateTime startTime, LocalDateTime endTime) {
-//
-//        TimeInterval timeInterval = new TimeInterval();
-//
-//
-//        Map<String, Map<String, Integer>> nodeSort = new HashMap<>();
-//        Map<String, EntityMtrans> entityMtransMap = getNodeInfo();
-//
-//
-//
-//
-//
-//        for (Map.Entry<String, Map<String, Integer>> m : nodeSort) {
-//            List<EntityGroupEvtData> list = new ArrayList<EntityGroupEvtData>();
-//            Set<Map.Entry<String, Integer>> mapValue = m.getValue().entrySet();
-//            FinalData.NODE_NUM = m.getValue().size();
-//
-//            for (Map.Entry<String, Integer> mm : mapValue) {
-//                for (int i = 0; i < entityGroupEvtDatas.length; i++) {
-//                    if (entityGroupEvtDatas[i].getNodePhysics() == mm.getKey().intValue() && "短路故障".equals(entityGroupEvtDatas[i].getSagReason())) {
-//                        entityGroupEvtDatas[i].setNode(mm.getValue());
-//                        list.add(entityGroupEvtDatas[i]);
-//                    }
-//                }
-//
-//                // 筛选不在矩阵中的事件id
-//                Iterator<EntityGroupEvtData> iterator = list3.iterator();
-//                while (iterator.hasNext()) {
-//                    EntityGroupEvtData entityGroupEvtData = iterator.next();
-//
-//                    if (entityGroupEvtData.getNodePhysics() == mm.getKey().intValue() && "短路故障".equals(entityGroupEvtData.getSagReason())) {
-//                        iterator.remove();
-//                    }
-//                }
-//            }
-//
-//            EntityGroupEvtData[] entityGroupEvtData = new EntityGroupEvtData[list.size()];
-//            Collections.sort(list);
-//            list.toArray(entityGroupEvtData);
-//
-//            for (Map.Entry<String, JSONObject> mEntry : setMtrans) {
-//                if (mEntry.getKey().equals(m.getKey())) {
-//                    *//**//********************************************************************
-//         * 算法最多处理1000条数据，超过限制需分批处理 先将数据根据某种方式进行升序/降序排序，然后分段处理 加入循环处理
-//         *********************************************************************//**//*
-//                    int circulation = entityGroupEvtData.length % FinalData.MAX_EVT_NUM == 0
-//                            ? entityGroupEvtData.length / FinalData.MAX_EVT_NUM
-//                            : entityGroupEvtData.length / FinalData.MAX_EVT_NUM + 1;
-//
-//                    for (int i = 0; i < circulation; i++) {
-//                        int to = 0;
-//
-//                        if (i == circulation - 1) {
-//                            to = entityGroupEvtData.length % FinalData.MAX_EVT_NUM > 0
-//                                    ? entityGroupEvtData.length
-//                                    : (i + 1) * FinalData.MAX_EVT_NUM - 1;
-//                        } else {
-//                            to = (i + 1) * FinalData.MAX_EVT_NUM - 1;
-//                        }
-//
-//                        EntityGroupEvtData[] arrayObj = Arrays.copyOfRange(entityGroupEvtData,
-//                                i * FinalData.MAX_EVT_NUM, to);
-//                        JSONObject entityMtrans = mEntry.getValue();
-//                        EntityGroupData entityGroupData = handleEvent.translate(arrayObj, (EntityMtrans) JSONObject.toBean(entityMtrans, EntityMtrans.class));
-//                        // 处理分析结果
-//                        handleEvent.show_group_info(entityGroupData, listSagEvent, listEventAssObj, date);
-//                    }
-//                }
-//            }
-//        }
-//
-//
-//        DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.EVENT_REASON.getName(), DicDataEnum.SHORT_TROUBLE.getName()).getData();
-//        if (Objects.isNull(dictData)) {
-//            throw new BusinessException(SystemResponseEnum.ADVANCE_REASON);
-//        }
-//
-//
-//        LocalDateTime date = LocalDateTime.now();
-//        HandleEvent handleEvent = new HandleEvent();
-//        // 分析的事件进行处理
-//        List<EntityGroupEvtData> baseList = handleEvent.getData(startTime, endTime);
-//        if (CollectionUtil.isEmpty(baseList)) {
-//            throw new BusinessException("当前时间段暂无可分析事件");
-//        }
-//
-//        // 传入的处理事件根据物理隔绝进行分组
-//
-//        List<EntityLogic> strategyList = relevantLogMapper.getLogic();
-//
-//        if (CollectionUtil.isNotEmpty(strategyList)) {
-//            List<SagEvent> listSagEvent = new ArrayList<>();
-//            List<EventAssObj> listEventAssObj = new ArrayList<>();
-//
-//            Map<String, List<String>> strategyToBusBarMap = new HashMap<>(32);
-//
-//            Map<String, EntityMtrans> mapRedis = new HashMap<>(32);
-//
-//            Map<String, List<EntityLogic>> strategyMap = strategyList.stream().collect(Collectors.groupingBy(EntityLogic::getTPIndex));
-//            strategyMap.forEach((key, list) -> {
-//                List<String> before = list.stream().map(EntityLogic::getNodeBefore).distinct().collect(Collectors.toList());
-//                List<String> after = list.stream().map(EntityLogic::getNodeNext).distinct().collect(Collectors.toList());
-//                before.addAll(after);
-//                before = before.stream().distinct().collect(Collectors.toList());
-//                strategyToBusBarMap.put(key, before);
-//
-//                FinalData.NODE_NUM = before.size();
-//                EntityMtrans entityMtrans = new EntityMtrans();
-//                handleEvent.create_matrixcata(list, entityMtrans);
-//
-//                mapRedis.put(key, entityMtrans);
-//            });
-//
-//            strategyToBusBarMap.forEach((lastKey, lastVal) -> {
-//                int index = 1;
-//                List<EntityGroupEvtData> list = new ArrayList<>();
-//                for (EntityGroupEvtData entityGroupEvtData : baseList) {
-//                    if (lastVal.contains(entityGroupEvtData.getNodePhysics()) && dictData.getId().equals(entityGroupEvtData.getSagReason())) {
-//                        entityGroupEvtData.setNode(index++);
-//                        list.add(entityGroupEvtData);
-//                    }
-//                }
-//
-//                baseList.removeIf(entityGroupEvtData -> lastVal.contains(entityGroupEvtData.getNodePhysics()) && dictData.getId().equals(entityGroupEvtData.getSagReason()));
-//
-//
-//                EntityGroupEvtData[] entityGroupEvtData = new EntityGroupEvtData[list.size()];
-//                Collections.sort(list);
-//                list.toArray(entityGroupEvtData);
-//
-//                mapRedis.forEach((mKey, mVal) -> {
-//                    if (mKey.equals(lastKey)) {
-//                         //算法最多处理1000条数据，超过限制需分批处理 先将数据根据某种方式进行升序/降序排序，然后分段处理 加入循环处理
-//                        int circulation = entityGroupEvtData.length % FinalData.MAX_EVT_NUM == 0
-//                                ? entityGroupEvtData.length / FinalData.MAX_EVT_NUM
-//                                : entityGroupEvtData.length / FinalData.MAX_EVT_NUM + 1;
-//
-//                        for (int i = 0; i < circulation; i++) {
-//                            int to;
-//                            if (i == circulation - 1) {
-//                                to = entityGroupEvtData.length % FinalData.MAX_EVT_NUM > 0
-//                                        ? entityGroupEvtData.length
-//                                        : (i + 1) * FinalData.MAX_EVT_NUM - 1;
-//                            } else {
-//                                to = (i + 1) * FinalData.MAX_EVT_NUM - 1;
-//                            }
-//
-//                            EntityGroupEvtData[] arrayObj = Arrays.copyOfRange(entityGroupEvtData,
-//                                    i * FinalData.MAX_EVT_NUM, to);
-//                            EntityGroupData entityGroupData = handleEvent.translate(arrayObj, mVal);
-//                            // 处理分析结果
-//                            handleEvent.show_group_info(entityGroupData, listSagEvent, listEventAssObj, date);
-//                        }
-//                    }
-//                });
-//
-//            });
-//
-//
-//
-//             //事件ID不在矩阵中，结果集为基础以时标为标准进行归集处理 注意：三相与(单相/两相)互斥
-//
-//            disposeNonStandardData(handleEvent, baseList, listEventAssObj, listSagEvent, date);
-//
-//
-//            int listSize = listEventAssObj.size();
-//            int toIndex = 1000;
-//            for (int i = 0; i < listSize; i += 1000) {
-//                //作用为toIndex最后没有toIndex条数据则剩余几条newList中就装几条
-//                if (i + 1000 > listSize) {
-//                    toIndex = listSize - i;
-//                }
-//                //分割lst
-//                List<EventAssObj> newList = listEventAssObj.subList(i, i + toIndex);
-//                //写入添加方法,需要写你的新增方法，把newList分切后的数据新增进入数据库。
-//                rmpEventDetailAssMapper.insertEventAssData(newList);
-//            }
-//
-//            List<RmpEventDetailPO> eventUpdateList = new ArrayList<>();
-//            for (int i = 0; i < listSagEvent.size(); i++) {
-//                RmpEventDetailPO rmp = new RmpEventDetailPO();
-//                rmp.setEventId(listSagEvent.get(i).getIndexEventDetail());
-//                rmp.setEventassIndex(listSagEvent.get(i).getIndexEventAss());
-//                rmp.setDealTime(listSagEvent.get(i).getDealTime());
-//                eventUpdateList.add(rmp);
-//                if ((i + 1) % 1000 == 0) {
-//                    this.updateBatchById(eventUpdateList);
-//                    eventUpdateList.clear();
-//                } else if (i == listSagEvent.size() - 1) {
-//                    this.updateBatchById(eventUpdateList);
-//                }
-//            }
-//
-//            // 增加策略记录
-//            String describe = "用户" + RequestUtil.getUserNickname() + "进行了关联分析";
-//            PqsRelevanceLog entityPqsRelevance = new PqsRelevanceLog();
-//            entityPqsRelevance.setContentDes(describe);
-//            entityPqsRelevance.setState(DataStateEnum.ENABLE.getCode());
-//            entityPqsRelevance.setTimeId(date);
-//            relevantLogMapper.insert(entityPqsRelevance);
-//
-//        } else {
-//            throw new BusinessException("当前无变压器策略,请先配置策略");
-//        }
-//
-//        log.info("事件关联分析用时：" + timeInterval.interval() / 1000 + "秒");
-//    }
-
-
-
-
-
-
-
     @Override
     public Page<AdvanceEventDetailVO> querySagEventsPage(BaseParam baseParam) {
         List<String> lineIds = generalDeviceInfoClient.deptGetRunLineEvent(RequestUtil.getDeptIndex()).getData();
@@ -473,7 +248,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
         List<AdvanceEventDetailVO> advanceEventDetailVOList = BeanUtil.copyToList(rmpEventDetailPOList, AdvanceEventDetailVO.class);
         advanceEventDetailVOList = advanceEventDetailVOList.stream().peek(item -> {
-            item.setFeatureAmplitude(roundHalfUp(item.getFeatureAmplitude()*100));
+            item.setFeatureAmplitude(roundHalfUp(item.getFeatureAmplitude() * 100));
 
             if (map.containsKey(item.getLineId())) {
                 AreaLineInfoVO areaLineInfoVO = map.get(item.getLineId());
@@ -493,6 +268,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
 
     }
+
     /**
      * 四舍五入保留两位小数
      */
@@ -504,6 +280,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
         //保留2位小数
         return com.njcn.harmonic.utils.PubUtils.dataLimits(b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     }
+
     @Override
     public Page<RmpEventDetailAssPO> queryEventsAssPage(BaseParam baseParam) {
         List<LocalDateTime> timeV = PubUtils.checkLocalDate(baseParam.getSearchBeginTime(), baseParam.getSearchEndTime());
@@ -620,6 +397,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
                 .in(RmpEventDetailPO::getEventId, eventId);
         RmpEventDetailPO rmpEventDetailPO = new RmpEventDetailPO();
         rmpEventDetailPO.setEventassIndex(assId);
+        rmpEventDetailPO.setDealTime(LocalDateTime.now());
         eventAdvanceMapper.update(rmpEventDetailPO, lambdaUpdateWrapper);
         return true;
     }
@@ -734,7 +512,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
             List<AdvanceEventDetailVO> advanceEventDetailVOLsit = querySagEventsAll(startTime, endTime);
 
-            advanceEventDetailVOLsit = advanceEventDetailVOLsit.stream().filter(temp-> StringUtils.isNotEmpty(temp.getAdvanceType())).collect(Collectors.toList());
+            advanceEventDetailVOLsit = advanceEventDetailVOLsit.stream().filter(temp -> StringUtils.isNotEmpty(temp.getAdvanceType())).collect(Collectors.toList());
             for (AdvanceEventDetailVO advanceEventDetailVO : advanceEventDetailVOLsit) { // 获取监测点线路序号
                 //母线id
                 String nodePhysics = advanceEventDetailVO.getVoltageId();
@@ -868,7 +646,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
     /*************************************************************************************
      * 获取变压器信息并生成矩阵
      *************************************************************************************/
-    public Map<String, Map<String, Integer>>  getNodeBefore(){
+    public Map<String, Map<String, Integer>> getNodeBefore() {
         Map<String, EntityMtrans> entityMtranMap = new HashMap<>(32);
 
         HandleEvent handleEvent = new HandleEvent();
@@ -883,7 +661,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
     }
 
 
-    public Map<String, EntityMtrans> getNodeInfo( ) {
+    public Map<String, EntityMtrans> getNodeInfo() {
         Map<String, EntityMtrans> entityMtranMap = new HashMap<>(32);
 
         HandleEvent handleEvent = new HandleEvent();
@@ -893,7 +671,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
 
             Map<String, List<String>> map = getLogicInfo(list);
             Map<String, Map<String, Integer>> setNodeSort = nodeSort(map);
-            redisUtil.saveByKeyWithExpire(redisSortKey,setNodeSort,-1L);
+            redisUtil.saveByKeyWithExpire(redisSortKey, setNodeSort, -1L);
 
             setNodeSort.forEach((key, val) -> {
                 FinalData.NODE_NUM = val.size();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java

@@ -182,7 +182,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             JSONObject jsonObject = JSONObject.fromObject(hdrStr);
             translateData(jsonObject, rmpEventDetailPO.getStartTime(), entityAdvancedData);
 
-            if (rmpEventDetailPO.getDealFlag() != 1) {
+            if (!Objects.equals(rmpEventDetailPO.getDealFlag(),1) ) {
                 //如果存在三个文件但是没有调用dll/so计算
                 getDataFromDLL(rmpEventDetailPO, waveOriginalData, rect, entityAdvancedData, causeStruct);
             }

pqs-advance/advance-boot/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: sjzx
+    active: @spring.profiles.active@

pqs-auth/pom.xml

@@ -66,6 +66,13 @@
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!--辽宁调度现场单点登录-->
+        <dependency>
+            <groupId>com.sgcc.epri.auth</groupId>
+            <artifactId>sso-client-base</artifactId>
+            <version>2.1.1 </version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -138,4 +145,4 @@
 
 
 
-</project>
+</project>

pqs-auth/src/main/java/com/njcn/auth/config/LnSsoClientConfig.java

@@ -0,0 +1,26 @@
+package com.njcn.auth.config;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2026/6/8
+ */
+
+import com.sgcc.epri.auth.config.EnableSSOClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 仅控制 SSO 客户端开关，不影响任何其他功能
+ */
+@Configuration
+@ConditionalOnProperty(
+        prefix = "cas.client",       // 配置前缀
+        name = "enabled",            // 配置项名称
+        havingValue = "true",        // 值为true才生效
+        matchIfMissing = false       // 不配置默认关闭
+)
+@EnableSSOClient
+public class LnSsoClientConfig {
+}

pqs-auth/src/main/java/com/njcn/auth/config/WebSecurityConfig.java

@@ -37,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()
-                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin").permitAll()
+                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin","/oauth/lnLogin","/oauth/lnCheck","/oauth/lnRefreshToken").permitAll()
                 // @link https://gitee.com/xiaoym/knife4j/issues/I1Q5X6 (接口文档knife4j需要放行的规则)
                 .antMatchers("/webjars/**","/doc.html","/swagger-resources/**","/v2/api-docs").permitAll()
                 .anyRequest().authenticated()

pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java

@@ -25,13 +25,17 @@ import com.njcn.user.pojo.po.UserStrategy;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.RestTemplateUtil;
+import com.sgcc.epri.auth.session.HttpSessionManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -39,6 +43,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.net.URI;
 import java.security.KeyPair;
 import java.security.Principal;
@@ -55,7 +63,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/oauth")
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class AuthController extends BaseController {
 
 
@@ -71,6 +79,11 @@ public class AuthController extends BaseController {
 
     private final UserTokenService userTokenService;
 
+    @Value("${cas.redirect-url:http://10.21.30.11:8088/#/login?flag=1}")
+    private String redirectUrl;
+
+    private String UsernamePrefix = "CAS_";
+
 
     @ApiIgnore
     @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.AUTHENTICATE)
@@ -91,7 +104,6 @@ public class AuthController extends BaseController {
         String methodDescribe = getMethodDescribe("postAccessToken");
         String username = parameters.get(SecurityConstants.USERNAME);
 
-
         String grantType = parameters.get(SecurityConstants.GRANT_TYPE);
         if (grantType.equalsIgnoreCase(SecurityConstants.GRANT_CAPTCHA) || grantType.equalsIgnoreCase(SecurityConstants.REFRESH_TOKEN_KEY)) {
             username = DesUtils.aesDecrypt(username);
@@ -104,19 +116,19 @@ public class AuthController extends BaseController {
         UserStrategy data = passWordRuleFeugnClient.getUserStrategy().getData();
         String onlineUserKey = SecurityConstants.TOKEN_ONLINE_PREFIX;
         List<UserTokenInfo> onLineUser = (List<UserTokenInfo>) redisUtil.getLikeListAllValues(onlineUserKey);
-        if(CollectionUtil.isNotEmpty(onLineUser)){
+        if (CollectionUtil.isNotEmpty(onLineUser)) {
             String finalUsername = username;
-            onLineUser = onLineUser.stream().filter(item->{
+            onLineUser = onLineUser.stream().filter(item -> {
                 JSONObject jsonObject = AuthPubUtil.getLoginByToken(item.getRefreshToken());
                 String login = jsonObject.getStr(SecurityConstants.USER_NAME_KEY);
                 long exp = Long.parseLong(jsonObject.getStr(SecurityConstants.JWT_EXP));
-                long now = Calendar.getInstance().getTimeInMillis()/1000;
-                return  (exp > now) && !login.equals(finalUsername);
+                long now = Calendar.getInstance().getTimeInMillis() / 1000;
+                return (exp > now) && !login.equals(finalUsername);
             }).collect(Collectors.toList());
         }
 
         Integer maxNum = data.getMaxNum();
-        if((CollectionUtil.isNotEmpty(onLineUser)?onLineUser.size():0)>=maxNum){
+        if ((CollectionUtil.isNotEmpty(onLineUser) ? onLineUser.size() : 0) >= maxNum) {
             throw new BusinessException(UserResponseEnum.LOGIN_USER_OVERLIMIT);
         }
 
@@ -143,7 +155,7 @@ public class AuthController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT)
     @ApiOperation("用户登出系统")
     @DeleteMapping("/logout")
-    public HttpResult<Object> logout() {
+    public HttpResult<Object> logout(HttpServletRequest request, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("logout");
         String userIndex = RequestUtil.getUserIndex();
         String username = RequestUtil.getUsername();
@@ -165,6 +177,24 @@ public class AuthController extends BaseController {
             long lifeTime = Math.abs(refreshTokenExpire.plusMinutes(5L).toEpochSecond(ZoneOffset.of("+8")) - LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
             redisUtil.saveByKeyWithExpire(blackUserKey, blackUsers, lifeTime);
         }
+
+
+        // 以下代码是辽宁登出代码，关键：使 Session 失效
+        request.getSession().invalidate();
+
+        // 清除 JSESSIONID
+        Cookie jsessionidCookie = new Cookie("JSESSIONID", null);
+        jsessionidCookie.setMaxAge(0);
+        jsessionidCookie.setPath("/");
+        response.addCookie(jsessionidCookie);
+
+        // 清除 loginUser Cookie（关键！）
+        Cookie loginUserCookie = new Cookie("loginUser", null);
+        loginUserCookie.setMaxAge(0);
+        loginUserCookie.setPath("/");
+        response.addCookie(loginUserCookie);
+
+        log.info("登出成功。。。。。。。。。。。。。。。。");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -191,7 +221,7 @@ public class AuthController extends BaseController {
     @ApiIgnore
     public HttpResult<Object> autoLogin(@RequestParam String phone) {
         String methodDescribe = getMethodDescribe("autoLogin");
-        String userUrl = "http://127.0.0.1:10214/oauth/token";
+        String userUrl = "http://127.0.0.1:20214/oauth/token";
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(userUrl)
                 .queryParam("grant_type", "sms_code")
                 .queryParam("client_id", "njcnapp")
@@ -202,4 +232,134 @@ public class AuthController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Objects.requireNonNull(RestTemplateUtil.post(uri, HttpResult.class).getBody()).getData(), methodDescribe);
     }
 
+
+    /**
+     * 【电科院CAS调控云单点登录适配】
+     * 这个只用来匹配
+     */
+    @ApiIgnore
+    @GetMapping("/lnLogin")
+    @ApiOperation("获取ln系统用户token")
+    public HttpResult<Object> lnLogin(@RequestParam String clientId, @RequestParam String clientSecret, HttpServletRequest request, HttpServletResponse response) throws HttpRequestMethodNotSupportedException {
+        log.info("进入lnLogin++++++++++++++++++");
+        String methodDescribe = getMethodDescribe("lnLogin");
+
+        // 读取CAS信息
+        String userName = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.AUTH_USER_KEY));
+        String userId = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_ID_KEY));
+        String owner = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_OWNER));
+        String name = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_NAME_CHN));
+        String employeeId = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_EMPLOYEE_ID));
+
+        log.info("userName:{}", userName);
+        log.info("userId:{}", userId);
+        log.info("owner:{}", owner);
+        log.info("name:{}", name);
+        log.info("employeeId:{}", employeeId);
+
+        if ("null".equals(userName)) {
+            throw new BusinessException(UserResponseEnum.LN_AUTH_ERROR);
+        }
+
+        // 2. 【关键】用户名前面加上"CAS_"前缀，让UserDetailsService识别
+        String casUsername = userName;
+
+        // 2. 直接构造 OAuth2 必要参数（跳过所有密码/加密校验）
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("grant_type", "password");          // 固定密码模式
+        parameters.put("client_id", clientId);               // 你的客户端ID
+        parameters.put("client_secret", clientSecret);        // 你的客户端秘钥
+        parameters.put("username", userName);              // 统一认证传过来的用户名
+        parameters.put("password", "@#001njcnpqs");
+
+        // 3. 直接调用 OAuth2 生成 Token（跳过所有登录校验）
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(authentication, parameters).getBody();
+
+
+        // 获取过期时间（秒数）
+        int expiresIn = oAuth2AccessToken.getExpiresIn();
+        log.info("token过期时间: {} 秒", expiresIn);
+        log.info("token过期时间: {} 分钟", expiresIn / 60);
+        log.info("token过期时间: {} 小时", expiresIn / 3600);
+        log.info("====== 免密登录成功，返回token给前端 ======");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, oAuth2AccessToken, methodDescribe);
+    }
+
+
+    /**
+     * 重点：
+     * 这个接口 不加 白名单
+     * 访问它 → 自动跳CAS → 登录成功 → 重定向到登录页
+     */
+    @GetMapping("/lnCheck")
+    @ApiOperation("检查CAS是否登录")
+    public void lnToken(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        log.info("进入lnCheck。。。。");
+        response.sendRedirect(redirectUrl);
+    }
+
+
+    /**
+     */
+    @GetMapping("/lnRefreshToken")
+    @ApiOperation("刷新token")
+    public HttpResult<Object> lnRefreshToken(
+            @RequestParam String refreshToken,
+            @RequestParam String clientId,
+            @RequestParam String clientSecret,
+            HttpServletRequest request,
+            HttpServletResponse response) throws HttpRequestMethodNotSupportedException {
+
+        log.info("进入lnRefreshToken，开始刷新token");
+        String methodDescribe = getMethodDescribe("lnRefreshToken");
+
+        // ========== 【前置：优先校验CAS会话是否过期】 ==========
+        String userName = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.AUTH_USER_KEY));
+        if ("null".equals(userName)) {
+            log.error("CAS会话已过期，跳转登录页");
+            throw new BusinessException(UserResponseEnum.LN_AUTH_ERROR);
+        }
+
+        // 1. 先尝试用refresh_token正常刷新
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("grant_type", "refresh_token");
+        parameters.put("refresh_token", refreshToken);
+        parameters.put("client_id", clientId);
+        parameters.put("client_secret", clientSecret);
+
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        try {
+            OAuth2AccessToken newAccessToken = tokenEndpoint.postAccessToken(authentication, parameters).getBody();
+            log.info("refresh_token刷新成功");
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, newAccessToken, methodDescribe);
+        } catch (Exception e) {
+            log.warn("refresh_token刷新失败，尝试回退到CAS会话重新签发token", e);
+        }
+
+
+        // 3. CAS会话有效，重新签发token（等同于重新登录）
+        log.info("CAS会话有效，为用户[{}]重新签发token", userName);
+        String casUsername = userName;
+        Map<String, String> reLoginParams = new HashMap<>();
+        reLoginParams.put("grant_type", "password");
+        reLoginParams.put("client_id", clientId);
+        reLoginParams.put("client_secret", clientSecret);
+        reLoginParams.put("username", userName);
+        reLoginParams.put("password", "@#001njcnpqs");
+
+        Authentication reAuth = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(reAuth, reLoginParams).getBody();
+        log.info("CAS回退重签token成功，userName:{}", userName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, oAuth2AccessToken, methodDescribe);
+    }
 }

pqs-auth/src/main/resources/bootstrap-sjzx.yml

@@ -55,3 +55,22 @@ mybatis-plus:
 
 mqtt:
   client-id: @artifactId@${random.value}
+
+
+
+
+cas:
+  client:
+    # true 开启 false 关闭
+    enabled: false
+  redirect-url: http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn/#/login?flag=1
+  server-url-prefix: http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas
+  server-login-url: http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login
+  client-host-url: http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn:80
+  validation-type: CAS
+  #白名单设置
+  # /oauth/lnLogin$|/pqs-auth/oauth/lnLogin|/oauth/lnRefreshToken$|/pqs-auth/oauth/lnRefreshToken
+sso:
+  whiteList: .*/oauth/lnLogin.*|.*/pqs-auth/oauth/lnLogin.*|.*/oauth/lnRefreshToken.*|.*/pqs-auth/oauth/lnRefreshToken.*
+
+

pqs-common/common-event/src/main/java/com/njcn/event/file/component/WavePicComponent.java

@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author hongawen
@@ -206,6 +207,37 @@ public class WavePicComponent {
                     waveDataDetail.getColors(), waveDataDetail.getIsOpen()
             );
             picPath = composeImage(firstPic, secondPic);
+        } else if (waveDataDetails.size() == 4) {
+            WaveDataDetail waveDataDetail1 = waveDataDetails.get(0);
+            String pic1 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail1.getChannelName(),time), waveDataDetail1.getInstantData().getAValue(),
+                    waveDataDetail1.getInstantData().getBValue(), waveDataDetail1.getInstantData().getCValue(),
+                    waveDataDetail1.getUnit(), waveDataDetail1.getInstantData().getMax(), waveDataDetail1.getInstantData().getMin(),
+                    waveDataDetail1.getA(), waveDataDetail1.getB(), waveDataDetail1.getC(),
+                    waveDataDetail1.getColors(), waveDataDetail1.getIsOpen()
+            );
+
+            WaveDataDetail waveDataDetail2 = waveDataDetails.get(1);
+            String pic2 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail2.getChannelName(),time), waveDataDetail2.getInstantData().getAValue(),
+                    waveDataDetail2.getInstantData().getBValue(), waveDataDetail2.getInstantData().getCValue(),
+                    waveDataDetail2.getUnit(), waveDataDetail2.getInstantData().getMax(), waveDataDetail2.getInstantData().getMin(),
+                    waveDataDetail2.getA(), waveDataDetail2.getB(), waveDataDetail2.getC(),
+                    waveDataDetail2.getColors(), waveDataDetail2.getIsOpen());
+
+            WaveDataDetail waveDataDetail3 = waveDataDetails.get(2);
+            String pic3 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail3.getChannelName(),time), waveDataDetail3.getInstantData().getAValue(),
+                    waveDataDetail3.getInstantData().getBValue(), waveDataDetail3.getInstantData().getCValue(),
+                    waveDataDetail3.getUnit(), waveDataDetail3.getInstantData().getMax(), waveDataDetail3.getInstantData().getMin(),
+                    waveDataDetail3.getA(), waveDataDetail3.getB(), waveDataDetail3.getC(),
+                    waveDataDetail3.getColors(), waveDataDetail3.getIsOpen());
+
+            WaveDataDetail waveDataDetail4 = waveDataDetails.get(3);
+            String pic4 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail4.getChannelName(),time), waveDataDetail4.getInstantData().getAValue(),
+                    waveDataDetail4.getInstantData().getBValue(), waveDataDetail4.getInstantData().getCValue(),
+                    waveDataDetail4.getUnit(), waveDataDetail4.getInstantData().getMax(), waveDataDetail4.getInstantData().getMin(),
+                    waveDataDetail4.getA(), waveDataDetail4.getB(), waveDataDetail4.getC(),
+                    waveDataDetail4.getColors(), waveDataDetail4.getIsOpen()
+            );
+            picPath = composeImageZl(pic1, pic2, pic3, pic4);
         }
         return picPath;
     }
@@ -286,10 +318,55 @@ public class WavePicComponent {
                     waveDataDetail.getColors(), waveDataDetail.getIsOpen()
             );
             picPath = composeImage(firstPic, secondPic);
+        } else if (waveDataDetails.size() == 4) {
+            WaveDataDetail waveDataDetail1 = waveDataDetails.get(0);
+            String pic1 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail1.getChannelName(),time), waveDataDetail1.getRmsData().getAValue(),
+                    waveDataDetail1.getRmsData().getBValue(), waveDataDetail1.getRmsData().getCValue(),
+                    waveDataDetail1.getUnit(), waveDataDetail1.getRmsData().getMax(), waveDataDetail1.getRmsData().getMin(),
+                    waveDataDetail1.getA(), waveDataDetail1.getB(), waveDataDetail1.getC(),
+                    waveDataDetail1.getColors(), waveDataDetail1.getIsOpen()
+            );
+
+            WaveDataDetail waveDataDetail2 = waveDataDetails.get(1);
+            String pic2 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail2.getChannelName(),time), waveDataDetail2.getRmsData().getAValue(),
+                    waveDataDetail2.getRmsData().getBValue(), waveDataDetail2.getRmsData().getCValue(),
+                    waveDataDetail2.getUnit(), waveDataDetail2.getRmsData().getMax(), waveDataDetail2.getRmsData().getMin(),
+                    waveDataDetail2.getA(), waveDataDetail2.getB(), waveDataDetail2.getC(),
+                    waveDataDetail2.getColors(), waveDataDetail2.getIsOpen());
+
+            WaveDataDetail waveDataDetail3 = waveDataDetails.get(2);
+            String pic3 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail3.getChannelName(),time), waveDataDetail3.getRmsData().getAValue(),
+                    waveDataDetail3.getRmsData().getBValue(), waveDataDetail3.getRmsData().getCValue(),
+                    waveDataDetail3.getUnit(), waveDataDetail3.getRmsData().getMax(), waveDataDetail3.getRmsData().getMin(),
+                    waveDataDetail3.getA(), waveDataDetail3.getB(), waveDataDetail3.getC(),
+                    waveDataDetail3.getColors(), waveDataDetail3.getIsOpen());
+
+            WaveDataDetail waveDataDetail4 = waveDataDetails.get(3);
+            String pic4 = drawPicUtil.drawWavePic(getTitle2(waveDataDetail4.getChannelName(),time), waveDataDetail4.getRmsData().getAValue(),
+                    waveDataDetail4.getRmsData().getBValue(), waveDataDetail4.getRmsData().getCValue(),
+                    waveDataDetail4.getUnit(), waveDataDetail4.getRmsData().getMax(), waveDataDetail4.getRmsData().getMin(),
+                    waveDataDetail4.getA(), waveDataDetail4.getB(), waveDataDetail4.getC(),
+                    waveDataDetail4.getColors(), waveDataDetail4.getIsOpen()
+            );
+            picPath = composeImageZl(pic1, pic2, pic3, pic4);
         }
         return picPath;
     }
 
+    public String getTitle2(String channelName, String time) {
+        String title;
+        if (channelName.toUpperCase().startsWith("SU")) {
+            title ="电压-电网侧" + " 发生时刻：" + time;
+        } else if (channelName.toUpperCase().startsWith("SI")) {
+            title ="电流-电网侧" + " 发生时刻：" + time;
+        } else if (channelName.toUpperCase().startsWith("LU")) {
+            title ="电压-负载侧" + " 发生时刻：" + time;
+        } else {
+            title ="电流-负载侧" + " 发生时刻：" + time;
+        }
+        return title;
+    }
+
     /***
      * 绘制RMS波形图 App端用来绘制图片，会去掉部分数据，只保留开始数据 结束数据
      * @author xy
@@ -364,6 +441,59 @@ public class WavePicComponent {
         }
     }
 
+    private String composeImage(String firstPic, String secondPic, String thirdPic, String forthPic) {
+        try {
+            //第一张图片 base64截取删除前缀data:image/png;base64,
+            BufferedImage imageOne = ImgUtil.toBufferedImage(ImgUtil.toImage(firstPic.substring(22)), ImgUtil.IMAGE_TYPE_PNG);
+            int width = imageOne.getWidth();
+            int height = imageOne.getHeight();
+            int[] imageArrayOne = new int[width * height];
+            imageArrayOne = imageOne.getRGB(0, 0, width, height, imageArrayOne, 0, width);
+            //第二张图片 base64截取删除前缀data:image/png;base64,
+            BufferedImage imageTwo = ImgUtil.toBufferedImage(ImgUtil.toImage(secondPic.substring(22)), ImgUtil.IMAGE_TYPE_PNG);
+            int width2 = imageTwo.getWidth();
+            int height2 = imageTwo.getHeight();
+            int[] ImageArrayTwo = new int[width2 * height2];
+            ImageArrayTwo = imageTwo.getRGB(0, 0, width, height, ImageArrayTwo, 0, width);
+
+            int[] ImageArrayThree = null;
+            if (Objects.equals(thirdPic, "")) {
+                BufferedImage imageThree = ImgUtil.toBufferedImage(ImgUtil.toImage(thirdPic.substring(22)), ImgUtil.IMAGE_TYPE_PNG);
+                int width3 = imageThree.getWidth();
+                int height3 = imageThree.getHeight();
+                ImageArrayThree = new int[width3 * height3];
+                ImageArrayThree = imageThree.getRGB(0, 0, width, height, ImageArrayThree, 0, width);
+            }
+
+            int[] ImageArrayForth = null;
+            if (Objects.equals(forthPic, "")) {
+                BufferedImage imageForth = ImgUtil.toBufferedImage(ImgUtil.toImage(forthPic.substring(22)), ImgUtil.IMAGE_TYPE_PNG);
+                int width4 = imageForth.getWidth();
+                int height4 = imageForth.getHeight();
+                ImageArrayForth = new int[width4 * height4];
+                ImageArrayForth = imageForth.getRGB(0, 0, width, height, ImageArrayForth, 0, width);
+            }
+
+            //新图片
+            BufferedImage imageNew = new BufferedImage(width, height * 2, BufferedImage.TYPE_INT_RGB);
+            BufferedImageGraphicsConfig config = BufferedImageGraphicsConfig.getConfig(imageNew);
+            imageNew = config.createCompatibleImage(width, height * 2, Transparency.TRANSLUCENT);
+            imageNew.setRGB(0, 0, width, height, imageArrayOne, 0, width);
+            imageNew.setRGB(0, height, width, height, ImageArrayTwo, 0, width);
+            if (!Objects.isNull(ImageArrayThree)) {
+                imageNew.setRGB(0, height, width, height, ImageArrayThree, 0, width);
+            }
+            if (!Objects.isNull(ImageArrayForth)) {
+                imageNew.setRGB(0, height, width, height, ImageArrayForth, 0, width);
+            }
+            String resultImg = ImgUtil.toBase64(imageNew, ImgUtil.IMAGE_TYPE_PNG);
+            byte[] bytes = Base64.getDecoder().decode(resultImg);
+            return fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
+        } catch (Exception e) {
+            throw new BusinessException(WaveFileResponseEnum.COMPOSE_PIC_ERROR);
+        }
+    }
+
     /**
      * app越限指标图
      * @param title

pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java

@@ -102,8 +102,11 @@ public class FileStorageUtil {
                 throw new BusinessException(OssResponseEnum.UPLOAD_FILE_ERROR);
             }
         } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
-            filePath = dir;
-            aliYunOssUtils.uploadFile(dir, multipartFile);
+            filePath = dir.endsWith("/")?dir+getFileNameWithoutPath(multipartFile):dir+"/"+getFileNameWithoutPath(multipartFile);
+            if (filePath.charAt(0) == '/') {
+                filePath=  filePath.substring(1);
+            }
+            aliYunOssUtils.uploadFile(filePath, multipartFile);
         } else {
             try {
                 // 构建完整目录：基准目录 + dir子目录

pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java

@@ -13,7 +13,7 @@ public interface AppRedisKey {
     /**
      * 设备模板前缀
      */
-    String MODEL = "MODEL";
+    String MODEL = "MODEL:";
 
 
     /**
@@ -39,7 +39,7 @@ public interface AppRedisKey {
     /**
      * 监测点位置数据
      */
-    String LINE_POSITION = "LINEPOSITION";
+    String LINE_POSITION = "LINEPOSITION:";
 
     /**
      * rocketMQ消费key

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java

@@ -19,14 +19,16 @@ public enum RunFlagEnum {
     QUIT(4, "退运"),
 
 
-
-
-
+    POWER_FLAG(0,"电网侧"),
+    NO_POWER_FLAG(1,"非电网侧"),
 
 
     GW_FLAG(0,"主网"),
     PW_FLAG(1,"配网"),
 
+    I_SORT(1,"I类测点"),
+    II_SORT(2,"II类测点"),
+    III_SORT(3,"III类测点"),
 
     ;
 

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java

@@ -2,7 +2,6 @@ package com.njcn.device.biz.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.device.biz.utils.COverlimit;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java

@@ -18,7 +18,8 @@ import java.util.Objects;
  */
 public class COverlimitUtil {
 
-
+    /** 配网占位默认值 */
+    private static final float PLACEHOLDER = -3.14159f;
     /**
      * 谐波电流系数
      */
@@ -34,38 +35,74 @@ public class COverlimitUtil {
 
     /**
      * 计算监测点限值
-     * @param voltageLevel 电压等级（10kV = 10 220kV = 220 ）
-     * @param protocolCapacity 协议容量
-     * @param devCapacity 设备容量
-     * @param shortCapacity 短路容量
-     * @param powerFlag 0.用户侧 1.电网侧
-     * @param lineType 0.主网 1.配网 需要注意配网目前没有四种容量，谐波电流幅值限值,负序电流限值无法计算默认-3.14159
+     * @param voltageLevel    电压等级(kV)
+     * @param protocolCapacity 协议容量(MVA)
+     * @param devCapacity     供电设备容量(MVA)，为空/0自动取对应电压默认值
+     * @param shortCapacity   实际最小短路容量(MVA)
+     * @param powerFlag       0=电网侧(不执行两步计算)  1=非电网侧/用户侧(执行两步计算)
+     * @param pointClass      配网点类型 0=Ⅱ类 1=Ⅲ类光伏；主网该字段传0即可
      */
     public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity,
-                                           Float shortCapacity, Integer powerFlag, Integer lineType) {
+                                           Float shortCapacity, Integer powerFlag,Integer pointClass) {
         Overlimit overlimit = new Overlimit();
-        voltageDeviation(overlimit,voltageLevel);
+        voltageDeviation(overlimit, voltageLevel);
         frequency(overlimit);
-        voltageFluctuation(overlimit,voltageLevel);
-        voltageFlicker(overlimit,voltageLevel);
-        totalHarmonicDistortion(overlimit,voltageLevel);
-        uHarm(overlimit,voltageLevel);
+        voltageFluctuation(overlimit, voltageLevel);
+        voltageFlicker(overlimit, voltageLevel);
+        totalHarmonicDistortion(overlimit, voltageLevel);
+        uHarm(overlimit, voltageLevel);
         threeVoltageUnbalance(overlimit);
-        interharmonicCurrent(overlimit,voltageLevel);
+        interharmonicCurrent(overlimit, voltageLevel);
+        negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
+        //谐波电流限值
+        int lineType;
+        if (voltageLevel >= DicDataEnum.KV220.getValue()) {
+            lineType = 0; // 主网
+        } else {
+            lineType = 1; // 配网（110、66、35、10kV）
+        }
+        float sc = Objects.isNull(shortCapacity) ? 0f : shortCapacity;
+        float pc = Objects.isNull(protocolCapacity) ? 0f : protocolCapacity;
 
-        if(Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
-          //配网
+        float dc;
+        if (Objects.isNull(devCapacity) || devCapacity <= 0) {
+            dc = getDefaultDevCapacity(voltageLevel);
+        } else {
+            dc = devCapacity;
+        }
+        // 1. 配网 lineType = 1
+        if (Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
             Float[] iHarmTem = new Float[49];
-            for (int i = 0; i <= 48; i++) {
-                //目前只处理了配网II类测点，III类测点暂未处理，III类测点参考主网
-                iHarmTem[i] = getHarmTag(i+2,voltageLevel).floatValue();
+
+            // 配网-电网侧(powerFlag=0) / 配网Ⅱ类：直接基准限值，不折算
+            if (Objects.equals(powerFlag,RunFlagEnum.POWER_FLAG.getStatus()) || Objects.equals(pointClass, 0)) {
+                for (int i = 0; i <= 48; i++) {
+                    iHarmTem[i] = getHarmTag(i + 2, voltageLevel).floatValue();
+                }
+            }
+            // 配网-非电网侧 且 Ⅲ类光伏：两步计算，折算系数固定为1
+            else {
+                float calCap = 1.0f;
+                for (int i = 0; i <= 48; i++) {
+                    float inHarm = iHarmCalculate(i + 2, voltageLevel, pc, dc, calCap);
+                    iHarmTem[i] = inHarm;
+                }
             }
             overlimit.buildIHarm(iHarmTem);
-            overlimit.setINeg(-3.14159f);
-        }else {
-            //主网
-            iHarm(overlimit, voltageLevel, protocolCapacity, devCapacity, shortCapacity);
-            negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
+        } else {
+            // 主网-电网侧(powerFlag=0)：直接基准限值
+            if (Objects.equals(powerFlag, RunFlagEnum.POWER_FLAG.getStatus())) {
+                Float[] iHarmTem = new Float[49];
+                for (int i = 0; i <= 48; i++) {
+                    iHarmTem[i] = getHarmTag(i + 2, voltageLevel).floatValue();
+                }
+                overlimit.buildIHarm(iHarmTem);
+            }
+            // 主网-非电网侧/用户侧(风光场站)：完整两步计算
+            else {
+                iHarm(overlimit, voltageLevel, pc, dc, sc);
+            }
+
         }
         return overlimit;
     }
@@ -304,6 +341,30 @@ public class COverlimitUtil {
     }
 
 
+    /**
+     * 根据电压等级获取【默认公共连接点供电设备容量】St(MVA)
+     * 无实际台账容量时兜底使用
+     */
+    public static float getDefaultDevCapacity(Float voltageLevel) {
+        if (voltageLevel < 0.4f) {
+            return 1.0f;
+        } else if (voltageLevel < 6f) {
+            return 100f;
+        } else if (voltageLevel < 20f) {
+            return 200f;
+        } else if (voltageLevel < 35f) {
+            return 500f;
+        } else if (voltageLevel < 66f) {
+            return 800f;
+        } else if (voltageLevel < 110f) {
+            return 1000f;
+        } else if (voltageLevel < 220f) {
+            return 2000f;
+        } else {
+            return 3000f;
+        }
+    }
+
     /*---------------------------------谐波电流限值end-----------------------------------*/
 
 
@@ -376,8 +437,9 @@ public class COverlimitUtil {
 
     public static void main(String[] args) {
         System.out.println("sss");
-        float aa = iHarmCalculate(9,500f,10,10,0.002222222222f);
+        Overlimit overlimit = new Overlimit();
+        iHarm(overlimit, 220f, 100f, 100f, 2000f);
 
-        System.out.println(aa);
+        System.out.println(overlimit);
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalCheckParam.java

@@ -0,0 +1,36 @@
+package com.njcn.device.pq.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-07-06
+ * @Description:
+ */
+@Data
+public class TerminalCheckParam extends BaseParam {
+
+    private String devId;
+
+    private String objId;
+
+    private String objName;
+
+    private String city;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate thisCheckTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate nextCheckTime;
+
+    /**
+     * 检测报告
+     */
+    private String checkUrl;
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java

@@ -1,10 +1,13 @@
 package com.njcn.device.pq.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * <p>
  *
@@ -61,6 +64,8 @@ public class Line extends BaseEntity {
     private Integer state;
 
 
+    @TableField(exist = false)
+    private List<Line> children;
 
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -22,6 +23,7 @@ public class LineDetail{
     /**
      * 监测点序号
      */
+    @TableId
     private String id;
 
 
@@ -111,7 +113,6 @@ public class LineDetail{
     /**
      * 监测点对象名称
      */
-    @Deprecated
     private String objName;
 
     /**
@@ -171,19 +172,16 @@ public class LineDetail{
     /**
      * 监测点拥有者
      */
-    @Deprecated
     private String owner;
 
     /**
      * 拥有者职务
      */
-    @Deprecated
     private String ownerDuty;
 
     /**
      * 拥有者联系方式
      */
-    @Deprecated
     private String ownerTel;
 
     /**

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/SupervisionUserReportFile.java

@@ -0,0 +1,45 @@
+package com.njcn.device.pq.pojo.po;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-07-07
+ * @Description:
+ */
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 监测对象附件
+ */
+@Data
+@TableName("SUPERVISION_USER_REPORT_FILE")
+public class SupervisionUserReportFile {
+
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 检测报告
+     */
+    private String checkUrl;
+
+    /**
+     * 历史检测报告
+     */
+    private String checkHistoryUrl;
+
+    /**
+     * 评估报告
+     */
+    private String assessUrl;
+
+    /**
+     * 其他附件
+     */
+    private String otherUrl;
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TerminalLogs.java

@@ -1,34 +0,0 @@
-//package com.njcn.device.pq.pojo.po;
-//
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import lombok.Data;
-//import org.influxdb.annotation.Column;
-//import org.influxdb.annotation.Measurement;
-//
-//import java.time.Instant;
-//
-///**
-// * @version 1.0.0
-// * @author: chenchao
-// * @date: 2022/06/22 19:03
-// */
-//@Data
-//@Measurement(name = "pqs_terminal_logs")
-//public class TerminalLogs {
-//
-//    @Column(name = "time")
-//    private Instant timeId;
-//
-//    @Column(name = "line_id")
-//    private String lineId;
-//
-//    @Column(name = "terminal_type")
-//    private String terminalType;
-//
-//    @Column(name = "update_by")
-//    private String updateBy;
-//
-//    @Column(name = "terminal_describe")
-//    private String terminalDescribe;
-//
-//}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetail.java

@@ -53,4 +53,12 @@ public class DevDetail {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate nextTimeCheck;
 
+    @Data
+    public static class DevPowerFlag{
+        @ApiModelProperty("终端id")
+        private String devIndex;
+
+        @ApiModelProperty(name = "powerFlag",value = "用户性质")
+        private String powerFlag;
+    }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java

@@ -46,6 +46,9 @@ public class LineDetailDataVO {
     @ApiModelProperty(name = "devName",value = "终端名称")
     private String devName;
 
+    @ApiModelProperty("装置型号")
+    private String devType;
+
     @ApiModelProperty(name = "ip",value = "网络参数")
     private String ip;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java

@@ -105,9 +105,12 @@ public class LineDetailVO implements Serializable {
         @ApiModelProperty(name = "终端厂家")
         private String manufacturer;
 
-        @ApiModelProperty(name = "终端厂家")
+        @ApiModelProperty(name = "监测对象ID")
         private String objId;
 
+        @ApiModelProperty(name = "监测对象名称")
+        private String objName;
+
     }
 
     @Data

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java

@@ -125,6 +125,8 @@ public class LineIntegrityDataVO implements Serializable {
     private Integer algoDescribe;
 
 
+    @ApiModelProperty(name = "devType",value = "终端型号")
+    private String devType;
 
     @ApiModelProperty(name = "loadType",value = "干扰源类型")
     private String loadType;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RunManageVO.java

@@ -44,6 +44,9 @@ public class RunManageVO {
     @ApiModelProperty(name = "ip",value = "网络参数")
     private String ip;
 
+    @ApiModelProperty(name = "powerFlag",value = "用户性质")
+    private String powerFlag;
+
     @ApiModelProperty(name = "runFlag",value = "终端运行状态")
     private String runFlag;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RunTimeVO.java

@@ -36,6 +36,9 @@ public class RunTimeVO implements Serializable {
     @ApiModelProperty(name = "devName",value = "终端名称")
     private String devName;
 
+    @ApiModelProperty(name = "powerFlag",value = "用户性质")
+    private String powerFlag;
+
     @ApiModelProperty(name = "ip",value = "网络参数")
     private String ip;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalCheckVO.java

@@ -0,0 +1,51 @@
+package com.njcn.device.pq.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-07-06
+ * @Description: 终端检测
+ */
+@Data
+public class TerminalCheckVO {
+
+    private String devId;
+
+    private String areaName;
+
+    private String bdName;
+
+    private String devName;
+
+    private String objId;
+
+    private String objName;
+
+    private LocalDate thisCheckTime;
+
+    private LocalDate nextCheckTime;
+
+    private LocalDate loginDate;
+
+    /**
+     * 0.未逾期
+     * 1.逾期
+     */
+    private Integer checkStatus;
+
+    /**
+     * 逾期时间
+     */
+    private Integer overdueDay;
+
+    /**
+     * 检测报告
+     */
+    private String checkUrl;
+
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalMaintainVO.java

@@ -48,4 +48,6 @@ public class TerminalMaintainVO implements Serializable {
     private Integer strategyFlag;
     @ApiModelProperty(name = "子级")
     List<TerminalMaintainVO> children;
+
+    private String objName;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/common/DeviceOnlineRate.java

@@ -80,6 +80,7 @@ public class DeviceOnlineRate {
         private String comFlag;
 
         @ApiModelProperty("最新数据时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime timeID;
 
         @ApiModelProperty("在线率")

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java

@@ -49,6 +49,6 @@ public class LineDataExcel implements Serializable {
     private BigDecimal integrity;
 
     @ExcelProperty(value = "国网ID")
-    private BigDecimal monitorId;
+    private String monitorId;
 
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java

@@ -90,7 +90,7 @@ public class LineIntegrityDataController extends BaseController {
         String methodDescribe = getMethodDescribe("getIntegrityByLineIds");
         if(CollUtil.isNotEmpty(lineIds)){
             QueryWrapper<RStatIntegrityD> queryWrapper = new QueryWrapper<>();
-            queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,sum(real_time)/sum(due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
+            queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,avg(real_time*1.0/due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
             List<RStatIntegrityD> rStatIntegrityDList = irStatIntegrityDService.list(queryWrapper);
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatIntegrityDList, methodDescribe);
         }
@@ -154,7 +154,6 @@ public class LineIntegrityDataController extends BaseController {
     @ApiOperation("监测点数据完整性(冀北)")
     @ApiImplicitParam(name = "param", value = "参数实体", required = true)
     public HttpResult<DeviceOnlineRate> getData(@RequestBody DeviceInfoParam.BusinessParam param) {
-        param.setLineOrDevice(0);
         String methodDescribe = getMethodDescribe("getData");
         DeviceOnlineRate rate = irStatIntegrityDService.getData(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rate, methodDescribe);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java

@@ -8,7 +8,9 @@ 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.pq.pojo.param.AlarmParam;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
 import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
+import com.njcn.device.pq.pojo.vo.TerminalCheckVO;
 import com.njcn.device.pq.service.TerminalAlarmService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -87,4 +89,19 @@ public class TerminalAlarmController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 终端周期检测告警
+     * @author cdf
+     * @date 2022/5/23
+     */
+    @PostMapping("/terminalCheckPage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("终端检测告警")
+    @ApiImplicitParam(name = "alarmParam", value = "告警类型")
+    public HttpResult<Page<TerminalCheckVO>> terminalCheckPage(@RequestBody @Validated TerminalCheckParam terminalCheckParam){
+        String methodDescribe = getMethodDescribe("alarmInfoList");
+        Page<TerminalCheckVO> res = terminalAlarmService.terminalCheckPage(terminalCheckParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/AlarmMapper.java

@@ -3,8 +3,10 @@ package com.njcn.device.pq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
 import com.njcn.device.pq.pojo.po.Alarm;
 import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
+import com.njcn.device.pq.pojo.vo.TerminalCheckVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
@@ -41,4 +43,8 @@ public interface AlarmMapper extends BaseMapper<Alarm> {
      * @date 2022/5/23
      */
     boolean updateAlarmInfo(@Param("type")String type,@Param("devLineId")String devLineId,@Param("processTime")LocalDateTime processTime,@Param("userIndex")String userIndex);
+
+
+    Page<TerminalCheckVO> terminalCheckPage(Page<TerminalCheckVO> page, @Param("terminalCheckParam")TerminalCheckParam terminalCheckParam);
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml

@@ -158,5 +158,51 @@ ORDER BY
     </update>
 
 
+	<select id="terminalCheckPage" resultType="TerminalCheckVO">
+		SELECT
+			dev.id                     AS devId,
+			dev.NAME                   AS devName,
+		    users.city                  AS areaName,
+			bd.name                    AS bdName,
+			detail.obj_id              AS objId,
+			users.project_name            AS objName,
+			dev_detail.this_time_check AS thisCheckTime,
+			dev_detail.next_time_check AS nextCheckTime,
+			dev_detail.login_time      AS loginDate,
+			files.CHECK_URL            as checkUrl,
+			DATEDIFF(
+				day,
+					COALESCE(CAST(dev_detail.next_time_check AS DATE), CURRENT_DATE + INTERVAL '365' DAY),
+					CURRENT_DATE
+			) AS overdueDay,
+			CASE
+				WHEN DATEDIFF(
+						 day,
+							 COALESCE(CAST(dev_detail.next_time_check AS DATE), CURRENT_DATE + INTERVAL '365' DAY),
+							 CURRENT_DATE
+					 ) > 0 THEN 1
+				ELSE 0
+				END AS checkStatus
+		FROM
+			pq_line line
+				INNER JOIN pq_line_detail detail ON line.id = detail.id
+				INNER JOIN pq_line bus ON line.pid = bus.id
+				INNER JOIN pq_line dev ON bus.pid = dev.id
+				INNER JOIN pq_device dev_detail ON dev.id = dev_detail.id
+				INNER JOIN pq_line bd ON dev.pid = bd.id
+				LEFT JOIN  SUPERVISION_USER_REPORT users ON users.id = detail.obj_id
+				LEFT JOIN SUPERVISION_USER_REPORT_FILE files on users.id = files.id
+		<where>
+		<if test="terminalCheckParam.city!=null and terminalCheckParam.city !=''">
+			users.city = #{terminalCheckParam.city}
+		</if>
+		<if test="terminalCheckParam.searchValue!=null and terminalCheckParam.searchValue !=''">
+			and users.project_name like concat('%',#{terminalCheckParam.searchValue},'%')
+		</if>
+		</where>
+		order by checkStatus desc,loginDate desc
+	</select>
+
+
 
 </mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml

@@ -84,6 +84,7 @@
         pldsdd.id AS lineGrade,
         pldsdd.Algo_Describe AS algoDescribe,
         pld.Load_Type AS loadType,
+        pd.Dev_Type AS devType,
         pld.obj_id as objId
         FROM
         pq_line AS line

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalAlarmService.java

@@ -2,7 +2,9 @@ package com.njcn.device.pq.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.device.pq.pojo.param.AlarmParam;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
 import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
+import com.njcn.device.pq.pojo.vo.TerminalCheckVO;
 
 import java.util.List;
 
@@ -35,4 +37,7 @@ public interface TerminalAlarmService {
      * @date 2022/5/23
      */
     boolean updateAlarmInfo(String type,String devLineId);
+
+
+    Page<TerminalCheckVO> terminalCheckPage(TerminalCheckParam terminalCheckParam);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java

@@ -487,7 +487,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
             lineDataExcel.setOnlineRate(onLineRate(onlineRateByDev, Arrays.asList(dto.getDeviceId())));
             lineDataExcel.setIntegrity(integrity(integrityList, Arrays.asList(dto.getLineId())));
             if (num == 1) {
-                lineDataExcel.setMonitorId(new BigDecimal(dto.getMonitorId()));
+                lineDataExcel.setMonitorId(dto.getMonitorId());
             }
             lineDataExcels1.add(lineDataExcel);
         }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java

@@ -68,8 +68,6 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
     private final LineDetailMapper lineDetailMapper;
     private final GeneralDeviceService deviceService;
     private final LineService lineService;
-    private final UserLedgerService userLedgerService;
-    private final CommLineClient commLineClient;
 
     @Override
     public Float getTotalIntegrityByLineIds(LineBaseQueryParam param) {
@@ -150,9 +148,6 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
     @Override
     public DeviceOnlineRate getData(DeviceInfoParam.BusinessParam param) {
         DeviceOnlineRate rate = new DeviceOnlineRate();
-        //BusinessParam的searchvalue只匹配监测点名称现在要匹配电站，监测点，监测点对象名称，所以穿空再添加过滤逻辑
-        String tempSearchValue=param.getSearchValue();
-        param.setSearchValue("");
         //获取终端台账类信息
         List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, null, Collections.singletonList(1));
         if (CollUtil.isNotEmpty(deviceInfo)) {
@@ -161,61 +156,17 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     .stream()
                     .distinct()
                     .collect(Collectors.toList());
-            List<String> filterLineList = new ArrayList<>();
-
-            if(CollectionUtil.isNotEmpty(lineIds)){
-                //根据searchvalue过滤
-                List<LineALLInfoDTO> data = commLineClient.getLineAllDetailList(lineIds).getData();
-                filterLineList= data.stream()
-                        .filter(dto -> {
-                            LineALLInfoDTO.LineLineDTO lineDTO = dto.getLineLineDTO();
-                            String linename = lineDTO != null ? lineDTO.getLinename() : null;
-                            String objName2 = lineDTO != null ? lineDTO.getObjName2() : null;
-
-                            LineALLInfoDTO.LineSubStationDTO subStationDTO = dto.getLineSubStationDTO();
-                            String subStationName = subStationDTO != null ? subStationDTO.getSubStationName() : null;
-
-                            // 大小写敏感的模糊匹配（相当于 MySQL 的 LIKE '%keyword%'）
-                            return (linename != null && linename.contains(tempSearchValue))
-                                    || (objName2 != null && objName2.contains(tempSearchValue))
-                                    || (subStationName != null && subStationName.contains(tempSearchValue));
-                        }).map(dto -> dto.getLineLineDTO() != null ? dto.getLineLineDTO().getLineId() : null)
-
-                        .collect(Collectors.toList());
-            }
-            rate.setTotalNum(filterLineList.size());
-            List<String> finalFilterLineList = filterLineList;
-            //根据过滤后监测点过滤
-            deviceInfo= deviceInfo.stream()
-                    .filter(dto -> {
-                        List<String> original = dto.getLineIndexes();
-                        if (original == null || original.isEmpty()) {
-                            return false;
-                        }
-                        // 计算交集
-                        List<String> intersection = original.stream()
-                                .filter(finalFilterLineList::contains)
-                                .collect(Collectors.toList());
-                        if (intersection.isEmpty()) {
-                            return false;
-                        }
-                        // 更新当前 DTO 的 lineIndexes 为交集
-                        dto.setLineIndexes(intersection);
-                        return true;
-                    })
-                    .collect(Collectors.toList());            //获取所有监测点的数据完整性
-            List<RStatIntegrityVO> lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(filterLineList, param.getSearchBeginTime(), param.getSearchEndTime());
+            //获取所有监测点的数据完整性
+            List<RStatIntegrityVO> lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(lineIds, param.getSearchBeginTime(), param.getSearchEndTime());
             //获取所有监测点信息信息
-            List<LineDetailVO.Detail> LineInfoByIds = lineService.getLineDetailByIds(filterLineList);
+            List<LineDetailVO.Detail> LineInfoByIds = lineService.getLineDetailByIds(lineIds);
 
-            rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, filterLineList.size()) : lineIds.size());
-            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, filterLineList).doubleValue()>100.0?BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
+            rate.setTotalNum(lineIds.size());
+            rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, lineIds.size()) : lineIds.size());
+            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, lineIds).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
             List<DeviceOnlineRate.CitDetail> citDetailList = new ArrayList<>();
             DeviceOnlineRate.CitDetail citDetail;
             DeviceOnlineRate.LineDetail detail;
-            //用户侧监测点 监测对象
-            List<UserLedgerVO> userLedgerVOS = userLedgerService.selectUserList(new UserReportParam());
-            Map<String, String> objMap = userLedgerVOS.stream().collect(Collectors.toMap(UserLedgerVO::getId, UserLedgerVO::getProjectName));
             for (GeneralDeviceDTO dto : deviceInfo) {
                 //获取部门终端集合
                 List<RStatIntegrityVO> citDevOnRate = lineIntegrityRateInfo.stream().filter(x -> dto.getLineIndexes().contains(x.getLineIndex())).collect(Collectors.toList());
@@ -223,11 +174,10 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                         .collect(Collectors.toMap(RStatIntegrityVO::getLineIndex, RStatIntegrityVO::getIntegrityRate));
                 citDetail = new DeviceOnlineRate.CitDetail();
                 List<LineDetailVO.Detail> lineDetail = LineInfoByIds.stream().filter(x -> dto.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
-
                 citDetail.setCitName(dto.getName());
                 citDetail.setCitTotalNum(dto.getLineIndexes().size());
                 citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate) ? calculateIntegrityRate(citDevOnRate, 90, dto.getLineIndexes().size()) : dto.getLineIndexes().size());
-                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()).doubleValue()>100.0?BigDecimal.valueOf(100.0):calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
+                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
                 List<DeviceOnlineRate.LineDetail> detailList = new ArrayList<>();
                 for (LineDetailVO.Detail line : lineDetail) {
                     detail = new DeviceOnlineRate.LineDetail();
@@ -242,9 +192,9 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     detail.setLineId(line.getLineId());
                     detail.setLineName(line.getLineName());
                     //用户侧监测点 监测对象
-                    detail.setObjName(StringUtils.isBlank(line.getObjId())?"/":objMap.get(line.getObjId()));
+                    detail.setObjName(StringUtils.isBlank(line.getObjName()) ? "/" : line.getObjName());
                     detail.setLatestTime(line.getTimeID());
-                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)).doubleValue()>100.0?BigDecimal.valueOf(100.0):onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)));
+                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)));
                     detailList.add(detail);
                 }
                 citDetail.setDetailList(detailList);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -20,10 +20,7 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.RunManageParam;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
-import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO;
-import com.njcn.device.pq.pojo.vo.RunManageVO;
-import com.njcn.device.pq.pojo.vo.RunTimeVO;
-import com.njcn.device.pq.pojo.vo.TerminalLedgerVO;
+import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.RunManageService;
 import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
@@ -31,6 +28,7 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.enums.StatisticsEnum;
 import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,10 +37,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -157,7 +152,28 @@ public class RunManageServiceImpl implements RunManageService {
         if(CollUtil.isEmpty(devIndexes)){
             return new Page<>();
         }
-        return deviceMapper.getDeviceLedger(new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam)), devIndexes, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), runManageParam.getSearchValue());
+        Page<RunTimeVO> deviceLedger = deviceMapper.getDeviceLedger(new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam)), devIndexes, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), runManageParam.getSearchValue());
+        List<String> devID = deviceLedger.getRecords().stream().map(RunTimeVO::getId).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(devID)){
+            //添加装置用户性质
+            List<DevDetail.DevPowerFlag> devPowerFlags = deviceMapper.selectDevPowerFlagByIds(devID);
+            Map<String, List<DevDetail.DevPowerFlag>> devPowerFlag =
+                    devPowerFlags.stream().collect(Collectors.groupingBy(DevDetail.DevPowerFlag::getDevIndex));
+            deviceLedger.getRecords().stream().forEach(
+                    vo -> {
+                        if (devPowerFlag.containsKey(vo.getId())) {
+                            String powerFlagStr = Optional.ofNullable(devPowerFlag.get(vo.getId()))
+                                    .orElse(Collections.emptyList())
+                                    .stream()
+                                    .map(DevDetail.DevPowerFlag::getPowerFlag)
+                                    .distinct()
+                                    .collect(Collectors.joining("/"));
+                            vo.setPowerFlag(powerFlagStr);
+                        }
+                    }
+            );
+        }
+        return deviceLedger;
     }
 
     /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java

@@ -1,18 +1,24 @@
 package com.njcn.device.pq.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.device.pq.mapper.AlarmMapper;
 import com.njcn.device.pq.pojo.param.AlarmParam;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
 import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
+import com.njcn.device.pq.pojo.vo.TerminalCheckVO;
 import com.njcn.device.pq.service.TerminalAlarmService;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -47,4 +53,11 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
     public boolean updateAlarmInfo(String type, String devLineId) {
        return alarmMapper.updateAlarmInfo(type,devLineId,LocalDateTime.now(),RequestUtil.getUserIndex());
     }
+
+    @Override
+    public Page<TerminalCheckVO> terminalCheckPage(TerminalCheckParam terminalCheckParam) {
+        Page<TerminalCheckVO> page = new Page<>(PageFactory.getPageNum(terminalCheckParam),PageFactory.getPageSize(terminalCheckParam));
+        Page<TerminalCheckVO> pageResult = alarmMapper.terminalCheckPage(page,terminalCheckParam);
+        return pageResult;
+    }
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java

@@ -64,6 +64,7 @@ import com.njcn.device.subvoltage.mapper.VoltageMapper;
 import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
 import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.device.utils.ExcelStyleUtil;
+import com.njcn.device.utils.LineSortHelper;
 import com.njcn.message.api.ProduceFeignClient;
 import com.njcn.message.constant.DeviceRebootType;
 import com.njcn.message.constant.RedisKeyPrefix;
@@ -144,6 +145,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
     private final ProduceFeignClient produceFeignClient;
     private final UserLedgerService userLedgerService;
     private final PqDevTypeService pqDevTypeService;
+    private final LineSortHelper lineSortHelper;
 
     @Value("${oracle.isSync}")
     private Boolean isSync;
@@ -205,6 +207,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(projectIndex)) {
                 checkName(addTerminalParam, PROJECT_LEVEL.getCode(), null);
                 Line line = assembleLine(addTerminalParam.getProjectParam().getName(), PROJECT_LEVEL.getCode(), "0", "0", addTerminalParam.getProjectParam().getSort());
+                lineSortHelper.handleSort(PROJECT_LEVEL.getCode(),addTerminalParam.getProjectParam().getSort(),line);
                 this.baseMapper.insert(line);
                 projectIndex = line.getId();
             }
@@ -219,6 +222,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 LogUtil.njcnDebug(log, "获取区域信息：{}", result.toString());
                 checkName(addTerminalParam, PROVINCE_LEVEL.getCode(), projectIndex);
                 Line province = assembleLine(result.getId(), PROVINCE_LEVEL.getCode(), projectIndex, projectIndex, addTerminalParam.getProvinceParam().getSort());
+                lineSortHelper.handleSort(PROVINCE_LEVEL.getCode(),addTerminalParam.getProvinceParam().getSort(),province);
                 this.baseMapper.insert(province);
                 provinceIndex = province.getId();
             }
@@ -229,6 +233,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(gdIndex) && StrUtil.isNotBlank(provinceIndex)) {
                 checkName(addTerminalParam, GD_LEVEL.getCode(), provinceIndex);
                 Line gdInformation = assembleLine(addTerminalParam.getGdInformationParam().getName(), GD_LEVEL.getCode(), provinceIndex, projectIndex + StrUtil.COMMA + provinceIndex, addTerminalParam.getGdInformationParam().getSort());
+                lineSortHelper.handleSort(GD_LEVEL.getCode(),addTerminalParam.getGdInformationParam().getSort(),gdInformation);
                 this.baseMapper.insert(gdInformation);
                 gdIndex = gdInformation.getId();
             }
@@ -239,6 +244,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) {
                 checkName(addTerminalParam, LineBaseEnum.SUB_LEVEL.getCode(), gdIndex);
                 Line subStation = assembleLine(addTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, addTerminalParam.getSubStationParam().getSort());
+                lineSortHelper.handleSort(SUB_LEVEL.getCode(),addTerminalParam.getSubStationParam().getSort(),subStation);
                 this.baseMapper.insert(subStation);
                 subIndex = subStation.getId();
 
@@ -259,6 +265,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (CollectionUtil.isNotEmpty(addTerminalParam.getDeviceParam()) && StrUtil.isNotBlank(subIndex)) {
                 //校验变电站下的装置名称ip是否重复
                 checkDevNameAndIp(addTerminalParam, subIndex, lineLambdaQueryWrapper);
+
+                Integer devSort = lineSortHelper.getNextSort(DEVICE_LEVEL.getCode());
                 for (DeviceParam deviceParam : addTerminalParam.getDeviceParam()) {
                     //用于记录装置id
                     String devIdIndex;
@@ -286,9 +294,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         }
                     }
 
+
                     if (StrUtil.isBlank(deviceParam.getDevIndex())) {
                         Line device = assembleLine(deviceParam.getName(), LineBaseEnum.DEVICE_LEVEL.getCode(), subIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex, deviceParam.getSort());
+                        if(Objects.isNull(deviceParam.getSort()) || deviceParam.getSort() == 0){
+                            device.setSort(devSort);
+                        }
                         this.baseMapper.insert(device);
+                        if(Objects.isNull(deviceParam.getSort()) || deviceParam.getSort() == 0){
+                            devSort++;
+                        }
                         devIdIndex = device.getId();
 
                         //装置详情
@@ -368,32 +383,32 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     .eq(Line::getState, DataStateEnum.ENABLE.getCode())
                                     .in(Line::getName, subvNameList);
                             List<Line> subvRes = this.list(lineLambdaQueryWrapper);
-                            if (!subvRes.isEmpty()) {
+                          /*  if (!subvRes.isEmpty()) {
                                 List<String> subvList = subvRes.stream().map(Line::getName).collect(Collectors.toList());
                                 throw new BusinessException(DeviceResponseEnum.SUBV_NAME_SAME, String.join(";", subvList));
-                            }
+                            }*/
                         }
 
 
                         //母线
                         List<String> voltageName = deviceParam.getSubVoltageParam().stream().filter(item -> StrUtil.isBlank(item.getSubvIndex())).map(SubVoltageParam::getName).collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(voltageName)) {
+                       /* if (CollectionUtil.isNotEmpty(voltageName)) {
                             List<Line> voltageList = this.baseMapper.getVoltageListBySubId(subIndex, voltageName);
                             if (CollectionUtil.isNotEmpty(voltageList)) {
                                 throw new BusinessException(DeviceResponseEnum.SUBV_NAME_SAME, voltageList.stream().map(Line::getName).collect(Collectors.joining(";")));
                             }
-                        }
+                        }*/
 
 
                         //校验同一变电站下只能有唯一母线名称
                         List<String> addVoltage = deviceParam.getSubVoltageParam().stream().filter(item -> StrUtil.isBlank(item.getSubvIndex())).map(SubVoltageParam::getName).collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(addVoltage)) {
+                       /* if (CollectionUtil.isNotEmpty(addVoltage)) {
                             List<Line> voltageListBySubId = this.baseMapper.getVoltageListBySubId(subIndex, addVoltage);
                             if (CollectionUtil.isNotEmpty(voltageListBySubId)) {
                                 throw new BusinessException(DeviceResponseEnum.SUBV_NAME_SAME, voltageListBySubId.stream().map(Line::getName).collect(Collectors.joining(";")));
                             }
-                        }
-
+                        }*/
+                        Integer subvSort = lineSortHelper.getNextSort(SUB_V_LEVEL.getCode());
                         for (SubVoltageParam subVoltageParam : deviceParam.getSubVoltageParam()) {
                             //母线id
                             String subvIndex;
@@ -413,7 +428,13 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 }
 
                                 Line subVoltage = assembleLine(subVoltageParam.getName(), LineBaseEnum.SUB_V_LEVEL.getCode(), devIdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex, subVoltageParam.getSort());
+                                if(Objects.isNull(subVoltageParam.getSort()) || subVoltageParam.getSort() == 0) {
+                                    subVoltage.setSort(subvSort);
+                                }
                                 this.baseMapper.insert(subVoltage);
+                                if(Objects.isNull(subVoltageParam.getSort()) || subVoltageParam.getSort() == 0) {
+                                    subvSort++;
+                                }
                                 subvIndex = subVoltage.getId();
                                 Voltage voltage = new Voltage();
                                 voltage.setId(subVoltage.getId());
@@ -441,6 +462,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     }
                                 }
                                 //通用新增监测点
+                                Integer lineSort = lineSortHelper.getNextSort(LineBaseEnum.LINE_LEVEL.getCode());
                                 for (LineParam lineParam : subVoltageParam.getLineParam()) {
                                     if (StrUtil.isBlank(lineParam.getLineIndex()) && StrUtil.isNotBlank(subvIndex)) {
                                         //判断监测点序号是否重复
@@ -454,7 +476,13 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                         //删除与当前线路号重复的项
                                         listLineNum.removeIf(lineNo -> lineNo.equals(lineParam.getNum()));
                                         Line line = assembleLine(lineParam.getName(), LineBaseEnum.LINE_LEVEL.getCode(), subvIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex + StrUtil.COMMA + subvIndex, lineParam.getSort());
+                                        if(Objects.isNull(lineParam.getSort()) || lineParam.getSort() == 0) {
+                                            line.setSort(lineSort);
+                                        }
                                         this.baseMapper.insert(line);
+                                        if(Objects.isNull(lineParam.getSort()) || lineParam.getSort() == 0) {
+                                            lineSort++;
+                                        }
                                         LineDetail lineDetail = new LineDetail();
                                         BeanUtils.copyProperties(lineParam, lineDetail);
                                         lineDetail.setId(line.getId());
@@ -481,7 +509,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                         //监测点限值
                                         DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
                                         float scaTmp = Float.parseFloat(scaleResult.getValue());
-                                        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
 
                                         if (Objects.isNull(lineParam.getVoltageDev())) {
                                             overlimit.setVoltageDev(overlimit.getVoltageDev());
@@ -723,10 +751,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     .notIn(Line::getId, subVIndexList)
                                     .eq(Line::getPid, voltage.getPid());
                             List<Line> subVoltageList = this.list(lambdaQueryWrapper);
-                            if (CollectionUtil.isNotEmpty(subVoltageList)) {
+                         /*   if (CollectionUtil.isNotEmpty(subVoltageList)) {
                                 List<String> repeatSubVNames = subVoltageList.stream().map(Line::getName).collect(Collectors.toList());
                                 throw new BusinessException(DeviceResponseEnum.SUBV_NAME_SAME, "已存在母线名称:" + String.join(";", repeatSubVNames));
-                            }
+                            }*/
                         }
                     }
 
@@ -752,7 +780,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 float voltageLevel = Float.parseFloat(dictData.getValue());
                                 if (CollectionUtil.isNotEmpty(lineList)) {
                                     for (LineDetail lineDetail : lineList) {
-                                        Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                        Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                                         overlimit.setId(lineDetail.getId());
                                         overlimitMapper.deleteById(lineDetail.getId());
                                         overlimitMapper.insert(overlimit);
@@ -839,7 +867,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     float scaTmp = Float.parseFloat(scaleResult.getValue());
 
                                     //监测点限值
-                                    Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                    Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                                     if (Objects.isNull(updateLineBO.getVoltageDev())) {
                                         overlimit.setVoltageDev(overlimit.getVoltageDev());
                                     } else {
@@ -1635,6 +1663,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     @Override
     public List<Line> getLineByCondition(List<String> ids, DeviceInfoParam deviceInfoParam) {
+        if(StrUtil.isNotBlank(deviceInfoParam.getSearchValue())){
+            return this.baseMapper.getLineByConditionBySearchValue(ids, deviceInfoParam);
+        }
         return this.baseMapper.getLineByCondition(ids, deviceInfoParam);
     }
 
@@ -1860,7 +1891,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 }
 
                 float voltageLevel = Float.parseFloat(scaleResult.getValue());
-                Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                 overlimit.setId(lineDetail.getId());
                 overlimitMapper.insert(overlimit);
                 count++;
@@ -2193,7 +2224,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         //监测点限值
         DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
         float scaTmp = Float.parseFloat(scaleResult.getValue());
-        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
 
         if (Objects.isNull(lineParam.getVoltageDev())) {
             overlimit.setVoltageDev(overlimit.getVoltageDev());
@@ -2742,7 +2773,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
      * @date 2022/5/18
      */
     @Transactional(rollbackFor = Exception.class)
-    private void saveTerminalBase(List<TerminalBaseExcel> terminalBaseExcels) {
+    public void saveTerminalBase(List<TerminalBaseExcel> terminalBaseExcels) {
         List<TerminalBaseExcel.TerminalBaseExcelMsg> terminalBaseExcelMsgs = new ArrayList<>();
         //任意集合数据为空，不处理
         if (CollectionUtil.isNotEmpty(terminalBaseExcels)) {
@@ -3006,7 +3037,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     DictData dictData = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
 
                     lineDetailMapper.insert(lineDetail);
-                    Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(dictData.getValue()), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity(), terminalBaseExcel.getShortCapacity(), null, null);
+                    Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(dictData.getValue()), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity(), terminalBaseExcel.getShortCapacity(), terminalBaseExcel.getPowerFlag(), 0);
                     overlimit.setId(temp.getId());
                     overlimitMapper.insert(overlimit);
                 }
@@ -4076,6 +4107,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     });
                 });
             } catch (Exception e) {
+                log.info("台账同步推送异常：" + e);
                 //出现异常，直接重启整个前置
                 exFlag=true;
                 for (Node node : nodes) {
@@ -4334,6 +4366,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
             // 比较装置 所属前置
             flag |= compareAndAppend(stringBuilder, devDetail.getNodeId(), updateDeviceParam.getNodeId(), "终端所属前置机");
+            //如果前置机切换，可能装置在进程2上，但是切换后前置机只有一个进程，因此修改装置进程表设为默认进程1
+            if(!Objects.equals(updateDeviceParam.getNodeId(), devDetail.getNodeId())){
+                deviceProcessService.lambdaUpdate().eq(DeviceProcess::getId,devDetail.getId()).set(DeviceProcess::getProcessNo,1).update();
+            }
 
             // 比较装置端口号
             flag |= compareAndAppend(stringBuilder, devDetail.getPort(), updateDeviceParam.getPort(), "终端端口号");

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceMapper.java

@@ -102,4 +102,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
     void updateDeviceRunFlag(@Param("id")String deviceId, @Param("runFlag")Integer status);
 
     List<PollutionLineInfoDTO> getPollutionDeviceInfo(@Param("id")List<String> devId);
+
+    List<DevDetail.DevPowerFlag> selectDevPowerFlagByIds(@Param("ids") List<String> ids);
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml

@@ -28,6 +28,10 @@
         manufacturerId.name as manufacturer,
         dev.name as devName,
         device.IP as ip,
+        CASE linedetail.Power_Flag
+        WHEN 0 THEN  '电网侧'
+        WHEN 1 THEN '非电网侧'
+        END AS powerFlag,
         case linedetail.Run_Flag
         when 0 then '投运'
         when 1 then '检修'
@@ -149,6 +153,10 @@
         manufacturerId.name as manufacturer,
         dev.name as devName,
         device.IP as ip,
+        CASE linedetail.Power_Flag
+        WHEN 0 THEN  '电网侧'
+        WHEN 1 THEN '非电网侧'
+        END AS powerFlag,
         case linedetail.Run_Flag
         when 0 then '投运'
         when 1 then '检修'
@@ -530,5 +538,31 @@
         AND substation.id = pqsub.id
         AND subv.id = pv.id
     </select>
+    <select id="selectDevPowerFlagByIds" resultType="com.njcn.device.pq.pojo.vo.DevDetail$DevPowerFlag">
+        SELECT DISTINCT
+        device.id as devIndex,
+        CASE lineDetail.Power_Flag
+        WHEN 0 THEN  '电网侧'
+        WHEN 1 THEN '非电网侧'
+        END AS powerFlag
+        FROM
+        pq_line line,
+        pq_dept_line pd,
+        pq_line voltage,
+        pq_line device,
+        pq_line_detail lineDetail
+        <where>
+            <if test="ids!=null and ids.size()>0">
+                device.id IN
+                <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND line.pid = voltage.id
+            AND line.id = pd.Line_Id
+            AND voltage.pid = device.id
+            AND line.id = lineDetail.id
+        </where>
+    </select>
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java

@@ -148,6 +148,8 @@ public interface LineMapper extends BaseMapper<Line> {
      */
     List<Line> getLineByCondition(@Param("ids") List<String> ids, @Param("deviceInfoParam") DeviceInfoParam deviceInfoParam);
 
+    List<Line> getLineByConditionBySearchValue(@Param("ids") List<String> ids, @Param("deviceInfoParam") DeviceInfoParam deviceInfoParam);
+
     /**
      * 查询终端信息
      *

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/LineService.java

@@ -235,4 +235,10 @@ public interface LineService extends IService<Line> {
      * 终端运行状态修改时，同时调整监测点的运行状态
      */
     void updateLineRunFlag(String id, Integer status);
+
+    /**
+     * 自动修改验证pids是否正确
+     */
+    void updatePids();
+
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java

@@ -83,10 +83,9 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
                 List<String> deptList = Arrays.asList("130700000000", "130300000000", "130800000000", "130200000000", "131000000000");
                 Dept data = deptFeignClient.getDeptById(deptLineParam.getId()).getData();
                 if (deptList.contains(data.getArea())) {
-                    List<String> lineIds = list.stream().map(LineDetail::getId).collect(Collectors.toList());
                     detailMapper.update(null, new LambdaUpdateWrapper<LineDetail>()
                             .set(LineDetail::getActualArea, data.getArea())
-                            .in(LineDetail::getId, lineIds));
+                            .in(LineDetail::getId, ids));
                 }
             }
         }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java

@@ -6,9 +6,11 @@ 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.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -158,8 +160,10 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             lineDetailDataVO.setIp(device.getIp());
             lineDetailDataVO.setLoginTime(device.getLoginTime());
             lineDetailDataVO.setDevId(device.getId());
+            lineDetailDataVO.setDevType(device.getDevType());
             lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName());
             lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
+            lineDetailDataVO.setObjId(lineDetail.getObjId());
             lineDetailDataVO.setObjName(lineDetail.getObjName());
             lineDetailDataVO.setId(lineDetail.getNum());
             lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType()));
@@ -840,6 +844,82 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         }
     }
 
+    @Override
+    public void updatePids() {
+        List<Line> list = this.list();
+        List<String> strings = this.checkPidsError(list);
+        if(CollUtil.isNotEmpty(strings)){
+            for (String msg : strings) {
+                // 1. 按 | 分割成三部分
+                String[] parts = msg.split(" \\| ");
+                // 2. 提取节点 ID
+                String id = parts[0].replace("节点ID：", "").trim();
+                // 3. 提取正确 pids（去掉括号）
+                String newPids = parts[2].replace("正确pids：[", "").replace("]", "").trim();
+                this.update(new LambdaUpdateWrapper<Line>()
+                        .set(Line::getPids, newPids)
+                        .eq(Line::getId, id));
+
+
+            }
+        }
+    }
+    /**
+     * 校验所有节点 pids 是否正确
+     * 正确规则：去掉开头0 + 去掉自身ID，只保留祖先链
+     */
+    public List<String> checkPidsError(List<Line> allList) {
+        List<String> errorList = new ArrayList<>();
+        Map<String, Line> idMap = allList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
+        for (Line node : allList) {
+            // 1. 生成正确格式的 pids（你的规则）
+            String correctPids = getCorrectPids(node.getId(), idMap);
+            // 2. 数据库存储的 pids
+            String dbPids = node.getPids() == null ? "" : node.getPids().trim();
+            // 3. 对比，不一致就是错误
+            if (!correctPids.equals(dbPids)) {
+                errorList.add("节点ID：" + node.getId() +
+                        " | 数据库pids：[" + dbPids +
+                        "] | 正确pids：[" + correctPids + "]");
+            }
+        }
+        return errorList;
+    }
+
+    /**
+     * 核心：生成【你要求】的正确 pids
+     * 规则：
+     * 1. 向上遍历所有祖先
+     * 2. 去掉开头 0
+     * 3. 去掉最后一位自身ID
+     * 4. 用逗号拼接
+     */
+    private String getCorrectPids(String nodeId, Map<String, Line> idMap) {
+        Deque<String> pathDeque = new LinkedList<>();
+        String currentId = nodeId;
+        // 向上收集所有节点（包含自身 + 所有祖先 + 0）
+        while (currentId != null && !currentId.isEmpty()) {
+            Line node = idMap.get(currentId);
+            if (ObjectUtil.isNotNull(node)) {
+                // 头插，保证顺序正确
+                pathDeque.addFirst(currentId);
+                currentId = node.getPid();
+            }
+        }
+        // 转列表
+        List<String> path = new ArrayList<>(pathDeque);
+
+        // 1. 去掉开头的 0
+        if (!path.isEmpty() && "0".equals(path.get(0))) {
+            path.remove(0);
+        }
+        // 2. 去掉最后一位（自身ID）
+        if (!path.isEmpty()) {
+            path.remove(path.size() - 1);
+        }
+        // 拼接成最终正确 pids
+        return String.join(",", path);
+    }
 
     @Override
     public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
@@ -914,6 +994,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
                     areaLineInfoVO.setSubName(newUserReportVO.getProjectName());
                     areaLineInfoVO.setLat(newUserReportVO.getLatitude());
                     areaLineInfoVO.setLng(newUserReportVO.getLongitude());
+                    areaLineInfoVO.setObjName(newUserReportVO.getProjectName());
                 }
             }
         }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml

@@ -69,7 +69,7 @@
         select
             if(sum(real_time*1.0)/sum(due_time)*100>100,
                 100,
-                IFNULL(ROUND( sum(real_time)/sum(due_time)*100,2),0))
+                IFNULL(ROUND( sum(real_time*1.0)/sum(due_time)*100,2),0))
                  as integrityRate
         from
             r_stat_integrity_d

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/terminal/mapper/TerminalMaintainMapper.java

@@ -24,6 +24,10 @@ public interface TerminalMaintainMapper {
      */
     List<TerminalMaintainVO> getTerminalDevInfo(@Param("devIds") List<String> devIds, @Param("comFlag") Integer comFlag, @Param("devType") String devType);
 
+
+    List<TerminalMaintainVO> terminalConfig(@Param("devIds") List<String> devIds, @Param("comFlag") Integer comFlag, @Param("devType") String devType);
+
+
     /**
      * 获取区域
      * @author cdf

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/terminal/mapper/mapping/TerminalMaintainMapper.xml

@@ -38,6 +38,35 @@
                 </if>
     </select>
 
+
+    <select id="terminalConfig" resultType="TerminalMaintainVO">
+        SELECT distinct
+        IF(TRIM(detail.obj_name) != '', CONCAT(detail.obj_name,'_',a.NAME), a.NAME) as name,
+        a.id,
+        a.pid,
+        a.level,
+        b.run_flag,
+        b.ip,
+        b.com_flag,
+        b.dev_type devType
+        FROM
+        pq_line line
+        inner join pq_line_detail detail on line.id = detail.id
+        inner join pq_line bus on line.pid = bus.id
+        inner join pq_line a on bus.pid = a.id
+        INNER JOIN pq_device b ON a.id = b.id
+        where a.id in
+        <foreach collection="devIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="comFlag != null">
+            AND b.Com_Flag=#{comFlag}
+        </if>
+        <if test="devType !=null and devType != ''">
+            AND b.Dev_Type =#{devType}
+        </if>
+    </select>
+
     <select id="getGdAndSubList" resultType="TerminalMaintainVO">
         select id,name,level,pid from pq_line where level = #{level} and state = 1 order by sort
     </select>
@@ -77,14 +106,17 @@
 
     <select id="getRunFlagList" resultType="TerminalMaintainVO">
         SELECT
+        IF(TRIM(detail.obj_name) != '', CONCAT(detail.obj_name,'_',a.NAME), a.NAME) as name,
         a.id,
         a.pid,
-        a.NAME,
         b.ip,
         a.level,
         b.run_flag
         FROM
-        pq_line a
+        pq_line line
+        inner join pq_line_detail detail on line.id = detail.id
+        inner join pq_line bus on line.pid = bus.id
+        inner join pq_line a on bus.pid = a.id
         INNER JOIN pq_device b ON a.id = b.id
         WHERE a.id in
         <foreach collection="ids" item="item" separator="," index="index" open="(" close=")">

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/terminal/service/impl/TerminalMaintainServiceImpl.java

@@ -3,6 +3,7 @@ package com.njcn.device.terminal.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.njcn.common.pojo.dto.SimpleDTO;
@@ -108,10 +109,13 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
                 terminalMaintainVO.setName(generalDeviceDTO.getName());
                 terminalMaintainVO.setId(generalDeviceDTO.getIndex());
                 terminalMaintainVO.setLevel(1);
-                List<TerminalMaintainVO> devList = terminalMaintainMapper.getTerminalDevInfo(devIds,terminalMainQueryParam.getComFlag(),terminalMainQueryParam.getDevType());
+                List<TerminalMaintainVO> devList = terminalMaintainMapper.terminalConfig(devIds,terminalMainQueryParam.getComFlag(),terminalMainQueryParam.getDevType());
                 if (CollectionUtil.isEmpty(devList)) {
                     continue;
                 }
+
+
+
                 List<String> subIndexes = devList.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList());
                 List<TerminalMaintainVO> subList1 = terminalMaintainMapper.getPqLineGdAndSubList(subIndexes);
                 List<String> gdIndexes = subList1.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList());

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 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.pq.pojo.param.TerminalCheckParam;
 import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
@@ -19,6 +20,7 @@ import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.ir.Terminal;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -147,4 +149,15 @@ public class UserLedgerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportVO, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @PostMapping("/userCheckUpload")
+    @ApiOperation("周期检测")
+    @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
+    public HttpResult<Boolean> userCheckUpload(@RequestBody @Validated TerminalCheckParam terminalCheckParam) {
+        String methodDescribe = getMethodDescribe("addUserReport");
+        Boolean f = userReportPOService.userCheckUpload(terminalCheckParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, f, methodDescribe);
+    }
+
+
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/SupervisionUserReportFileMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.po.SupervisionUserReportFile;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-07-07
+ * @Description:
+ */
+@Mapper
+public interface SupervisionUserReportFileMapper extends BaseMapper<SupervisionUserReportFile> {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/mapping/UserReportPOMapper.xml

@@ -27,6 +27,7 @@
       supervision_user_report.status,
       supervision_user_report.dev_id,
       supervision_user_report.line_id,
+      supervision_user_report.station_id,
       supervision_user_report.second_assessment_id secondAssessmentId
     FROM supervision_user_report supervision_user_report
     WHERE ${ew.sqlSegment}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/SupervisionUserReportFileService.java

@@ -0,0 +1,8 @@
+package com.njcn.device.userledger.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pq.pojo.po.SupervisionUserReportFile;
+
+public interface SupervisionUserReportFileService extends IService<SupervisionUserReportFile> {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/UserLedgerService.java

@@ -2,6 +2,7 @@ package com.njcn.device.userledger.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
 import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
@@ -90,4 +91,7 @@ public interface UserLedgerService extends IService<UserReportPO> {
      * @return
      */
     UserReportVO getUserReportById(String id);
+
+
+    Boolean userCheckUpload(TerminalCheckParam terminalCheckParam);
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/SupervisionUserReportFileServiceImpl.java

@@ -0,0 +1,19 @@
+package com.njcn.device.userledger.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.SupervisionUserReportFileMapper;
+import com.njcn.device.pq.pojo.po.SupervisionUserReportFile;
+import com.njcn.device.userledger.service.SupervisionUserReportFileService;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-07-07
+ * @Description:
+ */
+@Service
+public class SupervisionUserReportFileServiceImpl extends ServiceImpl<SupervisionUserReportFileMapper, SupervisionUserReportFile>
+        implements SupervisionUserReportFileService {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserLedgerServiceImpl.java

@@ -17,12 +17,19 @@ import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.pq.pojo.param.TerminalCheckParam;
+import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.po.LineDetail;
+import com.njcn.device.pq.pojo.po.SupervisionUserReportFile;
+import com.njcn.device.substation.mapper.SubstationMapper;
+import com.njcn.device.userledger.mapper.SupervisionUserReportFileMapper;
 import com.njcn.device.userledger.mapper.UserReportNormalMapper;
 import com.njcn.device.userledger.mapper.UserReportPOMapper;
-import com.njcn.device.userledger.service.UserLedgerService;
-import com.njcn.device.userledger.service.UserReportProjectPOService;
-import com.njcn.device.userledger.service.UserReportSensitivePOService;
-import com.njcn.device.userledger.service.UserReportSubstationPOService;
+import com.njcn.device.userledger.service.*;
 import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.SupervisionResponseEnum;
 import com.njcn.supervision.enums.UserNatureEnum;
@@ -44,8 +51,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -67,6 +76,10 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
     private final UserReportNormalMapper userReportNormalMapper;
     private final UserReportSensitivePOService userReportSensitivePOService;
     private final UserFeignClient userFeignClient;
+    private final LineMapper substationMapper;
+    private final LineDetailMapper lineDetailMapper;
+    private final SupervisionUserReportFileService supervisionUserReportFileService;
+    private final DeviceMapper deviceMapper;
 
     @Override
     public List<UserLedgerVO> selectUserList(UserReportParam userReportParam) {
@@ -171,7 +184,19 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
         userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
         Page<UserReportVO> page;
         page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);
+        Map<String,String> atationMap = new HashMap<>();
+        if(CollUtil.isNotEmpty(page.getRecords())){
+           List<String> stationIds = page.getRecords().stream().map(UserReportVO::getStationId).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
+          if(CollUtil.isNotEmpty(stationIds)){
+              List<Line> stationList = substationMapper.selectBatchIds(stationIds);
+              stationList.forEach(line -> atationMap.put(line.getId(), line.getName()));
+          }
+
+            List<String> ids = page.getRecords().stream().map(UserReportVO::getId).collect(Collectors.toList());
+            List<SupervisionUserReportFile> supervisionUserReportFiles = supervisionUserReportFileService.lambdaQuery().in(SupervisionUserReportFile::getId,ids).list();
+            Map<String,SupervisionUserReportFile> stringSupervisionUserReportFileMap = supervisionUserReportFiles.stream().collect(Collectors.toMap(SupervisionUserReportFile::getId, Function.identity()));
         page.getRecords().forEach(temp -> {
+            temp.setStationId(atationMap.getOrDefault(temp.getStationId(),"/"));
             Integer needGovernance = 0;
             if (
                     CollectionUtil.newArrayList(
@@ -217,7 +242,16 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
                 }
             }
             temp.setType(type);
+            if(stringSupervisionUserReportFileMap.containsKey(temp.getId())){
+                SupervisionUserReportFile supervisionUserReportFile = stringSupervisionUserReportFileMap.get(temp.getId());
+                temp.setCheckUrl(supervisionUserReportFile.getCheckUrl());
+                //temp.setCheckHistoryUrl(supervisionUserReportFile.getCheckHistoryUrl());
+                temp.setAssessUrl(supervisionUserReportFile.getAssessUrl());
+                temp.setOtherUrl(supervisionUserReportFile.getOtherUrl());
+            }
+
         });
+        }
         return page;
     }
 
@@ -241,6 +275,13 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
                 userReportVO.setOrgName(dept.getName());
             }
         }
+
+        SupervisionUserReportFile supervisionUserReportFile = supervisionUserReportFileService.getOne(new LambdaQueryWrapper<SupervisionUserReportFile>().eq(SupervisionUserReportFile::getId,userReportPO.getId()));
+        if(Objects.nonNull(supervisionUserReportFile)){
+            userReportVO.setCheckUrl(supervisionUserReportFile.getCheckUrl());
+            userReportVO.setAssessUrl(supervisionUserReportFile.getAssessUrl());
+            userReportVO.setOtherUrl(supervisionUserReportFile.getOtherUrl());
+        }
         /*
             根据用户性质获取自己特有的字段，此处需要特殊处理
             1、每个附件需要返回文件名称以及可以预览的url
@@ -287,6 +328,7 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String addUserReport(UserReportParam userReportParam) {
         UserReportPO userReportPO = new UserReportPO();
         BeanUtils.copyProperties(userReportParam, userReportPO);
@@ -315,6 +357,27 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
             userReportPO.setDataType(0);
         }
         this.saveOrUpdate(userReportPO);
+
+        //需要同步更新pq_line_detail 表里的obj_name字段
+        if(Objects.nonNull(userReportParam.getDataType()) && userReportParam.getDataType() == 1){
+            if(StrUtil.isNotBlank(userReportPO.getId())){
+                List<LineDetail> lineDetailList = lineDetailMapper.selectList(new LambdaQueryWrapper<LineDetail>().eq(LineDetail::getId, userReportPO.getId()));
+                if(CollUtil.isNotEmpty(lineDetailList)){
+                   List<String> ids = lineDetailList.stream().map(LineDetail::getId).collect(Collectors.toList());
+                    LineDetail lineDetail = new LineDetail();
+                    lineDetail.setObjName(userReportPO.getProjectName());
+                    lineDetailMapper.update(lineDetail,new LambdaUpdateWrapper<LineDetail>().in(LineDetail::getId,ids));
+                }
+            }
+        }
+        //处理需要上传的附件
+        SupervisionUserReportFile supervisionUserReportFile = new SupervisionUserReportFile();
+        supervisionUserReportFile.setId(userReportPO.getId());
+        supervisionUserReportFile.setCheckUrl(userReportParam.getCheckUrl());
+        supervisionUserReportFile.setAssessUrl(userReportParam.getAssessUrl());
+        supervisionUserReportFile.setOtherUrl(userReportParam.getOtherUrl());
+        supervisionUserReportFileService.saveOrUpdate(supervisionUserReportFile);
+
         userReportPO = this.getById(userReportPO.getId());
         if (
                 CollectionUtil.newArrayList(
@@ -383,6 +446,21 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
         return this.baseMapper.getUserReportById(userReportVOQueryWrapper);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean userCheckUpload(TerminalCheckParam terminalCheckParam) {
+        SupervisionUserReportFile supervisionUserReportFile = new SupervisionUserReportFile();
+        supervisionUserReportFile.setId(terminalCheckParam.getObjId());
+        supervisionUserReportFile.setCheckUrl(terminalCheckParam.getCheckUrl());
+        supervisionUserReportFileService.saveOrUpdate(supervisionUserReportFile);
+        Device device = new Device();
+        device.setId(terminalCheckParam.getDevId());
+        device.setThisTimeCheck(terminalCheckParam.getThisCheckTime());
+        device.setNextTimeCheck(terminalCheckParam.getNextCheckTime());
+        deviceMapper.updateById(device);
+        return true;
+    }
+
     /**
      * 判断工程名称是否重复，如果重复则提示用户XXX已经创建该工程
      *

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/utils/LineSortHelper.java

@@ -0,0 +1,59 @@
+package com.njcn.device.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.pq.pojo.po.Line;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-06-13
+ * @Description:
+ */
+@Component
+@RequiredArgsConstructor
+public class LineSortHelper {
+
+    private final LineMapper lineMapper;
+
+    /**
+     * 获取同一父节点下的最大 sort 值 + 1
+     * @param level 层级
+     * @return 下一个可用的 sort 值
+     */
+    public Integer getNextSort(Integer level) {
+        LambdaQueryWrapper<Line> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Line::getState, DataStateEnum.ENABLE.getCode())
+                .eq(Line::getLevel,level)
+                .orderByDesc(Line::getSort)
+                .last("limit 1");
+        Line maxSortLine = lineMapper.selectOne(wrapper);
+
+        if (Objects.nonNull(maxSortLine) && Objects.nonNull(maxSortLine.getSort())) {
+            return maxSortLine.getSort() + 1;
+        }
+        return 0;
+    }
+
+
+    public void handleSort(Integer level, Integer sort,Line line) {
+        int lastSort;
+        if (Objects.isNull(sort) || sort == 0) {
+            lastSort = getNextSort(level);
+        }else {
+            lastSort = sort;
+        }
+        line.setSort(lastSort);
+    }
+
+
+    public Integer handleSortBatch(Integer currentSort, Line line) {
+        line.setSort(currentSort);
+        return currentSort + 1;
+    }
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java

@@ -76,7 +76,7 @@ public class AdvanceEventDetailVO {
     private String sagsource;
 
     @ApiModelProperty(value = "开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss.SSS")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "持续时间，单位秒")

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java

@@ -636,18 +636,16 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
                     }
                 }, executor);
 
-                CompletableFuture<List<EventEigDetail>> eigFuture = CompletableFuture.supplyAsync(() ->
-                        waveService.eventDetailEigenvalue(index, line.getPtType()), executor
-                );
 
                 // 等待所有异步任务完成并获取结果（无超时，但可加）
-                CompletableFuture<Void> allFutures = CompletableFuture.allOf(instantFuture, rmsFuture, eigFuture);
-                allFutures.join();  // 阻塞直到三个任务都完成
+                CompletableFuture<Void> allFutures = CompletableFuture.allOf(instantFuture, rmsFuture);
+                allFutures.join();  // 阻塞直到2个任务都完成
 
                 // 获取结果（此时所有任务已完成，get()不会阻塞）
                 String imageShun64 = instantFuture.get();
                 String rmsShun64 = rmsFuture.get();
-                List<EventEigDetail> eventDetailEigenvalue = eigFuture.get();
+                List<EventEigDetail> eventDetailEigenvalue =  waveService.eventDetailEigenvalue(index, line.getPtType());
+
                 // 主线程顺序调用 WordUtil 方法（保证线程安全）
                 wordUtil.translateShun(index, imageShun64);
                 wordUtil.translateRms(index, rmsShun64);

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java

@@ -37,6 +37,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -157,9 +158,15 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public Boolean addEventDetail(EventDeatilDTO deatilDTO) {
+        RmpEventDetailPO one = this.lambdaQuery().eq(RmpEventDetailPO::getLineId, deatilDTO.getMonitorId()).eq(RmpEventDetailPO::getStartTime, deatilDTO.getStartTime()).one();
         RmpEventDetailPO rmpEventDetailPO = new RmpEventDetailPO();
+
+        if(Objects.nonNull(one)){
+            BeanUtils.copyProperties(one,rmpEventDetailPO);
+
+        }
 //        rmpEventDetailPO.setMeasurementPointId(deatilDTO.getMonitorId());
         rmpEventDetailPO.setLineId(deatilDTO.getMonitorId());
         DictData data = dicDataFeignClient.getDicDataByCode(eventTypeReflection(deatilDTO.getEventType())).getData();
@@ -174,7 +181,8 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
         }else {
             rmpEventDetailPO.setFileFlag(1);
         }
-
+        //默认给0，经过高级算法在赋值
+        rmpEventDetailPO.setDealFlag(0);
         rmpEventDetailPO.setEventDescribe(" ");
         //如果不为空，说明是二次上传波形文件了;
 
@@ -184,7 +192,6 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
         rmpEventDetailPO.setSeverity(Double.valueOf(severity));
         rmpEventDetailPO.setCreateTime(LocalDateTime.now());
 
-        RmpEventDetailPO one = this.lambdaQuery().eq(RmpEventDetailPO::getLineId, rmpEventDetailPO.getLineId()).eq(RmpEventDetailPO::getStartTime, rmpEventDetailPO.getStartTime()).one();
         if(Objects.nonNull(one)){
             rmpEventDetailPO.setEventId(one.getEventId());
 
@@ -381,15 +388,5 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
         return result;
     }
 
-    public static void main(String[] args) {
-        try{
-            System.out.println(1/0);
-        }catch (Exception e){
-            System.out.println(1);
-        }
-        System.out.println(1111);
-
-    }
-
 
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/WaveServiceImpl.java

@@ -62,7 +62,7 @@ public class WaveServiceImpl implements WaveService {
                 if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
                     throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
                 }
-                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
+                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 2);
             } catch (Exception e) {
                 try {
                     InputStream cfgStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG_LOWER);
@@ -70,7 +70,7 @@ public class WaveServiceImpl implements WaveService {
                     if (Objects.isNull(cfgStreamLower) || Objects.isNull(datStreamLower)) {
                         throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
                     }
-                    waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 1);
+                    waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 2);
                 } catch (Exception e1) {
                     throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID);
                 }

pqs-gateway/src/main/java/com/njcn/gateway/filter/AuthGlobalFilter.java

@@ -44,7 +44,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class AuthGlobalFilter implements GlobalFilter, Ordered {
 
-    private final static List<String> USER_AGENT_IP = Arrays.asList("/pqs-auth/auth/getImgCode", "/pqs-auth/oauth/token", "/user-boot/user/generateSm2Key", "/user-boot/user/updateFirstPassword", "/user-boot/appUser/resetPsd");
+    private final static List<String> USER_AGENT_IP = Arrays.asList("/pqs-auth/auth/getImgCode", "/pqs-auth/oauth/token", "/user-boot/user/generateSm2Key", "/user-boot/user/updateFirstPassword", "/user-boot/appUser/resetPsd","/pqs-auth/oauth/lnLogin","/pqs-auth/oauth/lnCheck","/pqs-auth/oauth/lnRefreshToken");
 
     private final RedisUtil redisUtil;
 

pqs-gateway/src/main/resources/bootstrap-sjzx.yml

@@ -223,6 +223,9 @@ whitelist:
     - /user-boot/appUser/resetPsd
     - /pqs-auth/oauth/logout
     - /pqs-auth/oauth/token
+    - /pqs-auth/oauth/lnLogin
+    - /pqs-auth/oauth/lnCheck
+    - /pqs-auth/oauth/lnRefreshToken
     - /pqs-auth/oauth/autoLogin
     - /pqs-auth/auth/getImgCode
     - /pqs-auth/oauth/getPublicKey

pqs-gateway/src/main/resources/bootstrap.yml

@@ -1,283 +1,3 @@
-#当前服务的基本信息
-microservice:
-  ename: @artifactId@
-  name: "@name@"
-  version: @version@
-  sentinel:
-    url: @sentinel.url@
-  gateway:
-    url: @gateway.url@
-server:
-  port: 10215
 spring:
-  application:
-    name: @artifactId@
-  main:
-    allow-bean-definition-overriding: true
-  #nacos注册中心以及配置中心的指定
-  cloud:
-    nacos:
-      discovery:
-        ip: @service.server.url@
-        server-addr: @nacos.url@
-        username: @nacos.username@
-        password: @nacos.password@
-        namespace: @nacos.namespace@
-      config:
-        server-addr: @nacos.url@
-        username: @nacos.username@
-        password: @nacos.password@
-        namespace: @nacos.namespace@
-        file-extension: yaml
-        shared-configs:
-          - data-id: share-config.yaml
-            refresh: true
-          - data-id: share-config-datasource-db.yaml
-            refresh: true
-    gateway:
-      globalcors:
-        corsConfigurations:
-          '[/**]':
-            allowCredentials: true
-            exposedHeaders: "Content-Disposition,Content-Type,Cache-Control"
-            allowedHeaders: "*"
-            allowedOrigins: "*"
-            allowedMethods: "*"
-      discovery:
-        locator:
-          # 开启自动代理 (自动装载从配置中心serviceId)
-          enabled: true
-          # 服务id为true --> 这样小写服务就可访问了
-          lower-case-service-id: true
-      routes:
-        - id: pqs-auth
-          uri: lb://pqs-auth
-          predicates:
-            - Path=/pqs-auth/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: user-boot
-          uri: lb://user-boot
-          predicates:
-            - Path=/user-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: device-boot
-          uri: lb://device-boot
-          predicates:
-            - Path=/device-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: system-boot
-          uri: lb://system-boot
-          predicates:
-            - Path=/system-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: harmonic-boot
-          uri: lb://harmonic-boot
-          predicates:
-            - Path=/harmonic-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: energy-boot
-          uri: lb://energy-boot
-          predicates:
-            - Path=/energy-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: event-boot
-          uri: lb://event-boot
-          predicates:
-            - Path=/event-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: quality-boot
-          uri: lb://quality-boot
-          predicates:
-            - Path=/quality-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: harmonic-prepare
-          uri: lb://harmonic-prepare
-          predicates:
-            - Path=/harmonic-prepare/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: process-boot
-          uri: lb://process-boot
-          predicates:
-            - Path=/process-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: prepare-boot
-          uri: lb://prepare-boot
-          predicates:
-            - Path=/prepare-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: algorithm-boot
-          uri: lb://algorithm-boot
-          predicates:
-            - Path=/algorithm-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: access-boot
-          uri: lb://access-boot
-          predicates:
-            - Path=/access-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: cs-device-boot
-          uri: lb://cs-device-boot
-          predicates:
-            - Path=/cs-device-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: cs-system-boot
-          uri: lb://cs-system-boot
-          predicates:
-            - Path=/cs-system-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: cs-warn-boot
-          uri: lb://cs-warn-boot
-          predicates:
-            - Path=/cs-warn-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: cs-harmonic-boot
-          uri: lb://cs-harmonic-boot
-          predicates:
-            - Path=/cs-harmonic-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: advance-boot
-          uri: lb://advance-boot
-          predicates:
-            - Path=/advance-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: bpm-boot
-          uri: lb://bpm-boot
-          predicates:
-            - Path=/bpm-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: supervision-boot
-          uri: lb://supervision-boot
-          predicates:
-            - Path=/supervision-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        - id: cs-report-boot
-          uri: lb://cs-report-boot
-          predicates:
-            - Path=/cs-report-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-        #河北国网总部调用省侧接口，路径总部统一规定
-        - id: hb_pms_down
-          uri: lb://harmonic-boot
-          predicates:
-            - Path=/IndexAnalysis/**
-            - Path=/pms-tech-powerquality-start/**
-        - id: zl-event-boot
-          uri: lb://zl-event-boot
-          predicates:
-            - Path=/zl-event-boot/**
-          filters:
-            - SwaggerHeaderFilter
-            - StripPrefix=1
-
-#项目日志的配置
-logging:
-  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
-  level:
-    root: info
-
-whitelist:
-  urls:
-    - /user-boot/user/generateSm2Key
-    - /user-boot/theme/getTheme
-    - /user-boot/user/updateFirstPassword
-    - /user-boot/appUser/authCode
-    - /user-boot/appUser/register
-    - /user-boot/appUser/resetPsd
-    - /pqs-auth/oauth/logout
-    - /pqs-auth/oauth/token
-    - /pqs-auth/oauth/autoLogin
-    - /pqs-auth/auth/getImgCode
-    - /pqs-auth/oauth/getPublicKey
-    - /pqs-auth/judgeToken/heBei
-    - /pqs-auth/judgeToken/guangZhou
-
-    - /webjars/**
-    - /actuator/**
-    - /doc.html
-    - /swagger-resources/**
-    - /*/v2/api-docs
-    - /favicon.ico
-    - /system-boot/theme/getTheme
-    - /system-boot/image/toStream
-    - /system-boot/file/download
-    - /cs-system-boot/appinfo/queryAppInfoByType
-    - /system-boot/dictType/dictDataCache
-    - /system-boot/file/**
-    - /system-boot/area/**
-    - /bpm-boot/**
-    - /harmonic-boot/comAccess/getComAccessData
-    - /harmonic-boot/harmonic/getHistoryResult
-    - /event-boot/transient/getTransientAnalyseWave
-#    - /**
-    #开始
-#    - /advance-boot/**
-#    - /device-boot/**
-#    - /system-boot/**
-#    - /harmonic-boot/**
-#    - /energy-boot/**
-#    - /event-boot/**
-#    - /quality-boot/**
-#    - /harmonic-prepare/**
-#    - /process-boot/**
-#    - /bpm-boot/**
-#   - /system-boot/**
-#   - /supervision-boot/**
-#    - /user-boot/**
-#    - /harmonic-boot/**
-#    - /cs-device-boot/**
-    #结束
-    - /user-boot/user/listAllUserByDeptId
-    - /IndexAnalysis/**
-#mqtt:
-#  client-id: @artifactId@${random.value}
-
-
-
-
-
-
-
-
-
+  profiles:
+    active: @spring.profiles.active@

pqs-harmonic/harmonic-boot/pom.xml

@@ -64,19 +64,7 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- 多数据源切换，当数据源为oracle时需要使用 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.5.1</version>
-        </dependency>
 
-        <!-- 多数据源切换，当数据源为oracle时需要使用 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>${dynamic-datasource.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc8</artifactId>
@@ -122,7 +110,6 @@
             <groupId>com.njcn.platform</groupId>
             <artifactId>data-processing-api</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/GridDiagramHarmController.java

@@ -58,6 +58,16 @@ public class GridDiagramHarmController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subLineGiveAnAlarm, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAreaObjAlarm")
+    @ApiOperation("区域场站监测点规模")
+    @ApiImplicitParam(name = "param", value = "区域场站监测点规模参数", required = true)
+    public HttpResult<GridDiagramVO> getAreaObjAlarm(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getAreaObjAlarm");
+        GridDiagramVO subLineGiveAnAlarm = irMpTargetWarnDService.getAreaObjAlarm(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subLineGiveAnAlarm, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPollutionAlarmData")
     @ApiOperation("变电站污染告警占比")

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/powerstatistics/PowerStatisticsController.java

@@ -64,7 +64,7 @@ public class PowerStatisticsController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getTargetByTime")
     @ApiOperation("点击越限列表时间查询指标的详细数据")
-    public HttpResult<List<ThdDataVO>> getTargetByTime(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam) {
+    public HttpResult<List<ThdDataVO>> getTargetByTime(@RequestBody  PowerStatisticsParam powerStatisticsParam) {
         String methodDescribe = getMethodDescribe("getTargetByTime");
         List<ThdDataVO> targetByTime = powerStatisticsService.getTargetByTimeDetail(powerStatisticsParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, targetByTime, methodDescribe);
@@ -73,14 +73,14 @@ public class PowerStatisticsController extends BaseController {
     @ResponseBody
     @ApiOperation("导出区间数据")
     @PostMapping(value = "exportExcelRangTemplate")
-    public void exportExcelRangTemplate(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
+    public void exportExcelRangTemplate(@RequestBody PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
         powerStatisticsService.exportExcelRangTemplate(powerStatisticsParam,response);
     }
 
     @ResponseBody
     @ApiOperation("导出指标越限列表数据")
     @PostMapping(value = "exportExcelListTemplate")
-    public void exportExcelListTemplate(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
+    public void exportExcelListTemplate(@RequestBody  PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
         powerStatisticsService.exportExcelListTemplate(powerStatisticsParam,response);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataHarmRateIMapper.java

@@ -0,0 +1,11 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//import com.njcn.dataProcess.po.influx.DataHarmrateI;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//
+///**
+// * @author xy
+// */
+//public interface DataHarmRateIMapper extends InfluxDbBaseMapper<DataHarmrateI> {
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataHarmRateVMapper.java

@@ -0,0 +1,11 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//import com.njcn.dataProcess.po.influx.DataHarmrateV;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//
+///**
+// * @author xy
+// */
+//public interface DataHarmRateVMapper extends InfluxDbBaseMapper<DataHarmrateV> {
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataIMapper.java

@@ -0,0 +1,16 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//import com.njcn.dataProcess.po.influx.DataI;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//
+//
+///**
+// * @author hongawen
+// * @version 1.0
+// * @data 2024/11/7 18:49
+// */
+//public interface DataIMapper extends InfluxDbBaseMapper<DataI> {
+//
+//
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataInharmVMapper.java

@@ -0,0 +1,17 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//
+//import com.njcn.dataProcess.po.influx.DataInharmV;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//
+///**
+// * <p>
+// *  Mapper 接口
+// * </p>
+// *
+// * @author hongawen
+// * @since 2023-12-28
+// */
+//public interface DataInharmVMapper extends InfluxDbBaseMapper<DataInharmV> {
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataPltMapper.java

@@ -0,0 +1,17 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//
+//import com.njcn.dataProcess.po.influx.DataPlt;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//
+///**
+// * <p>
+// *  Mapper 接口
+// * </p>
+// *
+// * @author hongawen
+// * @since 2023-12-28
+// */
+//public interface DataPltMapper extends InfluxDbBaseMapper<DataPlt> {
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/influxdb/DataVMapper.java

@@ -0,0 +1,27 @@
+//package com.njcn.harmonic.mapper.influxdb;
+//
+//import com.njcn.dataProcess.dto.LineDataVFiveItemDTO;
+//import com.njcn.dataProcess.dto.MeasurementCountDTO;
+//import com.njcn.dataProcess.po.influx.DataV;
+//import com.njcn.influx.base.InfluxDbBaseMapper;
+//import com.njcn.influx.query.InfluxQueryWrapper;
+//
+//import java.util.List;
+//
+///**
+// * @author hongawen
+// * @version 1.0
+// * @data 2024/11/7 18:49
+// */
+//public interface DataVMapper extends InfluxDbBaseMapper<DataV> {
+//
+//
+//    List<LineDataVFiveItemDTO> queryDataValue(InfluxQueryWrapper dataVQueryWrapper);
+//
+//
+//    List<MeasurementCountDTO> getMeasurementCount(InfluxQueryWrapper influxQueryWrapper);
+//
+//
+//
+//
+//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IRMpTargetWarnDService.java

@@ -20,4 +20,6 @@ public interface IRMpTargetWarnDService extends IService<RMpTargetWarnDPO> {
 
 
     GridDiagramVO getSubLineGiveAnAlarm(StatSubstationBizBaseParam param);
+
+    GridDiagramVO getAreaObjAlarm(StatSubstationBizBaseParam param);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IRStatLimitRateDetailDService.java

@@ -2,6 +2,8 @@ package com.njcn.harmonic.service;
 
 import cn.hutool.json.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailTimeDto;
 import com.njcn.harmonic.pojo.param.LimitCalendarQueryParam;
 import com.njcn.harmonic.pojo.param.LimitExtentDayQueryParam;
 import com.njcn.harmonic.pojo.param.LimitExtentQueryParam;
@@ -27,4 +29,12 @@ public interface IRStatLimitRateDetailDService extends IService<RStatLimitRateDe
     List<LimitProbabilityVO> limitProbabilityData(LimitProbabilityQueryParam param);
 
     List<LimitTimeProbabilityVO> limitTimeProbabilityData(LimitProbabilityQueryParam param);
+
+    /**
+     * 稳态超标时间
+     * @param lineParam
+     * @return
+     */
+    List<DataLimitRateDetailTimeDto> getLimitRateDetailTime(LineCountEvaluateParam lineParam);
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java

@@ -10,7 +10,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSONArray;
-import com.njcn.dataProcess.api.*;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.*;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -18,11 +17,11 @@ import com.njcn.device.pq.api.OverLimitClient;
 import com.njcn.harmonic.constant.Param;
 import com.njcn.harmonic.pojo.param.PowerStatisticsParam;
 import com.njcn.harmonic.pojo.vo.*;
+import com.njcn.harmonic.service.IRStatLimitRateDetailDService;
 import com.njcn.harmonic.service.activepowerrange.PowerStatisticsService;
 import com.njcn.harmonic.service.activepowerrange.RActivePowerRangeService;
-import com.njcn.influx.service.CommonService;
+import com.njcn.harmonic.service.influxdb.*;
 import com.njcn.poi.util.PoiUtil;
-import com.njcn.system.api.EpdFeignClient;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
@@ -54,14 +53,14 @@ import java.util.stream.Collectors;
 public class PowerStatisticsServiceImpl implements PowerStatisticsService {
 
     private final RActivePowerRangeService rActivePowerRangeService;
+    private final IRStatLimitRateDetailDService irStatLimitRateDetailDService;
     private final DecimalFormat dftwo = new DecimalFormat(Param.DECIMAL_FORMATTWOSTR);
-    private final DataVFeignClient dataVFeignClient;
-    private final DataIFeignClient dataIFeignClient;
-    private final DataPltFeignClient dataPltFeignClient;
-    private final DataInharmVFeignClient dataInharmVFeignClient;
-    private final DataHarmRateVFeignClient dataHarmRateVFeignClient;
+    private final IDataV dataV;
+    private final IDataI dataI;
+    private final IDataPlt dataPlt;
+    private final IDataInHarmV dataInHarmV;
+    private final IDataHarmRateV dataHarmRateV;
     private final OverLimitClient overLimitClient;
-    private final DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient;
 
     private List<String> times = Arrays.asList("0~10%", "10~20%", "20~30%", "30~40%", "40~50%", "50~60%", "60~70%", "70~80%", "80~90%", "90~100%");
 
@@ -111,7 +110,9 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
             lineCountEvaluateParam.setStartTime(powerStatisticsParam.getSearchBeginTime());
             lineCountEvaluateParam.setEndTime(powerStatisticsParam.getSearchEndTime());
             //获取超标数据
-            List<DataLimitRateDetailTimeDto> dtoList = dataLimitRateDetailFeignClient.getLimitRateDetailTimeList(lineCountEvaluateParam).getData();
+
+
+            List<DataLimitRateDetailTimeDto> dtoList = irStatLimitRateDetailDService.getLimitRateDetailTime(lineCountEvaluateParam);
             Map<String, DataLimitRateDetailTimeDto> timeDateMap = dtoList.stream().collect(Collectors.toMap(x -> x.getTime(), Function.identity()));
             List<String> timeId = rActivePowerRangePO.getTimeId();
             String times = reflexObjValue(rActivePowerRangePO, "minsTime" + powerStatisticsParam.getField()).toString().replace("null", "");
@@ -155,11 +156,11 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
         String time = param.getSearchBeginTime();
         if ("1".equals(param.getStatisticalId())) {
             //电压数据
-            List<DataVDto> dataVAllTime = dataVFeignClient.getRawData(evaluateParam).getData();
+            List<DataVDto> dataVAllTime = dataV.getRawData(evaluateParam);
             //闪变数据
-            List<DataPltDto> dataFlickerAllTime = dataPltFeignClient.getRawData(evaluateParam).getData();
+            List<DataPltDto> dataFlickerAllTime = dataPlt.getRawData(evaluateParam);
             //电流数据
-            List<DataIDto> dataIList = dataIFeignClient.getRawData(evaluateParam).getData();
+            List<DataIDto> dataIList = dataI.getRawData(evaluateParam);
             //电压偏差
             if ("Dev".equals(param.getCode()) || StrUtil.isBlank(param.getCode())) {
                 addThdData(info, overlimit.getVoltageDev(), "vuDev", dataVAllTime, "电压上偏差","%",time);
@@ -189,17 +190,17 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
         }
         if ("2".equals(param.getStatisticalId())) {
             //谐波数据
-            List<DataHarmDto> dataVHarmList = dataHarmRateVFeignClient.getRawData(evaluateParam).getData();
+            List<DataHarmDto> dataVHarmList = dataHarmRateV.getRawData(evaluateParam);
             addThdData(info, overlimit, "getUharm", "v", 2, 26, dataVHarmList, "谐波电压","%",time);
         }
         if ("3".equals(param.getStatisticalId())) {
             //电流数据
-            List<DataIDto> dataIList = dataIFeignClient.getRawData(evaluateParam).getData();
+            List<DataIDto> dataIList = dataI.getRawData(evaluateParam);
             addThdData(info, overlimit, "getUharm", "i", 2, 26, dataIList, "谐波电流","A",time);
         }
         if ("4".equals(param.getStatisticalId())) {
             //间谐波数据
-            List<DataHarmDto> dataVInHarmList = dataInharmVFeignClient.getRawData(evaluateParam).getData();
+            List<DataHarmDto> dataVInHarmList = dataInHarmV.getRawData(evaluateParam);
             addThdData(info, overlimit, "getInuharm", "v", 1, 17, dataVInHarmList, "间谐波电压","%",time);
         }
         return info;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java

@@ -68,8 +68,6 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
 
         String systemType = commTerminalGeneralClient.isPqOrPms().getData();
         if (systemType.equals("pq")) {
-
-
             List<UserLedgerVO> userLedgerVOList = userLedgerFeignClient.selectUserList(new UserReportParam()).getData();
             Map<String, UserLedgerVO> userLedgerVOMap = userLedgerVOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
 
@@ -158,8 +156,8 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
                     comAssessVOList.add(comAssessVO);
                 }
             }
-            List<ComAssessVO> list = comAssessVOList.stream().sorted(Comparator.comparing(ComAssessVO::getData).reversed()).collect(Collectors.toList());
-            return list;
+          //  List<ComAssessVO> list = comAssessVOList.stream().sorted(Comparator.comparing(ComAssessVO::getData).reversed()).collect(Collectors.toList());
+            return comAssessVOList;
         } else {
             DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(), DicDataTypeEnum.LINE_STATE.getCode()).getData();
             PmsDeviceInfoParam param = new PmsDeviceInfoParam();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java

@@ -577,7 +577,7 @@ public class GridServiceImpl implements IGridService {
                         //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点
                         long allNum = list2.stream().filter(o -> o.getAllOvertime() > 0 || o.getFlickerAllTime() > 0 ).count();
                         detail.setOverNum((int) allNum);
-                        detail.setOverRatio(PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum()));
+                        detail.setOverRatio(detail.getOnlineNum() == 0 ? 0 : PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum()));
                         //筛选出电压偏差超标监测点
                         long num1 = list2.stream().filter(o -> o.getFreqDevOvertime() > 0).count();
                         Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFreqDevOvertime)).get().getFreqDevOvertime();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java

@@ -329,7 +329,8 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                 DictData dictData = dicDataFeignClient.getDicDataById(lineDetailDataVO.getVoltageLevel()).getData();
                 float voltageLevel = Float.parseFloat(dictData.getValue());
                 float shortVal = COverlimitUtil.getDlCapByVoltageLevel(voltageLevel);
-                overlimit = COverlimitUtil.globalAssemble(voltageLevel, 10f, 10f, shortVal, 1, 1);
+                float devVal = COverlimitUtil.getDefaultDevCapacity(voltageLevel);
+                overlimit = COverlimitUtil.globalAssemble(voltageLevel, devVal, devVal, shortVal, 1, 0);
             }
 
             //组装sql语句

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -340,11 +340,11 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                 list.add(pollutionVO);
             }
         }
-        if (!CollectionUtils.isEmpty(list)) {
+      /*  if (!CollectionUtils.isEmpty(list)) {
             List<PollutionVO> listSort = list.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
             listSort.addAll(list.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
             return listSort;
-        }
+        }*/
         return list;
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java

@@ -2,10 +2,10 @@ package com.njcn.harmonic.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
-import com.njcn.device.biz.pojo.dto.SubGetBase;
+import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.pq.api.LineIntegrityClient;
 import com.njcn.device.pq.pojo.po.RStatIntegrityD;
@@ -124,6 +124,82 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
         return gridDiagramVO;
     }
 
+
+    @Override
+    public GridDiagramVO getAreaObjAlarm(StatSubstationBizBaseParam param) {
+        //获取电压等级
+        List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
+
+        List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
+        List<String> voltageIds;
+        //获取电压等级550 220 110 35
+        if(CollUtil.isNotEmpty(v)){
+            List<String> vName = v.stream().map(DictData::getName).collect(Collectors.toList());
+            voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
+        }else{
+            voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
+        }
+        GridDiagramVO gridDiagramVO = new GridDiagramVO();
+        List<GridDiagramVO.LineStatistics> info = new ArrayList<>();
+        List<GridDiagramVO.LineStatistics> gwInfo = new ArrayList<>();
+
+        //获取部门数据关系
+        List<Dept> data = deptFeignClient.getDirectSonSelf(param.getId()).getData();
+        DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
+        deptGetLineParam.setDeptId(param.getId());
+        deptGetLineParam.setMonitorStateRunning(false);
+        List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
+
+        Map<String,DeptGetChildrenMoreDTO> listMap = deptGetChildrenMoreDTOS.stream().collect(Collectors.toMap(DeptGetChildrenMoreDTO::getUnitId,Function.identity()));
+
+        GridDiagramVO.LineStatistics lineStatistics;
+        GridDiagramVO.LineStatistics gwLineStatistics;
+        for (Dept datum : data) {
+            if (listMap.containsKey(datum.getId())) {
+                lineStatistics = new GridDiagramVO.LineStatistics();
+                lineStatistics.setOrgId(datum.getId());
+                lineStatistics.setOrgName(datum.getName());
+                gwLineStatistics = new GridDiagramVO.LineStatistics();
+                gwLineStatistics.setOrgId(datum.getId());
+                gwLineStatistics.setOrgName(datum.getName());
+                List<LineDevGetDTO> baseList = listMap.get(datum.getId()).getLineBaseList().stream().filter(it->StrUtil.isNotBlank(it.getObjId())).collect(Collectors.toList());
+                Map<String,List<LineDevGetDTO>> voltageMonitorMap = baseList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getVoltageLevel));
+                List<GridDiagramVO.StatisticsData> statisticsData = new ArrayList<>();
+                List<GridDiagramVO.StatisticsData> gwStatisticsData = new ArrayList<>();
+
+                List<String> idsList = new ArrayList<>();
+                int allNum = 0;
+                for(String voltage:voltageIds){
+                    GridDiagramVO.StatisticsData voltageItem = new GridDiagramVO.StatisticsData();
+                    voltageItem.setColumnName(voltage);
+                    if(voltageMonitorMap.containsKey(voltage)){
+                       List<String> ids = voltageMonitorMap.get(voltage).stream().map(LineDevGetDTO::getObjId).distinct().collect(Collectors.toList());
+                        voltageItem.setNumOne((long)ids.size());
+                        allNum+=ids.size();
+                        idsList.addAll(ids);
+                        voltageItem.setNumOneList(ids);
+                    }else {
+                        voltageItem.setNumOne(0L);
+                        voltageItem.setNumOneList(new ArrayList<>());
+                    }
+                    statisticsData.add(voltageItem);
+                }
+                GridDiagramVO.StatisticsData dataSum = new GridDiagramVO.StatisticsData();
+                dataSum.setNumOneList(idsList);
+                dataSum.setNumOne((long)allNum);
+                statisticsData.add(dataSum);
+                lineStatistics.setData(statisticsData);
+                gwLineStatistics.setData(gwStatisticsData);
+
+                info.add(lineStatistics);
+                gwInfo.add(gwLineStatistics);
+            }
+        }
+        gridDiagramVO.setInfo(info);
+        gridDiagramVO.setGwInfo(gwInfo);
+        return gridDiagramVO;
+    }
+
     private void getSubStationStatisticsData(List<GridDiagramVO.StatisticsData> statisticsData,
                                              List<GridDiagramVO.StatisticsData> gwStatisticsData,
                                              List<SubGetBase> subBaseList,

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLimitRateDServiceImpl.java

@@ -186,12 +186,12 @@ public class RStatLimitRateDServiceImpl extends ServiceImpl<RStatLimitRateDMappe
             mainLineVO.setLineId(lineId);
             if (linePO != null) {
                 mainLineVO.setLineName(linePO.getName());
-                if (linePO.getGovern().equals(0)) {
-                    mainLineVO.setGovern("未治理");
-                }
-                if (linePO.getGovern().equals(1)) {
-                    mainLineVO.setGovern("已治理");
-                }
+//                if (linePO.getGovern().equals(0)) {
+//                    mainLineVO.setGovern("未治理");
+//                }
+//                if (linePO.getGovern().equals(1)) {
+//                    mainLineVO.setGovern("已治理");
+//                }
                 mainLineVO.setObjType(linePO.getMonitorObj());
                 DictData dictData = dicDataFeignClient.getDicDataById(linePO.getMonitorObj()).getData();
                 if (dictData != null) {

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLimitRateDetailDServiceImpl.java

@@ -1,18 +1,23 @@
 package com.njcn.harmonic.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.AbnormalData;
+import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailTimeDto;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.pq.api.OverLimitClient;
 import com.njcn.harmonic.pojo.param.LimitCalendarQueryParam;
@@ -30,10 +35,13 @@ import com.njcn.harmonic.service.IRStatLimitRateDetailDService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -381,6 +389,76 @@ public class RStatLimitRateDetailDServiceImpl extends ServiceImpl<RStatLimitRate
         return result;
     }
 
+
+
+    @Override
+    public List<DataLimitRateDetailTimeDto> getLimitRateDetailTime(LineCountEvaluateParam lineParam) {
+        List<DataLimitRateDetailTimeDto> info = new ArrayList<>();
+        LambdaQueryWrapper<RStatLimitRateDetailDPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()), RStatLimitRateDetailDPO::getLineId, lineParam.getLineId())
+                .between(RStatLimitRateDetailDPO::getTime, lineParam.getStartTime(),lineParam.getEndTime())
+        // .le(RStatLimitRateDetailDPO::getTime, )
+        // .orderByAsc(RStatLimitRateDetailDPO::getTime)
+        ;
+
+        List<RStatLimitRateDetailDPO> list = this.list(lambdaQueryWrapper);
+        DataLimitRateDetailTimeDto dto;
+        for (RStatLimitRateDetailDPO detailD : list) {
+            dto = new DataLimitRateDetailTimeDto();
+            dto.setLineId(detailD.getLineId());
+            dto.setTime(detailD.getTime().format((DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))));
+            dto.setFlickerOvertime(toList(detailD.getFlickerOvertime()));
+            dto.setFreqDevOvertime(toList(detailD.getFreqDevOvertime()));
+            dto.setVoltageDevOvertime(toList(detailD.getVoltageDevOvertime()));
+            dto.setUbalanceOvertime(toList(detailD.getUbalanceOvertime()));
+            dto.setUaberranceOvertime(toList(detailD.getUaberranceOvertime()));
+            dto.setINegOvertime(toList(detailD.getINegOvertime()));
+            dto.setUharmOvertime(toList(detailD,2,25,"getUharm"));
+            dto.setIharmOvertime(toList(detailD,2,25,"getIharm"));
+            dto.setInuharmOvertime(toList(detailD,1,16,"getInuharm"));
+            info.add(dto);
+        }
+        return info;
+    }
+
+    private List<String> toList(RStatLimitRateDetailDPO detailD,Integer start, Integer end, String targetName){
+        List<AbnormalData.Json> json = new ArrayList<>();
+        for (int i = start; i <= end; i++) {
+            // 构造方法名
+            String methodName = targetName + i + "Overtime";
+            try {
+                // 获取 DataHarmDto 类的 getVx 方法
+                Method getVMethod = RStatLimitRateDetailDPO.class.getMethod(methodName);
+                String value = (String) getVMethod.invoke(detailD);
+                if(StrUtil.isNotBlank(value)){
+                    json.addAll(JSON.parseArray(value, AbnormalData.Json.class));
+                }
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            } catch (NoSuchMethodException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return getString(json);
+    }
+
+    private List<String> toList(String json){
+        List<AbnormalData.Json> jsons = JSON.parseArray(json, AbnormalData.Json.class);
+        return getString(jsons);
+    }
+
+    private List<String> getString(List<AbnormalData.Json> jsons) {
+        if (CollUtil.isNotEmpty(jsons)){
+            List<String> times = jsons.stream().map(AbnormalData.Json::getTime).collect(Collectors.toList());
+            String join = String.join(",", times);
+            String[] split = join.split(",");
+            return Arrays.stream(split).distinct().collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
     /**
      * 设置LimitExtentVO的最大值和相关信息
      */

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java

@@ -25,6 +25,8 @@ import com.njcn.harmonic.utils.PubUtils;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -38,7 +40,7 @@ import java.util.stream.Collectors;
  * @Description: <描述>
  */
 @Service
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class SteadyQualifyServiceImpl implements SteadyQualifyService {
 
     private final GeneralDeviceInfoClient generalDeviceInfoClient;
@@ -51,6 +53,13 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
 
     private final LineFeignClient lineFeignClient;
 
+    /**
+     *
+     */
+    @Value("${version.used:master}")
+    private String versionUsed;
+
+
     @Override
     public List<SteadyQualifyVO> getSteadyQualifyData(DeviceInfoParam.BusinessParam steadyParam) {
         List<SteadyQualifyVO> steadyQualifyList = new ArrayList<>();
@@ -304,8 +313,13 @@ public class SteadyQualifyServiceImpl implements SteadyQualifyService {
         //供电公司集合
         List<SteadyQualifyVO> powerCompanyList = steadyQualifyMapper.getLineInfoByList(generalDeviceDTO.getGdIndexes());
         dealChildrenData(substationList, otherLineList, temMap, true);
-        dealChildrenData(powerCompanyList, substationList, temMap, false);
-        return powerCompanyList;
+
+        if("liaoning".equals(versionUsed)){
+            return substationList;
+        }else {
+            dealChildrenData(powerCompanyList, substationList, temMap, false);
+            return powerCompanyList;
+        }
     }
 
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java

@@ -29,7 +29,9 @@ import com.njcn.harmonic.utils.PubUtils;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -44,7 +46,7 @@ import java.util.stream.Collectors;
  * @Description: <描述>
  */
 @Service
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class THDistortionServiceImpl implements THDistortionService {
 
     private final GeneralInfo generalInfo;
@@ -53,6 +55,11 @@ public class THDistortionServiceImpl implements THDistortionService {
     private final RMpVThdMapper rMpVThdMapper;
     private final LineFeignClient lineFeignClient;
     private final UserLedgerFeignClient userLedgerFeignClient;
+    /**
+     *
+     */
+    @Value("${version.used:master}")
+    private String versionUsed;
 
     @Override
     public List<THDistortionVO> getTHDistortionData(DeviceInfoParam.BusinessParam thDistortionParam, Integer nodeType) {
@@ -83,15 +90,14 @@ public class THDistortionServiceImpl implements THDistortionService {
             //组装父级数据树
             List<THDistortionVO> treeList = getTreeData(lineIndexes, condition, userLedgerVOMap, thDistortionParam.getPowerFlag());
             thDistortionVO.setChildren(treeList);
-
             thDistortionVOS.add(thDistortionVO);
         }
         if (nodeType == 1) {
-            thDistortionVOS.stream().forEach(data -> {
+            thDistortionVOS.forEach(data -> {
                 if (CollUtil.isNotEmpty(data.getChildren())) {
                     //市
                     List<THDistortionVO> sub = data.getChildren().stream().flatMap(dto -> dto.getChildren().stream()).collect(Collectors.toList());
-                    sub.stream().forEach(x -> {
+                    sub.forEach(x -> {
                         x.setChildren(new ArrayList<>());
                     });
                     data.setChildren(sub);
@@ -117,7 +123,7 @@ public class THDistortionServiceImpl implements THDistortionService {
 //                    continue;
 //                }
 //                type.add(thDistortionVO.getName() + "\n(" + seekLineNum(thDistortionVO) + ")");
-                type.add(thDistortionVO.getName() );
+                type.add(thDistortionVO.getName());
 //                List<PublicDTO> condition = getCondition(lineIndexes, thDistortionCensusParam.getSearchBeginTime(), thDistortionCensusParam.getSearchEndTime());
                 single.add(thDistortionVO.getDistortion());
             }
@@ -359,17 +365,20 @@ public class THDistortionServiceImpl implements THDistortionService {
         //List<THDistortionVO> deviceList = thDistortionMapper.getLineInfoByList(busBarList.stream().map(THDistortionVO::getPid).distinct().collect(Collectors.toList()));
         //变电站集合
         List<THDistortionVO> substationList = thDistortionMapper.getLineInfoByList(monitorList.stream().map(it -> it.getPidS().split(StrUtil.COMMA)[LineBaseEnum.SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList()));
-        //供电公司集合
-        List<THDistortionVO> powerCompanyList = thDistortionMapper.getLineInfoByList(monitorList.stream().map(it -> it.getPidS().split(StrUtil.COMMA)[LineBaseEnum.GD_LEVEL.getCode()]).distinct().collect(Collectors.toList()));
-
         if (!CollectionUtils.isEmpty(monitorList)) {
             setChildesList(substationList, powerLedgerList, userTemList);
             setFatherDistortion(substationList);
-            powerCompanyList = powerCompanyList.stream().peek(item -> item.setChildren(getChildCategoryList(item, substationList))).collect(Collectors.toList());
-//            setFatherDistortion(powerCompanyList);
-            setPowerDistortion(powerCompanyList);
+            if ("liaoning".equals(versionUsed)) {
+                return substationList;
+            } else {
+                //供电公司集合
+                List<THDistortionVO> powerCompanyList = thDistortionMapper.getLineInfoByList(monitorList.stream().map(it -> it.getPidS().split(StrUtil.COMMA)[LineBaseEnum.GD_LEVEL.getCode()]).distinct().collect(Collectors.toList()));
+                powerCompanyList = powerCompanyList.stream().peek(item -> item.setChildren(getChildCategoryList(item, substationList))).collect(Collectors.toList());
+                setPowerDistortion(powerCompanyList);
+                return powerCompanyList;
+            }
         }
-        return powerCompanyList;
+        return new ArrayList<>();
     }
 
     /**

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/IDataHarmRateV.java

@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service.influxdb;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.dto.DataHarmrateVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto;
+import com.njcn.dataProcess.pojo.po.RStatDataHarmRateVD;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+public interface IDataHarmRateV {
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     * @return
+     */
+    List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam);
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/IDataI.java

@@ -0,0 +1,26 @@
+package com.njcn.harmonic.service.influxdb;
+
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2024/11/18  11:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface IDataI {
+
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     * @return
+     */
+    List<DataIDto> getRawData(LineCountEvaluateParam lineParam);
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/IDataInHarmV.java

@@ -0,0 +1,32 @@
+package com.njcn.harmonic.service.influxdb;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.dto.DataInharmVDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.dataProcess.pojo.dto.DataInHarmVDto;
+import com.njcn.dataProcess.pojo.dto.DataVDto;
+import com.njcn.dataProcess.pojo.po.RStatDataInHarmVD;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2024/11/18  13:27【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface IDataInHarmV {
+
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     * @return
+     */
+    List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam);
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/IDataPlt.java

@@ -0,0 +1,31 @@
+package com.njcn.harmonic.service.influxdb;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.dto.DataPltDTO;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
+import com.njcn.dataProcess.pojo.dto.DataPltDto;
+import com.njcn.dataProcess.pojo.dto.DataVDto;
+import com.njcn.dataProcess.pojo.po.RStatDataPltD;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2024/11/18  11:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface IDataPlt {
+
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     * @return
+     */
+    List<DataPltDto> getRawData(LineCountEvaluateParam lineParam);
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/IDataV.java

@@ -0,0 +1,24 @@
+package com.njcn.harmonic.service.influxdb;
+
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataVDto;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/7 10:54
+ */
+public interface IDataV {
+
+
+    /**
+     * 获取原始数据
+     * @param lineParam
+     * @return
+     */
+    List<DataVDto> getRawData(LineCountEvaluateParam lineParam);
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/impl/InfluxdbDataHarmRateVImpl.java

@@ -0,0 +1,159 @@
+package com.njcn.harmonic.service.influxdb.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.njcn.common.utils.HarmonicTimesUtil;
+
+
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.harmonic.service.influxdb.IDataHarmRateV;
+import com.njcn.influx.constant.InfluxDbSqlConstant;
+import com.njcn.influx.imapper.DataHarmRateVMapper;
+import com.njcn.influx.pojo.po.DataHarmRateV;
+import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Type;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author xy
+ */
+@Service
+@RequiredArgsConstructor
+public class InfluxdbDataHarmRateVImpl implements IDataHarmRateV {
+    private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+    private final DataHarmRateVMapper DataHarmRateVMapper;
+    private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
+        put("AB", "A");
+        put("BC", "B");
+        put("CA", "C");
+        put("M", "T");
+    }};
+
+    private final RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
+
+    @Override
+    public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataHarmDto> result = new ArrayList<>();
+        List<DataHarmRateV> list = getMinuteData(lineParam);
+        list.forEach(item->{
+            DataHarmDto dto = new DataHarmDto();
+            BeanUtils.copyProperties(item,dto);
+            dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
+            result.add(dto);
+        });
+        return result;
+    }
+
+
+
+    /**
+     * 按监测点集合、时间条件获取分钟数据
+     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
+     * 需要进行剔除异常数据时,这里会有三种情况判断
+     * 1.无异常数据，则直接返回集合；
+     * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
+     * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
+     */
+    public List<DataHarmRateV> getMinuteData(LineCountEvaluateParam lineParam) {
+        List<DataHarmRateV> dataList;
+        List<DataHarmRateV> result = new ArrayList<>();
+        List<DataHarmRateV> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class);
+        influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.regular(DataHarmRateV::getLineId, lineParam.getLineId())
+                .select(DataHarmRateV::getLineId)
+                .select(DataHarmRateV::getPhaseType)
+                .select(DataHarmRateV::getValueType)
+                .select(DataHarmRateV::getQualityFlag)
+                .select(DataHarmRateV::getAbnormalFlag)
+                .between(DataHarmRateV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
+                .eq(DataHarmRateV::getQualityFlag,"0");
+        if(CollUtil.isNotEmpty(lineParam.getPhasicType())){
+            influxQueryWrapper.regular(DataHarmRateV::getPhaseType,lineParam.getPhasicType());
+        }
+        List<DataHarmRateV> list = DataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            //过滤掉暂态事件影响的数据 true过滤 false不过滤
+            if (lineParam.getDataType()) {
+                dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList());
+            } else {
+                dataList = list;
+            }
+            Map<String,List<DataHarmRateV>> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmRateV::getLineId));
+            //有异常数据
+            if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) {
+                lineMap.forEach((k,v)->{
+                    List<String> timeList = lineParam.getAbnormalTime().get(k);
+                    //有异常数据,当前监测点自身的异常数据
+                    if (CollectionUtil.isNotEmpty(timeList)) {
+                        List<DataHarmRateV> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
+                        //1.过滤掉异常数据后还有正常数据，则用正常数据计算
+                        if (CollectionUtil.isNotEmpty(filterList)) {
+                            result.addAll(filterList);
+                        }
+                        //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
+                        else {
+                            v.parallelStream().forEach(item -> item.setQualityFlag("1"));
+                            result.addAll(v);
+                        }
+                    }
+                    //没有异常数据，则使用原数据
+                    else {
+                        result.addAll(v);
+                    }
+                });
+            }
+            //没有异常数据，则使用原数据
+            else {
+                result.addAll(dataList);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataHarmRateV>> lineMap = result.stream().collect(Collectors.groupingBy(DataHarmRateV::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataHarmRateV> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhaseType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
+                    String newType = PHASE_MAPPING.get(item.getPhaseType());
+                    if (newType != null) {
+                        item.setPhaseType(newType);
+                    }
+                });
+            }
+        }
+        return data;
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/impl/InfluxdbDataIImpl.java

@@ -0,0 +1,135 @@
+package com.njcn.harmonic.service.influxdb.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.utils.HarmonicTimesUtil;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataIDto;
+import com.njcn.harmonic.service.influxdb.IDataI;
+import com.njcn.influx.constant.InfluxDbSqlConstant;
+import com.njcn.influx.imapper.DataIMapper;
+import com.njcn.influx.pojo.po.DataI;
+import com.njcn.influx.query.InfluxQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author wr
+ * @description
+ * @date 2026/7/1 10:49
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class InfluxdbDataIImpl implements IDataI {
+    private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+
+    private final DataIMapper dataIMapper;
+
+    private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
+        put("AB", "A");
+        put("BC", "B");
+        put("CA", "C");
+        put("M", "T");
+    }};
+
+    @Override
+    public List<DataIDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataIDto> result = new ArrayList<>();
+        List<DataI> list = getMinuteDataI(lineParam);;
+        list.forEach(item->{
+            DataIDto dto = new DataIDto();
+            BeanUtils.copyProperties(item,dto);
+            dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
+            result.add(dto);
+        });
+        return result;
+    }
+
+    /**
+     * 按监测点集合、时间条件获取dataI分钟数据
+     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
+     * 需要进行剔除异常数据时,这里会有三种情况判断
+     * 1.无异常数据，则直接返回集合；
+     * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
+     * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
+     */
+    public List<DataI> getMinuteDataI(LineCountEvaluateParam lineParam) {
+        List<DataI> dataList;
+        List<DataI> result = new ArrayList<>();
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
+        influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.regular(DataI::getLineId, lineParam.getLineId())
+                .select(DataI::getLineId)
+                .select(DataI::getPhaseType)
+                .select(DataI::getValueType)
+                .select(DataI::getINeg)
+                .select(DataI::getIPos)
+                .select(DataI::getIThd)
+                .select(DataI::getIUnbalance)
+                .select(DataI::getIZero)
+                .select(DataI::getRms)
+                .select(DataI::getQualityFlag)
+                .select(DataI::getAbnormalFlag)
+                .between(DataI::getTime, lineParam.getStartTime(), lineParam.getEndTime())
+                .eq(DataI::getQualityFlag,"0");
+        if(CollUtil.isNotEmpty(lineParam.getPhasicType())){
+            influxQueryWrapper.regular(DataI::getPhaseType,lineParam.getPhasicType());
+        }
+
+        List<DataI> list = dataIMapper.selectByQueryWrapper(influxQueryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            //过滤掉暂态事件影响的数据 true过滤 false不过滤
+            if (lineParam.getDataType()) {
+                dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList());
+            } else {
+                dataList = list;
+            }
+            Map<String,List<DataI>> lineMap = dataList.stream().collect(Collectors.groupingBy(DataI::getLineId));
+            //有异常数据
+            if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) {
+                lineMap.forEach((k,v)->{
+                    List<String> timeList = lineParam.getAbnormalTime().get(k);
+                    //有异常数据,当前监测点自身的异常数据
+                    if (CollectionUtil.isNotEmpty(timeList)) {
+                        List<DataI> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
+                        //1.过滤掉异常数据后还有正常数据，则用正常数据计算
+                        if (CollectionUtil.isNotEmpty(filterList)) {
+                            result.addAll(filterList);
+                        }
+                        //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
+                        else {
+                            v.parallelStream().forEach(item -> item.setQualityFlag("1"));
+                            result.addAll(v);
+                        }
+                    }
+                    //没有异常数据，则使用原数据
+                    else {
+                        result.addAll(v);
+                    }
+                });
+            }
+            //没有异常数据，则使用原数据
+            else {
+                result.addAll(dataList);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhaseType());
+                if (newType != null) {
+                    item.setPhaseType(newType);
+                }
+            });
+        }
+        return result;
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/impl/InfluxdbDataInharmVImpl.java

@@ -0,0 +1,132 @@
+package com.njcn.harmonic.service.influxdb.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.utils.HarmonicTimesUtil;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataHarmDto;
+import com.njcn.harmonic.service.influxdb.IDataInHarmV;
+import com.njcn.influx.constant.InfluxDbSqlConstant;
+import com.njcn.influx.imapper.DataInHarmVMapper;
+import com.njcn.influx.pojo.po.DataInHarmV;
+import com.njcn.influx.query.InfluxQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * Description:
+ * Date: 2024/11/18  14:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class InfluxdbDataInharmVImpl  implements IDataInHarmV {
+
+    private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+    private final DataInHarmVMapper DataInHarmVMapper;
+
+    private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
+        put("AB", "A");
+        put("BC", "B");
+        put("CA", "C");
+        put("M", "T");
+    }};
+
+
+
+    @Override
+    public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataHarmDto> result = new ArrayList<>();
+        List<DataInHarmV> list = getMinuteData(lineParam);
+        list.forEach(item->{
+            DataHarmDto dto = new DataHarmDto();
+            BeanUtils.copyProperties(item,dto);
+            dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
+            result.add(dto);
+        });
+        return result;
+    }
+
+
+
+    /**
+     * 按监测点集合、时间条件获取dataI分钟数据
+     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
+     * 需要进行剔除异常数据时,这里会有三种情况判断
+     * 1.无异常数据，则直接返回集合；
+     * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
+     * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
+     */
+    public List<DataInHarmV> getMinuteData(LineCountEvaluateParam lineParam) {
+        List<DataInHarmV> dataList;
+        List<DataInHarmV> result = new ArrayList<>();
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInHarmV.class);
+        influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.regular(DataInHarmV::getLineId, lineParam.getLineId())
+                .select(DataInHarmV::getLineId)
+                .select(DataInHarmV::getPhaseType)
+                .select(DataInHarmV::getValueType)
+                .select(DataInHarmV::getQualityFlag)
+                .select(DataInHarmV::getAbnormalFlag)
+                .between(DataInHarmV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
+                .eq(DataInHarmV::getQualityFlag,"0");
+        if(CollUtil.isNotEmpty(lineParam.getPhasicType())){
+            influxQueryWrapper.regular(DataInHarmV::getPhaseType,lineParam.getPhasicType());
+        }
+        List<DataInHarmV> list = DataInHarmVMapper.selectByQueryWrapper(influxQueryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            //过滤掉暂态事件影响的数据 true过滤 false不过滤
+            if (lineParam.getDataType()) {
+                dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList());
+            } else {
+                dataList = list;
+            }
+            Map<String,List<DataInHarmV>> lineMap = dataList.stream().collect(Collectors.groupingBy(DataInHarmV::getLineId));
+            //有异常数据
+            if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) {
+                lineMap.forEach((k,v)->{
+                    List<String> timeList = lineParam.getAbnormalTime().get(k);
+                    //有异常数据,当前监测点自身的异常数据
+                    if (CollectionUtil.isNotEmpty(timeList)) {
+                        List<DataInHarmV> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
+                        //1.过滤掉异常数据后还有正常数据，则用正常数据计算
+                        if (CollectionUtil.isNotEmpty(filterList)) {
+                            result.addAll(filterList);
+                        }
+                        //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
+                        else {
+                            v.parallelStream().forEach(item -> item.setQualityFlag("1"));
+                            result.addAll(v);
+                        }
+                    }
+                    //没有异常数据，则使用原数据
+                    else {
+                        result.addAll(v);
+                    }
+                });
+            }
+            //没有异常数据，则使用原数据
+            else {
+                result.addAll(dataList);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhaseType());
+                if (newType != null) {
+                    item.setPhaseType(newType);
+                }
+            });
+        }
+        return result;
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/impl/InfluxdbDataPltImpl.java

@@ -0,0 +1,157 @@
+package com.njcn.harmonic.service.influxdb.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.influx.pojo.po.DataPlt;
+import com.njcn.dataProcess.pojo.dto.DataPltDto;
+import com.njcn.harmonic.service.influxdb.IDataPlt;
+import com.njcn.influx.imapper.DataPltMapper;
+import com.njcn.influx.pojo.po.DataV;
+import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Type;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ * Date: 2024/11/18  14:33【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class InfluxdbDataPltImpl  implements IDataPlt {
+
+    private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+    private final DataPltMapper dataPltMapper;
+    private final RedisUtil redisUtil;
+    private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
+        put("AB", "A");
+        put("BC", "B");
+        put("CA", "C");
+        put("M", "T");
+    }};
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
+
+    @Override
+    public List<DataPltDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataPltDto> result = new ArrayList<>();
+        List<DataPlt> list = getMinuteDataPlt(lineParam);
+        list.forEach(item->{
+            DataPltDto dto = new DataPltDto();
+            BeanUtils.copyProperties(item,dto);
+            dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
+            result.add(dto);
+        });
+        return result;
+    }
+    /**
+     * 按监测点集合、时间条件获取dataI分钟数据
+     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
+     * 需要进行剔除异常数据时,这里会有三种情况判断
+     * 1.无异常数据，则直接返回集合；
+     * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
+     * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
+     */
+    public List<DataPlt> getMinuteDataPlt(LineCountEvaluateParam lineParam) {
+        List<DataPlt> dataList;
+        List<DataPlt> result = new ArrayList<>();
+        List<DataPlt> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class);
+        influxQueryWrapper.regular(DataPlt::getLineId, lineParam.getLineId())
+                .select(DataPlt::getLineId)
+                .select(DataPlt::getPhaseType)
+                .select(DataPlt::getPlt)
+                .select(DataPlt::getQualityFlag)
+                .select(DataPlt::getAbnormalFlag)
+                .between(DataPlt::getTime, lineParam.getStartTime(), lineParam.getEndTime())
+                .eq(DataPlt::getQualityFlag,"0");
+        if(CollUtil.isNotEmpty(lineParam.getPhasicType())){
+            influxQueryWrapper.regular(DataV::getPhaseType,lineParam.getPhasicType());
+        }
+        List<DataPlt> list = dataPltMapper.selectByQueryWrapper(influxQueryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            //过滤掉暂态事件影响的数据 true过滤 false不过滤
+            if (lineParam.getDataType()) {
+                dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList());
+            } else {
+                dataList = list;
+            }
+            Map<String,List<DataPlt>> lineMap = dataList.stream().collect(Collectors.groupingBy(DataPlt::getLineId));
+            //有异常数据
+            if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) {
+                lineMap.forEach((k,v)->{
+                    List<String> timeList = lineParam.getAbnormalTime().get(k);
+                    //有异常数据,当前监测点自身的异常数据
+                    if (CollectionUtil.isNotEmpty(timeList)) {
+                        List<DataPlt> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
+                        //1.过滤掉异常数据后还有正常数据，则用正常数据计算
+                        if (CollectionUtil.isNotEmpty(filterList)) {
+                            result.addAll(filterList);
+                        }
+                        //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
+                        else {
+                            v.parallelStream().forEach(item -> item.setQualityFlag("1"));
+                            result.addAll(v);
+                        }
+                    }
+                    //没有异常数据，则使用原数据
+                    else {
+                        result.addAll(v);
+                    }
+                });
+            }
+            //没有异常数据，则使用原数据
+            else {
+                result.addAll(dataList);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataPlt>> lineMap = result.stream().collect(Collectors.groupingBy(DataPlt::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataPlt> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhaseType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
+                    String newType = PHASE_MAPPING.get(item.getPhaseType());
+                    if (newType != null) {
+                        item.setPhaseType(newType);
+                    }
+                });
+            }
+        }
+        return data;
+    }
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/influxdb/impl/InfluxdbDataVImpl.java

@@ -0,0 +1,221 @@
+package com.njcn.harmonic.service.influxdb.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.njcn.common.utils.HarmonicTimesUtil;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataVDto;
+import com.njcn.harmonic.service.influxdb.IDataV;
+import com.njcn.influx.constant.InfluxDbSqlConstant;
+import com.njcn.influx.imapper.DataVMapper;
+import com.njcn.influx.pojo.po.DataV;
+import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Type;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author wr
+ * @description
+ * @date 2026/7/1 10:49
+ */
+@Slf4j
+@Service
+public class InfluxdbDataVImpl   implements IDataV {
+
+    private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+    private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
+        put("AB", "A");
+        put("BC", "B");
+        put("CA", "C");
+        put("M", "T");
+    }};
+    @Resource
+    private DataVMapper dataVMapper;
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
+
+    @Override
+    public List<DataVDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataVDto> result = new ArrayList<>();
+        List<DataV> list = getMinuteDataV(lineParam);
+        if (CollectionUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                DataVDto dto = new DataVDto();
+                BeanUtils.copyProperties(item, dto);
+                dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
+                result.add(dto);
+            });
+        }
+        return result;
+    }
+
+    /**
+     * 按监测点集合、时间条件获取dataV分钟数据
+     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
+     * 剔除异常数据,这里会有三种情况判断
+     * 1.无异常数据，则直接返回集合；
+     * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
+     * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
+     */
+    public List<DataV> getMinuteDataV(LineCountEvaluateParam lineParam) {
+        List<DataV> result = new ArrayList<>();
+        List<DataV> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
+        influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.regular(DataV::getLineId, lineParam.getLineId())
+                .select(DataV::getLineId)
+                .select(DataV::getPhaseType)
+                .select(DataV::getValueType)
+                .select(DataV::getFreq)
+                .select(DataV::getFreqDev)
+                .select(DataV::getRms)
+                .select(DataV::getRmsLvr)
+                .select(DataV::getVNeg)
+                .select(DataV::getVPos)
+                .select(DataV::getVThd)
+                .select(DataV::getVUnbalance)
+                .select(DataV::getVZero)
+                .select(DataV::getVlDev)
+                .select(DataV::getVuDev)
+                .select(DataV::getQualityFlag)
+                .select(DataV::getAbnormalFlag)
+                .between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
+                .eq(DataV::getQualityFlag, "0");
+        if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
+            influxQueryWrapper.regular(DataV::getPhaseType, lineParam.getPhasicType());
+        }
+        quality(result, influxQueryWrapper, lineParam);
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataV>> lineMap = result.stream().collect(Collectors.groupingBy(DataV::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    //这边需要特殊处理下，将线电压数据赋值
+                    Map<String, DataV> lineVoltageIndex = v.stream()
+                            .filter(d -> PHASE_MAPPING.containsKey(d.getPhaseType()))
+                            .filter(d -> d.getRmsLvr() != null)
+                            .collect(Collectors.toMap(
+                                    d -> buildKey(d.getTime(), d.getValueType(), d.getPhaseType()),
+                                    Function.identity(),
+                                    (existing, replacement) -> existing
+                            ));
+                    v.stream()
+                            .filter(d -> PHASE_VOLTAGE_TYPES.contains(d.getPhaseType()))
+                            .forEach(phaseData -> {
+                                // 根据当前相电压反查对应的线电压相别
+                                String targetLinePhasic = getReverseLinePhasic(phaseData.getPhaseType());
+                                if (targetLinePhasic == null) {
+                                    return;
+                                }
+                                String key = buildKey(phaseData.getTime(), phaseData.getValueType(), targetLinePhasic);
+                                DataV matchedLineData = lineVoltageIndex.get(key);
+                                if (matchedLineData != null && matchedLineData.getRmsLvr() != null) {
+                                    phaseData.setRmsLvr(matchedLineData.getRmsLvr());
+                                }
+                            });
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataV> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhaseType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
+                    String newType = PHASE_MAPPING.get(item.getPhaseType());
+                    if (newType != null) {
+                        item.setPhaseType(newType);
+                    }
+                });
+            }
+        }
+        return data;
+    }
+    private void quality(List<DataV> result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) {
+        List<DataV> dataList;
+        List<DataV> list = dataVMapper.selectByQueryWrapper(influxQueryWrapper);
+        if (CollUtil.isNotEmpty(list)) {
+            //过滤掉暂态事件影响的数据 true过滤 false不过滤
+            if (lineParam.getDataType()) {
+                dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList());
+            } else {
+                dataList = list;
+            }
+            Map<String, List<DataV>> lineMap = dataList.stream().collect(Collectors.groupingBy(DataV::getLineId));
+            //有异常数据
+            Map<String, List<String>> timeMap = lineParam.getAbnormalTime();
+            if (CollectionUtil.isNotEmpty(timeMap)) {
+                lineMap.forEach((k, v) -> {
+                    List<String> timeList = timeMap.get(k);
+                    //有异常数据,当前监测点自身的异常数据
+                    if (CollectionUtil.isNotEmpty(timeList)) {
+                        List<DataV> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
+                        //1.过滤掉异常数据后还有正常数据，则用正常数据计算
+                        if (CollectionUtil.isNotEmpty(filterList)) {
+                            result.addAll(filterList);
+                        }
+                        //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
+                        else {
+                            v.parallelStream().forEach(item -> item.setQualityFlag("1"));
+                            result.addAll(v);
+                        }
+                    }
+                    //没有异常数据，则使用原数据
+                    else {
+                        result.addAll(v);
+                    }
+                });
+            }
+            //没有异常数据，则使用原数据
+            else {
+                result.addAll(dataList);
+            }
+        }
+    }
+
+    private static String buildKey(Object time, Object valueType, Object phasicType) {
+        return time + "|" + valueType + "|" + phasicType;
+    }
+
+    private static String getReverseLinePhasic(String phaseType) {
+        if (phaseType == null) {
+            return null;
+        }
+        switch (phaseType) {
+            case "A":
+                return "AB";
+            case "B":
+                return "BC";
+            case "C":
+                return "CA";
+            default:
+                return null;
+        }
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/CustomReportServiceImpl.java

@@ -106,7 +106,6 @@ public class CustomReportServiceImpl implements CustomReportService {
 
     private final WlRecordFeignClient wlRecordFeignClient;
 
-    private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
 
     private final String CELL_DATA = "celldata";
     private final String V = "v";
@@ -116,6 +115,9 @@ public class CustomReportServiceImpl implements CustomReportService {
     private final String STR_FOUR = "%";
     private final String UVOLTAGE_DEV = "UVOLTAGE_DEV";
     private final String VOLTAGE_DEV = "VOLTAGE_DEV";
+    private final String PT = "PT";
+    private final String CT = "CT";
+
 
     @Override
     public void getCustomReport(ReportSearchParam reportSearchParam, HttpServletResponse response) {
@@ -127,6 +129,8 @@ public class CustomReportServiceImpl implements CustomReportService {
             DeviceUnitCommDTO deviceUnitCommDTO = BeanUtil.copyProperties(deviceUnit, DeviceUnitCommDTO.class);
 
             Map<String,String> finalTerminalMap = convertKeysToUpperCase(commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData());
+            finalTerminalMap.put(PT,formatSciNumber(finalTerminalMap.getOrDefault(PT,"N/A")));
+            finalTerminalMap.put(CT,formatSciNumber(finalTerminalMap.getOrDefault(CT,"N/A")));
             customReportTableService.getCustomReport(reportSearchParam,finalTerminalMap,deviceUnitCommDTO, response);
         } else {
             //浙江无线报表
@@ -863,260 +867,7 @@ public class CustomReportServiceImpl implements CustomReportService {
     }
 
 
-    /**
-     * 处理
-     *
-     * @author cdf
-     * @date 2023/10/8
-     */
 
-/*
-    private void analyzeReport(ReportSearchParam reportSearchParam, ExcelRptTemp excelRptTemp, HttpServletResponse response) {
-        //定义一个线程集合
-        List<Future<?>> futures = new ArrayList<>();
-        //指标
-        List<ReportTemplateDTO> reportTemplateDTOList = new ArrayList<>();
-        //限值
-        List<ReportTemplateDTO> reportLimitList = new ArrayList<>();
-        //台账
-        List<ReportTemplateDTO> terminalList = new ArrayList<>();
-        JSONArray jsonArray;
-        try (InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) {
-            jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig()));
-            parseTemplate(jsonArray, reportTemplateDTOList, reportLimitList, terminalList);
-        } catch (Exception e) {
-            if(e instanceof BusinessException){
-                throw new BusinessException(e.getMessage());
-            }else {
-                throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON);
-            }
-        }
-        //查询不分相别的指标
-        DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.EPD.getCode(), DicDataTypeEnum.CS_DATA_TYPE.getCode()).getData();
-        if(Objects.isNull(dictData)){
-            throw new BusinessException(CommonResponseEnum.FAIL,"字典类型模板缺少!");
-        }
-        List<EleEpdPqd> temTargetList = eleEpdMapper.selectList(new LambdaQueryWrapper<EleEpdPqd>().eq(EleEpdPqd::getDataType,dictData.getId()).in(EleEpdPqd::getPhase,Arrays.asList("T", "M")));
-        List<String> noPhaseList = temTargetList.stream().filter(it->StrUtil.isNotBlank(it.getOtherName())).map(it->it.getOtherName().toUpperCase()).collect(Collectors.toList());
-
-        //处理指标是否合格
-        reportLimitList = new LinkedHashSet<>(reportLimitList).stream().sorted(Comparator.comparing(ReportTemplateDTO::getItemName)).collect(Collectors.toList());
-        Map<String, Float> limitMap = overLimitDeal(reportLimitList, reportSearchParam);
-        //存放限值指标的map
-        Map<String, ReportTemplateDTO> limitTargetMapX = reportLimitList.stream().collect(Collectors.toMap(ReportTemplateDTO::getItemName, Function.identity()));
-
-        List<ReportTemplateDTO> endList = new CopyOnWriteArrayList<>();
-        if (CollUtil.isNotEmpty(reportTemplateDTOList)) {
-            //开始组织sql
-            reportTemplateDTOList = new LinkedHashSet<>(reportTemplateDTOList).stream().sorted(Comparator.comparing(ReportTemplateDTO::getItemName)).collect(Collectors.toList());
-            Map<String, List<ReportTemplateDTO>> classMap = reportTemplateDTOList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getResourceId));
-            //定义存放越限指标的map
-            Map<String, ReportTemplateDTO> assNoPassMap = new HashMap<>();
-            classMap.forEach((classKey, templateValue) -> {
-                Map<String, List<ReportTemplateDTO>> valueTypeMap = templateValue.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getStatMethod));
-                //每张表开启一个独立线程查询
-                futures.add(executorService.submit(() -> {
-                    //avg.max,min,cp95
-                    valueTypeMap.forEach((valueTypeKey, valueTypeVal) -> {
-                        //相别分组
-                        Map<String, List<ReportTemplateDTO>> phaseMap = valueTypeVal.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getPhase));
-                        phaseMap.forEach((phaseKey, phaseVal) -> {
-                            StringBuilder sql = new StringBuilder(InfluxDbSqlConstant.SELECT);
-                            if (InfluxDbSqlConstant.MAX.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.AVG_WEB, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            }
-
-                        });
-                    });
-                }));
-
-            });
-
-            // 等待所有任务完成
-            for (Future<?> future : futures) {
-                try {
-                    future.get(); // 这会阻塞直到任务完成或抛出异常
-                } catch (InterruptedException | ExecutionException e) {
-                    e.printStackTrace();
-                    log.error("自定义报表多线程查询流程出错！错误信息{}",e.getMessage());
-                }
-            }
-
-            //处理指标最终判定合格还是不合格
-            dealTargetResult(assNoPassMap, limitTargetMapX, endList);
-        }
-        if (CollUtil.isNotEmpty(endList)) {
-            //数据单位信息
-            Map<String, String> unit = unitMap(reportSearchParam);
-            //进行反向赋值到模板
-            //1、根据itemName分组
-            Map<String, List<ReportTemplateDTO>> assMap = endList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getItemName));
-            //处理台账信息
-            Map<String, String> finalTerminalMap;
-            if (CollUtil.isNotEmpty(terminalList)) {
-                finalTerminalMap = convertKeysToUpperCase(commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData());
-            }else {
-                finalTerminalMap = new HashMap<>();
-            }
-            //2、把itemName的value赋给v和m
-            jsonArray.forEach(item -> {
-                JSONObject jsonObject = (JSONObject) item;
-                JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
-                itemArr.forEach((it) -> {
-                    if (Objects.nonNull(it) && !"null".equals(it.toString())) {
-                        //获取到1列
-                        JSONObject data = (JSONObject) it;
-                        JSONObject son = (JSONObject) data.get(V);
-                        if (son.containsKey(V)) {
-                            String v = son.getStr(V);
-                            //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
-                            if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
-                                String str = "";
-                                List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_TWO, "").toUpperCase());
-                                if (Objects.nonNull(rDto)) {
-                                    str = rDto.get(0).getValue();
-                                    //没有值，赋"/"
-                                    if (StringUtils.isBlank(str)) {
-                                        str = "/";
-                                    }
-                                    son.set(V, str);
-                                    if (Objects.nonNull(rDto.get(0).getOverLimitFlag()) && rDto.get(0).getOverLimitFlag() == 1) {
-                                        son.set("fc", "#990000");
-                                    }
-                                }
-                            } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                                //指标合格情况
-                                String str = "";
-                                List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, "").toUpperCase());
-                                if (Objects.nonNull(rDto)) {
-                                    str = rDto.get(0).getValue();
-                                    //没有值，赋"/"
-                                    if (StringUtils.isBlank(str)) {
-                                        str = "/";
-                                    }
-                                    son.set(V, str);
-                                    if ("不合格".equals(str)) {
-                                        son.set("fc", "#990000");
-                                    }
-                                }
-                            } else if (v.charAt(0) == '&') {
-                                //结论
-                                String tem = v.replace(STR_THREE, "").toUpperCase();
-                                if (Objects.nonNull(finalTerminalMap)) {
-                                    if ("STATIS_TIME".equals(tem)) {
-                                        //如何时间是大于当前时间则用当前时间
-                                        String localTime = InfluxDbSqlConstant.END_TIME;
-                                        LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
-                                        LocalDate nowDate = LocalDate.now();
-                                        if (nowDate.isAfter(localDate)) {
-                                            son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
-                                        } else {
-                                            localTime = " " + LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
-                                            son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + nowDate + localTime);
-                                        }
-                                    } else {
-                                        //台账信息
-                                        son.set(V, finalTerminalMap.getOrDefault(tem, "/"));
-                                    }
-                                }
-                            }
-                            //解决数据单位问题 @指标#类型@
-                            if (v.charAt(0) == '@' && v.contains(STR_ONE)) {
-                                String replace = v.replace("@", "");
-                                son.set(V, unit.getOrDefault(replace, "/"));
-
-                            }
-                        }
-                    }
-                });
-            });
-        }
-        //导出自定义报表
-        downReport(jsonArray, response);
-    }
-
-*/
-
-    /**
-     * 解析模板
-     * @author cdf
-     * @date 2023/10/20
-     */
-  /*  private void parseTemplate(JSONArray jsonArray, List<ReportTemplateDTO> reportTemplateDTOList, List<ReportTemplateDTO> reportLimitList, List<ReportTemplateDTO> terminalList) {
-        try {
-            //通过文件服务器获取
-            jsonArray.forEach(item -> {
-                JSONObject jsonObject = (JSONObject) item;
-                JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
-                itemArr.forEach((it) -> {
-                    if (Objects.nonNull(it) && !"null".equals(it.toString())) {
-                        //获取到1列
-                        JSONObject data = (JSONObject) it;
-                        JSONObject son = (JSONObject) data.get(V);
-                        if (son.containsKey(V)) {
-                            String v = son.getStr(V);
-                            //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
-                            if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
-                                //剔除前后$
-                                v = v.replace(STR_TWO, "");
-                                //封装ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                //根据#分割数据
-                                String[] vItem = v.split(STR_ONE);
-                                if (vItem.length == 5) {
-                                    //$HA[_25]#B#max#classId$
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setPhase(vItem[1].substring(0, 1).toUpperCase());
-                                    reportTemplateDTO.setStatMethod(vItem[2].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[3].toUpperCase());
-                                    reportTemplateDTO.setLimitName(vItem[4].toUpperCase());
-                                } else if (vItem.length == 4) {
-                                    //$HA[_25]#max#classId$
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setPhase("T");
-                                    reportTemplateDTO.setStatMethod(vItem[1].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[2].toUpperCase());
-                                    reportTemplateDTO.setLimitName(vItem[3].toUpperCase());
-                                }
-
-                                reportTemplateDTOList.add(reportTemplateDTO);
-                            } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                                //封装指标结论ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                v = v.replace(STR_FOUR, "");
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                //根据#分割数据
-                                String[] vItem = v.split(STR_ONE);
-                                if (vItem.length == 3) {
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setStatMethod(vItem[1].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[2].toUpperCase());
-                                }
-                                reportLimitList.add(reportTemplateDTO);
-                            } else if (v.charAt(0) == '&') {
-                                //封装ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                v = v.replace(STR_THREE, "");
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                reportTemplateDTO.setTemplateName(v.toUpperCase());
-                                terminalList.add(reportTemplateDTO);
-                            }
-                        }
-                    }
-                });
-            });
-        } catch (Exception e) {
-            throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON);
-        }
-    }
-*/
 
     /**
      * 获取测点限值
@@ -1716,6 +1467,28 @@ public class CustomReportServiceImpl implements CustomReportService {
         }
     }
 
+
+    /**
+     * 解析科学计数字符串，转为完整数字文本，原有小数原样保留
+     * @param numStr 数据库返回字符串：123.00 / 1.234E+08 / N/A
+     * @return 标准数字字符串
+     */
+    public String formatSciNumber(String numStr) {
+        // 空值或占位符直接返回
+        if (numStr == null || "N/A".equals(numStr.trim())) {
+            return numStr;
+        }
+        // 判断是否为科学计数格式
+        if (numStr.toLowerCase().contains("e")) {
+            // BigDecimal 可完美解析科学计数，输出完整数字，保留全部小数位
+            String [] split =numStr.split(":");
+            BigDecimal one = new BigDecimal(split[0]);
+            BigDecimal two = new BigDecimal(split[1]);
+            return (one.toPlainString().concat(":").concat(two.toPlainString()));
+        }
+        return numStr;
+    }
+
 }