1.技术监督代码调整

2.国网对象类型统计 3.国网新能源场站代码提交
2024-03-26 16:11:29 +08:00
parent 522b0b48dd
commit c5b427d8a3
31 changed files with 858 additions and 37 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java
@@ -92,7 +92,7 @@ public interface PmsTerminalDetectionService extends IService<PmsTerminalDetecti
     * @param param
     * @return MinIoUploadResDTO
     */
-    InputStreamResource reportDownload(TerminalParam.DownloadParam param) throws IOException;
+    InputStreamResource reportDownload(TerminalParam.DownloadParam param);

    /***
     * 终端入网检测台账统计
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RSurveyPlanConfigServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RSurveyPlanConfigServiceImpl.java
@@ -1,10 +1,19 @@
 package com.njcn.process.service;

+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.process.mapper.RSurveyPlanConfigMapper;
 import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
 import com.njcn.process.service.impl.RSurveyPlanConfigService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
 * 
 * Description:
@@ -15,6 +24,14 @@ import org.springframework.stereotype.Service;
 * @version V1.0.0
 */
@Service
+@RequiredArgsConstructor
 public class RSurveyPlanConfigServiceImpl extends MppServiceImpl<RSurveyPlanConfigMapper, RSurveyPlanConfigPO> implements RSurveyPlanConfigService{

+    private final DeptFeignClient deptFeignClient;
+    @Override
+    public List<RSurveyPlanConfigPO> getOrgIds() {
+        List<Dept> data = deptFeignClient.getAllDept().getData();
+        List<String> orgIds = data.stream().map(Dept::getCode).collect(Collectors.toList());
+        return  this.list(new LambdaQueryWrapper<RSurveyPlanConfigPO>().in(CollUtil.isNotEmpty(orgIds),RSurveyPlanConfigPO::getOrgId,orgIds ));
+    }
 }
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
@@ -29,6 +29,7 @@ import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.WebUtil;
+import liquibase.pro.packaged.S;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.jdbc.Null;
@@ -72,13 +73,14 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
        Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
        List<String> ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( );
        Integer checkType = loadTypeUserSearchParam.getCheckType();
+        String aStatus = null;
        //0表示不是审核信息 1标识审核信息
-        List<String> data = deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( );
        if(checkType==1){
-            ids=data.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList());
+            ids=ids.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList());
+            aStatus =   dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData().getId();
        }
        //干扰源用户信息录入
-        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids);
+        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids,aStatus);
        List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
        Map<String, PvTerminalTreeVO> pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO));
        //部门处理：根据部门code取名称
@@ -202,8 +204,15 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
    @Override
    public Page<RLoadTypeUserManageVO> getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam) {
        Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
-        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page, loadTypeUserSearchParam);
-
+        List<String> ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( );
+        Integer checkType = loadTypeUserSearchParam.getCheckType();
+        String aStatus = null;
+        //0表示不是审核信息 1标识审核信息
+        if(checkType==1){
+            ids=ids.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList());
+            aStatus =   dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData().getId();
+        }
+        Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page, loadTypeUserSearchParam,ids,aStatus);
        //部门处理：根据部门code取名称
        List<RLoadTypeUserManageVO> list = loadTypeUserPage.getRecords();
        List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
@@ -306,7 +306,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
    }

    @Override
-    public InputStreamResource reportDownload(TerminalParam.DownloadParam param) throws IOException {
+    public InputStreamResource reportDownload(TerminalParam.DownloadParam param) {
        PmsTerminalDetection terminal = this.getById(param.getId());
        if (ObjectUtil.isNull(terminal)) {
            if (StringUtils.isEmpty(terminal)) {
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
@@ -1,5 +1,6 @@
 package com.njcn.process.service.impl;

+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.conditions.update.UpdateWrapper;
@@ -34,6 +35,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

 import java.text.SimpleDateFormat;
@@ -198,6 +200,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
                    map(RGeneralSurveyPlanDetail::getSubId).collect(Collectors.toList());
            rGeneralSurveyPlanVO.setSubCount(collect1.size());
            rGeneralSurveyPlanVO.setSubIds(collect1);
+            rGeneralSurveyPlanVO.setIsFileUpload(ObjectUtil.isNull(temp.getIsFileUpload())  ? 0 : temp.getIsFileUpload());
 /*
            long Subcount = rGeneralSurveyPlanDetails.stream ( ).
                    filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java
@@ -2,7 +2,10 @@ package com.njcn.process.service.impl;

 import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
-    /**
+
+import java.util.List;
+
+/**
 * 
 * Description:
 * 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -14,4 +17,6 @@ import com.njcn.process.pojo.po.RSurveyPlanConfigPO;
 public interface RSurveyPlanConfigService extends IMppService<RSurveyPlanConfigPO> {


+    List<RSurveyPlanConfigPO> getOrgIds();
+
 }