问题单修复

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

@@ -135,7 +135,7 @@ public class CommunicateServiceImpl implements CommunicateService {
         param.setIds(Arrays.asList(lineList));
         param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
         param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
-        if(state == 0){
+        if(state == 1){
             //在线率
             List<RStatOnlinerateVO> onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param);
             if (CollUtil.isNotEmpty(onlineRateByDevIds)) {
@@ -144,7 +144,7 @@ public class CommunicateServiceImpl implements CommunicateService {
                     resultList[0] = po.getOnlineRate() == null ? null : BigDecimal.valueOf(Float.parseFloat(po.getOnlineRate().toString())).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
                 });
             }
-        }else{
+        } else {
             //数据完整率
             List<RStatIntegrityVO> onIntegrityByIds = integrityDMapper.getOnIntegrityByIds(param);
             if (CollUtil.isNotEmpty(onIntegrityByIds)) {

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatOnlinerateDMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.event.mapper.majornetwork;
+
+
+
+
+import com.njcn.event.pojo.po.PqsOnlinerate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 在线率日表 Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-03-28
+ */
+public interface RStatOnlinerateDMapper {
+
+
+    List<PqsOnlinerate> getOnlineRateByDevIds (@Param("list") List<String> devIds,@Param("startTime") String startTime,@Param("endTime") String endTime);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOnlinerateDMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.majornetwork.RStatOnlinerateDMapper">
+    <select id="getOnlineRateByDevIds" resultType="com.njcn.event.pojo.po.PqsOnlinerate">
+        select
+        dev_index AS devId,
+        online_min AS onlinemin,
+        offline_min AS offlinemin
+        from r_stat_onlinerate_d
+        <where>
+            <if test="list.size > 0">
+                AND dev_index IN
+                <foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="startTime != null and startTime !=''">
+                AND  time_id >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java

@@ -13,8 +13,8 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
 import com.njcn.device.pq.pojo.vo.SubstationDetailVO;
-import com.njcn.event.influxdb.PqsOnlinerateQuery;
 import com.njcn.event.mapper.majornetwork.PqDeviceMapper;
+import com.njcn.event.mapper.majornetwork.RStatOnlinerateDMapper;
 import com.njcn.event.pojo.po.PqDevice;
 import com.njcn.event.pojo.po.PqsOnlinerate;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
@@ -63,7 +63,9 @@ public class AreaLineServiceImpl implements AreaLineService {
 
     private final InfluxDbUtils influxDbUtils;
 
-    private final PqsOnlinerateQuery pqsOnlinerateQuery;
+   // private final PqsOnlinerateQuery pqsOnlinerateQuery;
+
+    private final RStatOnlinerateDMapper rStatOnlinerateDMapper;
 
     private final PqDeviceMapper pqDeviceMapper;
     private final EventDetailService eventDetailService;
@@ -149,7 +151,7 @@ public class AreaLineServiceImpl implements AreaLineService {
             substationDetailVOList.addAll(substationDetailVOS);
             if (lineIndexs.size() > 0) {
                 areaLineVO.setSubstationDetailVOList(substationDetailVOList);
-                objectList.add(generalDeviceDTO.getName() + "\n(" + tail + ")");
+                objectList.add(generalDeviceDTO.getName());
                 objectList.add(tail);
                 objectList.add(stateZc);
                 objectList.add(stateZd);
@@ -296,9 +298,10 @@ public class AreaLineServiceImpl implements AreaLineService {
             return TerminalRunningVO.empty();
         }
 
-        List<PqsOnlinerate> pqsOnlinerateList = pqsOnlinerateQuery.selectList(Arrays.asList("dev_id", "offlinemin", "onlinemin"),
+//        List<PqsOnlinerate> pqsOnlinerateList = pqsOnlinerateQuery.selectList(Arrays.asList("dev_id", "offlinemin", "onlinemin"),
-                devIdOr(deviceIndexList),
+//                devIdOr(deviceIndexList),
-                timeAnd(beginOfDay(deviceInfoParam.getSearchBeginTime()), endOfDay(deviceInfoParam.getSearchEndTime())));
+//                timeAnd(beginOfDay(deviceInfoParam.getSearchBeginTime()), endOfDay(deviceInfoParam.getSearchEndTime())));
+        List<PqsOnlinerate> pqsOnlinerateList = rStatOnlinerateDMapper.getOnlineRateByDevIds(deviceIndexList,beginOfDay(deviceInfoParam.getSearchBeginTime()), endOfDay(deviceInfoParam.getSearchEndTime()));
 
         List<PqDevice> pqDeviceList = pqDeviceMapper.queryRunFlagByDeviceIndexs(deviceIndexList);
 

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

@@ -38,14 +38,12 @@ import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanUtils;
 import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.InfluxDBResultMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.io.File;
-import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Instant;
@@ -303,6 +301,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
             list.addAll(monMap.keySet());
             PollutionParamDTO pollutionParamDTO = new PollutionParamDTO();
             pollutionParamDTO.setLineList(list);
+//            List<AreaLineInfoVO> data = lineFeignClient.getBaseLineAreaInfo(list).getData();
             List<OverLimitLineDTO> overLimitLineList = lineFeignClient.getOverLimitLineInfo(pollutionParamDTO).getData();
             List<RStatLimitRateDPO> rStatLimitRateDPOS = rateDMapper.selectList(new QueryWrapper<RStatLimitRateDPO>()
                     .in("r_stat_limit_rate_d.my_index", list)