报告调整

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -674,7 +674,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     @Override
     public List<CsLedgerVO> objTree() {
         List<CsLedgerVO> result = new ArrayList<>();
-        String userId = RequestUtil.getUserIndex();
+        String userId = "fa37b93cc90d4c1784ca8f6debddee1a";
         UserVO userVO = userFeignClient.getUserById(userId).getData();
         List<String> devIds;
         if (userVO.getType().equals(UserType.SUPER_ADMINISTRATOR) || userVO.getType().equals(UserType.ADMINISTRATOR)) {
@@ -690,8 +690,8 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         if (CollUtil.isEmpty(devIds)) {
             return result;
         }
-        List<CsLinePO> poList = csLinePOService.lambdaQuery().select(CsLinePO::getLineId).in(CsLinePO::getDeviceId, devIds)
+        List<CsLinePO> poList = csLinePOService.lambdaQuery().in(CsLinePO::getDeviceId, devIds)
-                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode()).list();
+                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode()).ne(CsLinePO::getMonitorUser,"").isNotNull(CsLinePO::getMonitorUser).list();
         if (CollUtil.isEmpty(poList)) {
             return result;
         }
@@ -702,9 +702,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         Map<String,String> objMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
 
         List<CsLedger> csLineList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, lineIds));
-        Map<String,List<String>> lineMap = csLineList.stream().collect(Collectors.groupingBy(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()],Collectors.mapping(CsLedger::getId,Collectors.toList())));
+        Map<String,List<String>> lineMap = csLineList.stream().collect(Collectors.groupingBy(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1],Collectors.mapping(CsLedger::getId,Collectors.toList())));
 
-        List<String> projectIds = csLineList.stream().map(it -> it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()]).collect(Collectors.toList());
+        List<String> projectIds = csLineList.stream().map(it -> it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).distinct().collect(Collectors.toList());
         List<CsLedger> projectList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, projectIds));
 
        List<CsLedgerVO> realProjectList = new ArrayList<>();
@@ -713,11 +713,13 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             csLedgerVO.setId(pro.getId());
             csLedgerVO.setPid(pro.getPid());
             csLedgerVO.setLevel(pro.getLevel());
+            csLedgerVO.setName(pro.getName());
 
             List<CsLedgerVO> temObjList = new ArrayList<>();
             if(lineMap.containsKey(pro.getId())){
                 List<String> ids = lineMap.get(pro.getId());
                 List<String> objTemIds = poList.stream().filter(it->ids.contains(it.getLineId())).map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(objTemIds)){
                     objTemIds.forEach(it->{
                         CsLedgerVO inner = new CsLedgerVO();
                         inner.setName(objMap.getOrDefault(it,"未知异常用户"));
@@ -726,11 +728,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                         temObjList.add(inner);
                     });
                 }
+            }
             csLedgerVO.setChildren(temObjList);
             realProjectList.add(csLedgerVO);
         });
 
-        List<String> gcIds = projectList.stream().map(it -> it.getPids().split(StrUtil.COMMA)[LineBaseEnum.ENGINEERING_LEVEL.getCode()]).collect(Collectors.toList());
+        List<String> gcIds = projectList.stream().map(CsLedger::getPid).collect(Collectors.toList());
         List<CsLedger> gcList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, gcIds));
 
         List<CsLedgerVO> realGcList = new ArrayList<>();
@@ -739,6 +742,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             csLedgerVO.setId(gc.getId());
             csLedgerVO.setPid(gc.getPid());
             csLedgerVO.setLevel(gc.getLevel());
+            csLedgerVO.setName(gc.getName());
 
             List<CsLedgerVO> proList = realProjectList.stream().filter(it->gc.getId().equals(it.getPid())).collect(Collectors.toList());
             csLedgerVO.setChildren(proList);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java

@@ -15,6 +15,7 @@ import com.njcn.access.pojo.po.CsLineLatestData;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
+import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.*;
@@ -399,9 +400,15 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             return new LineDetailDataVO();
         } else {
             CsLinePO csLinePO = this.baseMapper.selectOne(new LambdaQueryWrapper<CsLinePO>().eq(CsLinePO::getLineId,id));
+
+            CsLedger csLedger = csLedgerMapper.selectById(csLinePO.getLineId());
+
             LineDetailDataVO lineDetailDataVO = new LineDetailDataVO();
 
-            //lineDetailDataVO.setScale(dicDataFeignClient.getDicDataById(voltageMapper.selectById(voId).getScale()).getData().getName());
+            lineDetailDataVO.setScale(csLinePO.getVolGrade()+"kV");
+            lineDetailDataVO.setAreaName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.ENGINEERING_LEVEL.getCode()+1]).getName());
+            lineDetailDataVO.setBdName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).getName());
+
             //Device device = deviceMapper.selectById(devId);
             //lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag()));
             //lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag()));
@@ -413,8 +420,8 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             lineDetailDataVO.setObjName(csLinePO.getMonitorUser());
             lineDetailDataVO.setLineId(csLinePO.getLineId());
             lineDetailDataVO.setPtType(PubUtils.ptType(csLinePO.getConType()));
-            //lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2());
+            lineDetailDataVO.setPt(csLinePO.getPtRatio() + "/" + csLinePO.getPt2Ratio());
-            //lineDetailDataVO.setCt(lineDetail.getCt1() + "/" + lineDetail.getCt2());
+            lineDetailDataVO.setCt(csLinePO.getCtRatio() + "/" + csLinePO.getCt2Ratio());
             lineDetailDataVO.setDealCapacity(csLinePO.getProtocolCapacity().floatValue());
             lineDetailDataVO.setDevCapacity(csLinePO.getDevCapacity().floatValue());
             lineDetailDataVO.setShortCapacity(csLinePO.getShortCircuitCapacity().floatValue());

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/WordExportModelController.java

@@ -1523,6 +1523,9 @@ public class WordExportModelController extends BaseController {
         }
         this.listPower = new ArrayList<>();
         transformData(this.listPower, listPower, list, true, false);
+
+
+        System.out.println(5);
     }
 
     /**

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java

@@ -1126,6 +1126,7 @@ public class CustomReportServiceImpl implements CustomReportService {
             Map<String, List<ReportTemplateDTO>> classMap = reportTemplateDTOList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getResourceId));
             //定义存放越限指标的map
             Map<String, ReportTemplateDTO> assNoPassMap = new HashMap<>();
+
             classMap.forEach((classKey, templateValue) -> {
                 Map<String, List<ReportTemplateDTO>> valueTypeMap = templateValue.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getStatMethod));
                 //每张表开启一个独立线程查询
@@ -1133,6 +1134,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                     // 子线程中手动指定数据源（关键）
                     DynamicDataSourceContextHolder.push("sjzx");
                     //avg.max,min,cp95
+                    try {
                         valueTypeMap.forEach((valueTypeKey, valueTypeVal) -> {
                             //相别分组
                             Map<String, List<ReportTemplateDTO>> phaseMap = valueTypeVal.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getPhase));
@@ -1150,6 +1152,9 @@ public class CustomReportServiceImpl implements CustomReportService {
 
                             });
                         });
+                    }finally {
+                        DynamicDataSourceContextHolder.poll();
+                    }
                 }));
 
             });