Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

综合评估功能调整

Browse Source
This commit is contained in:
xy
2024-06-02 15:25:45 +08:00
parent 9b59d183f5
commit 7b43430e03
5 changed files with 121 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.njcn.advance.service.responsibility.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
@@ -33,12 +34,18 @@ import com.njcn.advance.service.responsibility.IRespDataService;
import com.njcn.advance.service.responsibility.IRespUserDataService;
import com.njcn.advance.utils.ResponsibilityAlgorithm;
import com.njcn.advance.utils.ResponsibilityCallDllOrSo;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.FileUtil;
import com.njcn.common.utils.PubUtils;
import com.njcn.db.constant.DbConstant;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
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.pms.pojo.po.StatationStat;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
import com.njcn.device.pq.pojo.vo.LineDetailVO;
@@ -50,6 +57,7 @@ import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -58,6 +66,7 @@ import java.io.*;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -85,9 +94,21 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
private final IRespUserDataService respUserDataService;
private final CommTerminalGeneralClient commTerminalGeneralClient;
@Override
public Page<RespDataDTO> responsibilityList(BaseParam queryParam) {
QueryWrapper<RespDataDTO> queryWrapper = new QueryWrapper<>();
//获取当前用户部门，根据部门获取监测点
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(RequestUtil.getDeptIndex());
deptGetLineParam.setServerName(ServerInfo.ADVANCE_BOOT);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
DeptGetChildrenMoreDTO dto = list.stream().collect(Collectors.toMap(DeptGetChildrenMoreDTO::getUnitId, Function.identity())).get(RequestUtil.getDeptIndex());
if (CollUtil.isNotEmpty(dto.getLineBaseList())) {
List<String> line = dto.getLineBaseList().stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
queryWrapper.in("pqs_resp_data.line_id", line);
}
if (ObjectUtil.isNotNull(queryParam)) {
//查询参数不为空，进行条件填充
if (StrUtil.isNotBlank(queryParam.getSearchValue())) {