代码优化

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

@@ -156,7 +156,7 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
             List<LineDetailVO.Detail> LineInfoByIds = lineService.getLineDetailByIds(lineIds);
 
             rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, lineIds.size()) : lineIds.size());
-            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
+            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;
@@ -169,7 +169,7 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                 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()));
+                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()).doubleValue()>100.0?BigDecimal.valueOf(100.0):calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
                 List<DeviceOnlineRate.LineDetail> detailList = new ArrayList<>();
                 List<LineDetailVO.Detail> lineDetail = LineInfoByIds.stream().filter(x -> dto.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
                 for (LineDetailVO.Detail line : lineDetail) {
@@ -185,7 +185,7 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     detail.setLineId(line.getLineId());
                     detail.setLineName(line.getLineName());
                     detail.setLatestTime(line.getTimeID());
-                    detail.setIntegrity(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-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java

@@ -39,6 +39,9 @@ public class UserReportVO {
     @ApiModelProperty(value = "填报人名称")
     private String reporterName;
 
+    @ApiModelProperty(value = "二次评估id")
+    private String secondAssessmentId;
+
     /**
      * 填报日期
      */

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -9,7 +9,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
@@ -20,7 +19,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml

@@ -26,7 +26,8 @@
       supervision_user_report.create_by,
       supervision_user_report.status,
       supervision_user_report.dev_id,
-      supervision_user_report.line_id
+      supervision_user_report.line_id,
+      supervision_user_report.second_assessment_id secondAssessmentId
     FROM supervision_user_report supervision_user_report
     WHERE ${ew.sqlSegment}
   </select>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java

@@ -3,7 +3,6 @@ package com.njcn.supervision.service.device.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -19,8 +18,6 @@ import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.pq.api.*;
-import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.pojo.vo.OnlineMonitorVo;
@@ -275,6 +272,10 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         if (StringUtils.isNotBlank(param.getLineType())) {
             queryWrapper.eq("B.Power_Flag", Integer.parseInt(param.getLineType()));
         }
+        //监测点名称
+        if (StringUtils.isNotBlank(param.getSearchValue()) && !Objects.equals(param.getSearchValue(),"")) {
+            queryWrapper.like("p1.Name", param.getSearchValue());
+        }
         //查询无数据的监测点
         if (Objects.equals(param.getDataType(), 0)) {
             queryWrapper.eq("A.target_type", "0");