Merge remote-tracking branch 'origin/jtdev' into jtdev

gonglilong

2024-09-13 abde38d6baba3b50df5e39daba87a93c372e0675

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java

@@ -289,26 +289,31 @@
   @Override
   public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
      List<SgProjectInfoVO> list = new ArrayList<>();
         if(!searchDTO.getAdCode().isEmpty()){
         if(StringUtils.isNotBlank(searchDTO.getAdCode())){
            list =   sgProjectInfoMapper.progressList1(page, searchDTO);
         }else {
            list = sgProjectInfoMapper.progressList(page, searchDTO);
         }

      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
      searchDTO.setProjectIds(ids);
      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
      if(!searchDTO.getAdCode().isEmpty()){
         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
      }else {
         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
      }
//      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
//      searchDTO.setProjectIds(ids);
//      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
//      if(StringUtils.isNotBlank(searchDTO.getAdCode())){
//         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
//      }else {
//         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
//      }

      if (CollectionUtils.isNotEmpty(projectProgress)){
      Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
//      if (CollectionUtils.isNotEmpty(projectProgress)){
      //Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
      list.forEach(s->{
         s.setProjectProgress(progressMap.get(s.getId()));
      });}
         if (StringUtils.isNotBlank(s.getProjectProgress())){
            s.setProjectProgress(s.getProjectProgress()+"%");
         }else {
            s.setProjectProgress("0%");
         }
      });
//      }
      return page.setRecords(list);
   }

@@ -348,21 +353,44 @@
      //片区
      if (ywxtAdDetail == null) {
         sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
         getDeviceTypes(sgStatisProVOS);
         setDeviceTypes(sgStatisProVOS);
//         String getname = sgProjectInfoMapper.getname(code);
         String getname = code;
         updateProjectProgress(sgStatisProVOS, code, getname, "2");
      } else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
         sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
         sgStatisProVOS = getSgStatisProVOS(sgStatisProVOS);
         getDeviceTypes(sgStatisProVOS);
         setDeviceTypes(sgStatisProVOS);
         updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getPAdCode(), ywxtAdDetail.getPAdName(), "0");
      } else {//区县
         sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsList(code);
         getDeviceTypes(sgStatisProVOS);
         setDeviceTypes(sgStatisProVOS);
         updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getAdCode(), ywxtAdDetail.getAdName(), "3");
      }
      return sgStatisProVOS;
   }

   /**
    * 统计施工进度
    * @param sgStatisProVOS
    */
   private void setDeviceTypes(List<SgStatisProVO> sgStatisProVOS) {
      if (CollectionUtils.isNotEmpty(sgStatisProVOS)){
         Map<String, SgOperatingRateVO> deviceTypes = getDeviceTypes(sgStatisProVOS.stream().map(SgStatisProVO::getProIds).collect(Collectors.toList()));
         for (SgStatisProVO vo : sgStatisProVOS) {
            SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
            if (Objects.nonNull(sVo)){
               vo.setSurfaceNum(sVo.getSurfaceNum());
               vo.setSurfaceProgress(sVo.getSurfaceProgress()+"%");
               vo.setVideoNum(sVo.getVideoNum());
               vo.setVideoProgress(sVo.getVideoProgress()+"%");
               vo.setTransNum(sVo.getTransNum());
               vo.setTransProgress(sVo.getTransProgress()+"%");
               vo.setSeepageNum(sVo.getSeepageNum());
               vo.setSeepageProgress(sVo.getSeepageProgress()+"%");
            }
         }
      }
   }

   /**
@@ -394,12 +422,12 @@

   /**
    * 统计设备类型开工率
    * @param sgStatisProVOS
    */
   private void getDeviceTypes(List<SgStatisProVO> sgStatisProVOS) {
      if (CollectionUtils.isNotEmpty(sgStatisProVOS)){
         for (SgStatisProVO vo : sgStatisProVOS) {
            String proIds = vo.getProIds();
   private Map<String,SgOperatingRateVO> getDeviceTypes(List<String> projectIds) {
      Map<String,SgOperatingRateVO> result = new HashMap<>();
      if (CollectionUtils.isNotEmpty(projectIds)){
         for (String proIds : projectIds) {
            SgOperatingRateVO sgOperatingRateVO = new SgOperatingRateVO();
            if (StringUtils.isNotBlank(proIds)){
            List<SgStatisDeviceVO> deviceVOS =   sgProjectInfoMapper.getDeviceTypes("("+proIds+")");
            if(CollectionUtils.isNotEmpty(deviceVOS)){
@@ -409,12 +437,12 @@
               if (Objects.nonNull(sg108)){
                  Integer deviceCount = sg108.getDeviceCount();
                  Integer deviceStart = sg108.getDeviceStart();
                  vo.setSurfaceNum(deviceCount);
                  sgOperatingRateVO.setSurfaceNum(deviceCount);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     vo.setSeepageProgress(getBigDecimalPercent(divide));
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
                  }else {
                     vo.setSeepageProgress("0%");
                     sgOperatingRateVO.setSeepageProgress("0");
                  }
               }
               //视频
@@ -422,12 +450,12 @@
               if (Objects.nonNull(sg104)){
                  Integer deviceCount = sg104.getDeviceCount();
                  Integer deviceStart = sg104.getDeviceStart();
                  vo.setVideoNum(deviceCount);
                  sgOperatingRateVO.setVideoNum(deviceCount);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     vo.setVideoProgress(getBigDecimalPercent(divide));
                     sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
                  }else {
                     vo.setVideoProgress("0%");
                     sgOperatingRateVO.setVideoProgress("0");
                  }
               }
               //渗压
@@ -435,12 +463,12 @@
               if (Objects.nonNull(sg101)){
                  Integer deviceCount = sg101.getDeviceCount();
                  Integer deviceStart = sg101.getDeviceStart();
                  vo.setTransNum(deviceCount);
                  sgOperatingRateVO.setTransNum(deviceCount);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     vo.setTransProgress(getBigDecimalPercent(divide));
                     sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
                  }else {
                     vo.setTransProgress("0%");
                     sgOperatingRateVO.setTransProgress("0");
                  }
               }
               //渗流
@@ -448,18 +476,20 @@
               if (Objects.nonNull(sg102)){
                  Integer deviceCount = sg102.getDeviceCount();
                  Integer deviceStart = sg102.getDeviceStart();
                  vo.setSeepageNum(deviceCount);
                  sgOperatingRateVO.setSeepageNum(deviceCount);
                  if (deviceCount != 0){
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     vo.setSeepageProgress(getBigDecimalPercent(divide));
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
                  }else {
                     vo.setSeepageProgress("0%");
                     sgOperatingRateVO.setSeepageProgress("0");
                  }
               }
               }
               result.put(proIds,sgOperatingRateVO);
            }
         }
      }
      return result;
   }

   private void updateProjectProgress(List<SgStatisProVO> sgStatisProVOS, String pcode, String pname, String adGrad) {
@@ -552,7 +582,7 @@
      BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
      // 如果不需要保留小数位，可以设置一个scale为0
      BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
      return percentageRounded+"%";
      return percentageRounded.toString();
   }

   @Override
