1.河北修改

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatIntegrityDMapper.java

@@ -2,6 +2,8 @@ package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pms.pojo.dto.MonitorIntegrityDataDTO;
 import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.LineDataIntegrity;
@@ -22,4 +24,6 @@ import java.util.List;
 public interface RStatIntegrityDMapper extends BaseMapper<RStatIntegrityD> {
 
 
+    Page<RStatIntegrityD>  getMonitorIntegrityData (@Param("page") Page<RStatIntegrityD> page,@Param("monitorIntegrityDataDTO")MonitorIntegrityDataDTO monitorIntegrityDataDTO,@Param("ids")List<String> ids);
+
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatIntegrityDMapper.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.device.pms.mapper.majornetwork.RStatIntegrityDMapper">
+
+
+<select id="getMonitorIntegrityData" resultType="RStatIntegrityD">
+    select * from
+    (select round(sum(real_time)/sum(due_time),3) as integrityData,
+    line_index as lineIndex
+    from r_stat_integrity_d
+    where time_id between #{monitorIntegrityDataDTO.searchBeginTime} and #{monitorIntegrityDataDTO.searchEndTime}
+    and line_index in
+    <foreach collection="ids" open="(" separator="," close=")" item="item">
+        #{item}
+    </foreach>
+    group by line_index
+    ) t
+    <if test="monitorIntegrityDataDTO.limitValue!=null">
+        where
+        integrityData &lt; #{monitorIntegrityDataDTO.limitValue}
+    </if>
+
+</select>
+
+</mapper>

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

@@ -44,6 +44,7 @@ public class RStatIntegrityDServiceImpl extends ServiceImpl<RStatIntegrityDMappe
 
     private final MonitorMapper monitorMapper;
 
+
     @Override
     public Page<MonitorIntegrityDataDTO> getMonitorIntegrityData(MonitorIntegrityDataDTO monitorIntegrityDataDTO) {
         Page<MonitorIntegrityDataDTO> pageResult =new Page<>(PageFactory.getPageNum(monitorIntegrityDataDTO),PageFactory.getPageSize(monitorIntegrityDataDTO));
@@ -56,11 +57,7 @@ public class RStatIntegrityDServiceImpl extends ServiceImpl<RStatIntegrityDMappe
 
         Map<String,Monitor> map = monitorList.stream().collect(Collectors.toMap(Monitor::getId, Function.identity()));
 
-        QueryWrapper<RStatIntegrityD> queryWrapper = new QueryWrapper<>();
+        Page<RStatIntegrityD> page = this.baseMapper.getMonitorIntegrityData(new Page<>(PageFactory.getPageNum(monitorIntegrityDataDTO),PageFactory.getPageSize(monitorIntegrityDataDTO)),monitorIntegrityDataDTO,monitorIds);
-        queryWrapper.select("ROUND(sum(real_time)/sum(due_time),3) as integrityData,line_index as lineIndex").lambda()
-                .between(RStatIntegrityD::getTimeId,monitorIntegrityDataDTO.getSearchBeginTime(),monitorIntegrityDataDTO.getSearchEndTime())
-                .in(RStatIntegrityD::getLineIndex,monitorIds).last("group by lineIndex");
-        Page<RStatIntegrityD> page = this.page(new Page<>(PageFactory.getPageNum(monitorIntegrityDataDTO),PageFactory.getPageSize(monitorIntegrityDataDTO)),queryWrapper);
         List<MonitorIntegrityDataDTO> monitorIntegrityDataDTOList = page.getRecords().stream().map(item->{
             MonitorIntegrityDataDTO monitorIntegrityDataDTOTem = new MonitorIntegrityDataDTO();
             monitorIntegrityDataDTOTem.setMonitorId(item.getLineIndex());