1.试运行报告微调

2.全景展示稳态超标9指标扩展
3.技术监督变电站台账调整
4.调整登录名正则表达式增加._

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

@@ -537,9 +537,9 @@ public class LineController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("根据监测点名称和电网侧变电站名称模糊搜索")
     @PostMapping("/getByName")
-    HttpResult<List<LineDetail>> getByName(@RequestParam("name") String name){
+    HttpResult<List<LineDetail>> getByName(@RequestBody LineBaseQueryParam param){
         String methodDescribe = getMethodDescribe("getByName");
-        List<LineDetail> list = lineService.getByName(name);
+        List<LineDetail> list = lineService.getByName(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 }

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

@@ -17,6 +17,7 @@ import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.WarningSubstationDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
@@ -558,6 +559,6 @@ public interface LineMapper extends BaseMapper<Line> {
 
     List<Line> getSubByCondition(@Param("subIds") List<String> subIds, @Param("scale") List<SimpleDTO> scale);
 
-    List<LineDetail> selectByName(@Param("name") String name);
+    List<LineDetail> selectByName(@Param("param") LineBaseQueryParam param);
 
 }

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

@@ -1751,9 +1751,15 @@
             pq_line t1 ,
             pq_line_detail t2
         <where>
-            t1.id = t2.id
-            <if test="name!=null and name!=''">
-                AND (t1.name like CONCAT('%', #{name}, '%') or t2.Power_Substation_Name like CONCAT('%', #{name}, '%'))
+            t1.id = t2.id and t2.Run_Flag=0
+            <if test="param.lineIds!=null and param.lineIds.size()!=0">
+                AND t1.id in
+                <foreach collection="param.lineIds" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.searchValue!=null and param.searchValue!=''">
+                AND (t1.name like CONCAT('%', #{param.searchValue}, '%') or t2.Power_Substation_Name like CONCAT('%', #{param.searchValue}, '%'))
             </if>
 
         </where>

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

@@ -7,10 +7,7 @@ import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
 import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
-import com.njcn.device.pq.pojo.param.DataParam;
-import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.param.PqsParam;
-import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.pq.pojo.po.LineDetail;
@@ -226,5 +223,5 @@ public interface LineService extends IService<Line> {
 
     List<ReportLineInfoVo> getReportLineInfo(List<String> ids);
 
-    List<LineDetail> getByName(String name);
+    List<LineDetail> getByName(LineBaseQueryParam param);
 }

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

@@ -490,7 +490,7 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
         } else {
             groupLine = childrenData.stream().collect(Collectors.groupingBy(LineIntegrityDataVO::getPid));
         }
-        targetData = targetData.stream().peek(lineAdministrationTree -> {
+        targetData.stream().peek(lineAdministrationTree -> {
             List<Double> data = new ArrayList<>();
             List<LineIntegrityDataVO> childList = new ArrayList<>();
             Set<String> pids = groupLine.keySet();
@@ -514,7 +514,8 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             }
             //父级完整性匹配
             if (CollectionUtil.isNotEmpty(data)){
-                double avg = data.stream().collect(Collectors.averagingDouble(x -> x));
+                BigDecimal reduce = data.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                double avg = reduce.divide(new BigDecimal(data.size())).doubleValue();
                 lineAdministrationTree.setIntegrityData(DataStatisticsUtil.dataLimits(avg));
             } else {
                 lineAdministrationTree.setIntegrityData(3.14159);

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

@@ -26,10 +26,7 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
-import com.njcn.device.pq.pojo.param.DataParam;
-import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.param.PqsParam;
-import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.DeptLineService;
@@ -695,8 +692,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
     }
 
     @Override
-    public List<LineDetail> getByName(String name) {
-        return this.baseMapper.selectByName(name);
+    public List<LineDetail> getByName(LineBaseQueryParam param) {
+        return this.baseMapper.selectByName(param);
     }
 
     @Override