优化

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1894,60 +1894,60 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         PageHelper.startPage(pageNum, pageSize);
         List<SbInfoVO> sbList = mapper.selectVOList(model);
 
-//        List<String> sbIds = sbList.stream().map(SbInfoVO::getId).collect(Collectors.toList());
-//        Map<String,List<SbMeasureLogVO>> maps = new HashMap<>();
-//
-//        SbMeasureLogDTO sbMeasureLogDTO = new SbMeasureLogDTO();
-//        sbMeasureLogDTO.setSbIds(sbIds);
-//        List<SbMeasureLogVO> sbMeasureLogVOS = sbMeasureLogMapper.selectList(sbMeasureLogDTO);
-//        SysFileDTO sysFileDTO = new SysFileDTO();
-//        sysFileDTO.setType(SysFileTypeEnum.SB_MEASURE_LOG_CREDENTIAL.getValue());
-//        List<SysFile> sysFiles = sysFileService.getModelListByDTO(sysFileDTO);
-//
-//            for (SbMeasureLogVO sbMeasureLogVO:sbMeasureLogVOS){
-//                List<SysFile> sysFileList = new ArrayList<>();
-//                for (SysFile sysFile:sysFiles){
-//                    if (sysFile.getTargetId().equals(sbMeasureLogVO.getId())){
-//                        sysFileList.add(sysFile);
-//                    }
-//            }
-//                sbMeasureLogVO.setSbMeasureLogCredential(sysFileList);
-//        }
-//        for (SbInfoVO sbInfoVO:sbList) {
-//            List<SbMeasureLogVO> logVOS = new ArrayList<>();
-//            for (SbMeasureLogVO vo : sbMeasureLogVOS) {
-//                if (sbInfoVO.getId().equals(vo.getSbId())){
-//                    logVOS.add(vo);
-//                }
-//            }
-//            if (logVOS.size()>1) {
-//                logVOS.sort(((o1, o2) -> {
-//                    return compareTo(o2, o1);
-//                }));
-//            }
-//            maps.put(sbInfoVO.getId(),logVOS);
-//        }
-//        for (Map.Entry<String,List<SbMeasureLogVO>> entry:maps.entrySet()){
-//            if (entry.getValue().size()>0) {
-//                String key = entry.getKey();
-//                List<SbMeasureLogVO> logVOS = entry.getValue();
-//                SbMeasureLogVO vo = logVOS.get(0);
-//                logVOS.remove(0);
-//                for (SbInfoVO sbInfoVO : sbList) {
-//                    if (sbInfoVO.getId().equals(key)) {
-//                        sbInfoVO.setSbMeasureLogCredential(vo.getSbMeasureLogCredential());
-//                        sbInfoVO.setOperator(vo.getCreatedUserName());
-//                        sbInfoVO.setOperatorContent(vo.getContent());
-//                        sbInfoVO.setOperatorType(vo.getOtherType());
-//                        sbInfoVO.setOperatorTime(vo.getCreatedTime());
-//                        sbInfoVO.setExceptionDescription(vo.getExceptionDescription());
-//                        sbInfoVO.setUpdateUserName(vo.getUpdateUserName());
-//                        sbInfoVO.setSubSbMeasureLogVO(logVOS);
-//                        break;
-//                    }
-//                }
-//            }
-//        }
+        List<String> sbIds = sbList.stream().map(SbInfoVO::getId).collect(Collectors.toList());
+        Map<String,List<SbMeasureLogVO>> maps = new HashMap<>();
+
+        SbMeasureLogDTO sbMeasureLogDTO = new SbMeasureLogDTO();
+        sbMeasureLogDTO.setSbIds(sbIds);
+        List<SbMeasureLogVO> sbMeasureLogVOS = sbMeasureLogMapper.selectList(sbMeasureLogDTO);
+        SysFileDTO sysFileDTO = new SysFileDTO();
+        sysFileDTO.setType(SysFileTypeEnum.SB_MEASURE_LOG_CREDENTIAL.getValue());
+        List<SysFile> sysFiles = sysFileService.getModelListByDTO(sysFileDTO);
+
+            for (SbMeasureLogVO sbMeasureLogVO:sbMeasureLogVOS){
+                List<SysFile> sysFileList = new ArrayList<>();
+                for (SysFile sysFile:sysFiles){
+                    if (sysFile.getTargetId().equals(sbMeasureLogVO.getId())){
+                        sysFileList.add(sysFile);
+                    }
+            }
+                sbMeasureLogVO.setSbMeasureLogCredential(sysFileList);
+        }
+        for (SbInfoVO sbInfoVO:sbList) {
+            List<SbMeasureLogVO> logVOS = new ArrayList<>();
+            for (SbMeasureLogVO vo : sbMeasureLogVOS) {
+                if (sbInfoVO.getId().equals(vo.getSbId())){
+                    logVOS.add(vo);
+                }
+            }
+            if (logVOS.size()>1) {
+                logVOS.sort(((o1, o2) -> {
+                    return compareTo(o2, o1);
+                }));
+            }
+            maps.put(sbInfoVO.getId(),logVOS);
+        }
+        for (Map.Entry<String,List<SbMeasureLogVO>> entry:maps.entrySet()){
+            if (entry.getValue().size()>0) {
+                String key = entry.getKey();
+                List<SbMeasureLogVO> logVOS = entry.getValue();
+                SbMeasureLogVO vo = logVOS.get(0);
+                logVOS.remove(0);
+                for (SbInfoVO sbInfoVO : sbList) {
+                    if (sbInfoVO.getId().equals(key)) {
+                        sbInfoVO.setSbMeasureLogCredential(vo.getSbMeasureLogCredential());
+                        sbInfoVO.setOperator(vo.getCreatedUserName());
+                        sbInfoVO.setOperatorContent(vo.getContent());
+                        sbInfoVO.setOperatorType(vo.getOtherType());
+                        sbInfoVO.setOperatorTime(vo.getCreatedTime());
+                        sbInfoVO.setExceptionDescription(vo.getExceptionDescription());
+                        sbInfoVO.setUpdateUserName(vo.getUpdateUserName());
+                        sbInfoVO.setSubSbMeasureLogVO(logVOS);
+                        break;
+                    }
+                }
+            }
+        }
 
         if (model.getUseType()!=null&&model.getUseType()==5){
             Map<String, Object> map = new HashedMap();