@@ -560,7 +590,7 @@
      Map<String, Object> map  = new HashMap<>();
      List<SgProjectInfoVO> progressList = progressList(searchDTO);
      BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
      BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()), 2, RoundingMode.HALF_UP);
      BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()==0?1:progressList.size()), 2, RoundingMode.HALF_UP);
      List<SgProjectInfoDO> pending = progressList.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
      List<SgProjectInfoDO> progress = progressList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
      List<SgProjectInfoDO> over = progressList.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
@@ -614,64 +644,85 @@

   @Override
   public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
      List<String> sgCodeS = getSgCodeByUser();
      dto.setSgCodeS(sgCodeS);
      List<SgProjectTreeVO> list =    sgProjectInfoMapper.projectTree(dto);
      if (CollectionUtils.isNotEmpty(list)){
      // 按省、市、县分组
      Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>> groupedProjects = list.stream()
         .collect(Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
            Collectors.groupingBy(SgProjectTreeVO::getCityNm,
               Collectors.groupingBy(SgProjectTreeVO::getCountyNm))));

      // 构建树结构
      List<SgProjectTreeVO> result = new ArrayList<>();
      for (Map.Entry<String, Map<String, Map<String, List<SgProjectTreeVO>>>> provinceEntry : groupedProjects.entrySet()) {
         String province = provinceEntry.getKey();
         Map<String, Map<String, List<SgProjectTreeVO>>> cityMap = provinceEntry.getValue();

         SgProjectTreeVO provinceNode = new SgProjectTreeVO();
         provinceNode.setProvinceNm(province);
         provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
         provinceNode.setRegionName(province);
         provinceNode.setChildList(new ArrayList<>());
         long provinceNum = 0;
         for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> cityEntry : cityMap.entrySet()) {
            String city = cityEntry.getKey();
            Map<String, List<SgProjectTreeVO>> countyMap = cityEntry.getValue();

            SgProjectTreeVO cityNode = new SgProjectTreeVO();
            List<String> cityIds = new ArrayList<>();
            cityNode.setCityNm(city);
            cityNode.setId(UUID.randomUUID().toString().replace("-",""));
            cityNode.setRegionName(city);
            cityNode.setChildList(new ArrayList<>());

            for (Map.Entry<String, List<SgProjectTreeVO>> countyEntry : countyMap.entrySet()) {
               String county = countyEntry.getKey();
               List<SgProjectTreeVO> countyProjects = countyEntry.getValue();
               for (SgProjectTreeVO countyProject : countyProjects) {
                  countyProject.setRegionName(countyProject.getResNm());
         // 按省、片区、市、县、乡镇分组
         Map<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> groupedProjects = list.stream()
            .collect(
               Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
                  Collectors.groupingBy(SgProjectTreeVO::getLot,
                     Collectors.groupingBy(SgProjectTreeVO::getCityNm,
                        Collectors.groupingBy(SgProjectTreeVO::getCountyNm,
                           Collectors.groupingBy(SgProjectTreeVO::getTownNm
                           ))))));
            List<SgProjectTreeVO> tree = new ArrayList<>();
            for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> provinceEntry : groupedProjects.entrySet()) {
               SgProjectTreeVO provinceNode = new SgProjectTreeVO();
               provinceNode.setProvinceNm(provinceEntry.getKey());
               provinceNode.setRegionName(provinceEntry.getKey());
               provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
               provinceNode.setLevel(1);
               List<SgProjectTreeVO> provinceChildren = new ArrayList<>();
               for (Map.Entry<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>> lotEntry : provinceEntry.getValue().entrySet()) {
                  SgProjectTreeVO lotNode = new SgProjectTreeVO();
                  List<String> lotIds = new ArrayList<>();
                  lotNode.setLot(lotEntry.getKey());
                  lotNode.setRegionName(lotEntry.getKey());
                  lotNode.setId(UUID.randomUUID().toString().replace("-",""));
                  lotNode.setLevel(2);
                  List<SgProjectTreeVO> lotChildren = new ArrayList<>();
                  for (Map.Entry<String, Map<String, Map<String, List<SgProjectTreeVO>>>> cityEntry : lotEntry.getValue().entrySet()) {
                     SgProjectTreeVO cityNode = new SgProjectTreeVO();
                     List<String> cityIds = new ArrayList<>();
                     cityNode.setCityNm(cityEntry.getKey());
                     cityNode.setRegionName(cityEntry.getKey());
                     cityNode.setId(UUID.randomUUID().toString().replace("-",""));
                     cityNode.setLevel(3);
                     List<SgProjectTreeVO> cityChildren = new ArrayList<>();
                     for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> countyEntry : cityEntry.getValue().entrySet()) {
                        SgProjectTreeVO countyNode = new SgProjectTreeVO();
                        List<String> countyIds = new ArrayList<>();
                        countyNode.setCountyNm(countyEntry.getKey());
                        countyNode.setRegionName(countyEntry.getKey());
                        countyNode.setId(UUID.randomUUID().toString().replace("-",""));
                        countyNode.setLevel(4);
                        List<SgProjectTreeVO> countyChildren = new ArrayList<>();
                        for (Map.Entry<String, List<SgProjectTreeVO>> townEntry : countyEntry.getValue().entrySet()) {
                           SgProjectTreeVO townNode = new SgProjectTreeVO();
                           townNode.setTownNm(townEntry.getKey());
                           townNode.setRegionName(townEntry.getKey());
                           townNode.setChildList(townEntry.getValue());
                           townNode.setChildNum((long) townEntry.getValue().size());
                           townNode.setId(UUID.randomUUID().toString().replace("-",""));
                           townNode.setLevel(5);
                           townNode.setProjectIds(townEntry.getValue().stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
                           countyIds.addAll(townNode.getProjectIds());
                           countyChildren.add(townNode);
                        }
                        countyNode.setChildNum(countyChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                        countyNode.setChildList(countyChildren);
                        countyNode.setProjectIds(countyIds);
                        cityIds.addAll(countyIds);
                        cityChildren.add(countyNode);
                     }
                     cityNode.setChildNum(cityChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                     cityNode.setChildList(cityChildren);
                     cityNode.setProjectIds(cityIds);
                     lotIds.addAll(cityIds);
                     lotChildren.add(cityNode);
                  }
                  lotNode.setChildNum(lotChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                  lotNode.setChildList(lotChildren);
                  lotNode.setProjectIds(lotIds);
                  provinceChildren.add(lotNode);
               }
               SgProjectTreeVO countyNode = new SgProjectTreeVO();
               countyNode.setCountyNm(county);
               countyNode.setRegionName(county);
               countyNode.setId(UUID.randomUUID().toString().replace("-",""));
               countyNode.setChildList(new ArrayList<>(countyProjects));
               countyNode.setChildNum((long) countyProjects.size());
               countyNode.setProjectIds(countyProjects.stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
               cityIds.addAll(countyNode.getProjectIds());
               cityNode.getChildList().add(countyNode);
               provinceNode.setChildNum(provinceChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
               provinceNode.setChildList(provinceChildren);
               tree.add(provinceNode);
            }

            cityNode.setChildNum((long) cityIds.size());
            cityNode.setProjectIds(cityIds);
            provinceNode.getChildList().add(cityNode);
            provinceNum+= (long) cityIds.size();
         }

         provinceNode.setChildNum(provinceNum);
         result.add(provinceNode);
      }
      return result;
            return tree;
      }
      return new ArrayList<>();
   }