bug修改

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RunManageVO.java

@@ -56,6 +56,9 @@ public class RunManageVO {
     @ApiModelProperty(name = "businessType",value = "行业类型")
     private String businessType;
 
+    @ApiModelProperty(name = "objId",value = "监测点对象id")
+    private String objId;
+
     @ApiModelProperty(name = "objName",value = "监测点对象名称")
     private String objName;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml

@@ -40,6 +40,7 @@
         end as comFlag,
         loadtypeId.Name as loadType,
         businesstypeId.name as businessType,
+        linedetail.Obj_Id as objId,
         IFNULL(linedetail.Obj_Name,'/') as objName,
         case linedetail.PT_Type
         when 0 then '星型接线'

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml

@@ -19,7 +19,7 @@
     <select id="getOnIntegrityByIds" resultType="com.njcn.device.pq.pojo.vo.RStatIntegrityVO">
         SELECT
         line_index AS lineIndex,
-        sum( real_time )/ sum( due_time )* 100 AS integrityRate
+        sum( real_time )*1.0/ sum( due_time ) * 100 AS integrityRate
         FROM
         r_stat_integrity_d
         <where>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml

@@ -6,7 +6,7 @@
         dev_index,
         sum(online_min) as onlineMin,
         sum(offline_min) as offlineMin,
-        ROUND( sum(online_min)/(sum(online_min) + sum(offline_min))*100,2) as online_rate
+        ROUND( sum(online_min)*1.0/(sum(online_min) + sum(offline_min))*100,2) as onlineRate
         from r_stat_onlinerate_d
         <where>
             <if test="param!=null and param.ids != null and param.ids.size > 0">

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -25,6 +25,9 @@ import com.njcn.device.pq.pojo.vo.TerminalLedgerVO;
 import com.njcn.device.pq.service.LineService;
 import com.njcn.device.pq.service.RunManageService;
 import com.njcn.device.pq.service.TerminalBaseService;
+import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.enums.StatisticsEnum;
@@ -68,18 +71,31 @@ public class RunManageServiceImpl implements RunManageService {
 
     private final LineDetailMapper lineDetailMapper;
 
+    private final UserLedgerFeignClient userLedgerFeignClient;
+
     @Override
     public List<RunManageVO> getLineLedger(RunManageParam runManageParam) {
+        List<RunManageVO> resultList = new ArrayList<>();
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         BeanUtil.copyProperties(runManageParam, deviceInfoParam);
         deviceInfoParam.setServerName("pqs-common");
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0,1,2).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         List<String> lineIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(lineIndexes)) {
-            return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
+            resultList = deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
-        } else {
+            if(CollUtil.isNotEmpty(resultList)){
-            return new ArrayList<>();
+                List<String> objIds = resultList.stream().map(RunManageVO::getObjId).collect(Collectors.toList());
+                Map<String,NewUserReportVO> runManageVOMap = userLedgerFeignClient.getUserReportByIds(objIds).getData().stream().collect(Collectors.toMap(NewUserReportVO::getId,Function.identity()));
+                resultList.forEach(it->{
+                    if(StrUtil.isNotBlank(it.getObjId())){
+                        if(runManageVOMap.containsKey(it.getObjId())){
+                            it.setObjName(runManageVOMap.get(it.getObjId()).getProjectName());
+                        }
+                    }
+                });
+            }
         }
+        return resultList;
     }
 
     @Override

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java

@@ -122,7 +122,6 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
         devOtherList.forEach(dev -> dev.setChildren(getChildren(dev, subvOtherList)));
 
         subList.forEach(sub -> sub.setChildren(specialDealSubChildren(sub, userLineList,devOtherList,subvUserList,devUserList,userMap.get(sub.getId()))));
-
         //subList.forEach(sub -> sub.setChildren(getChildren(sub, devList)));
         gdList.forEach(gd -> gd.setChildren(getChildren(gd, subList)));
         provinceList.forEach(province -> province.setChildren(getChildren(province, gdList)));
@@ -145,10 +144,6 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
     private List<TerminalTree> specialDealSubChildren(TerminalTree sub,List<TerminalTree> lineUserList,List<TerminalTree> devOtherList,List<TerminalTree> busBarList,List<TerminalTree> devAllList,List<UserLedgerVO> userReportPOList){
         List<TerminalTree> list = new ArrayList<>();
 
-        if("c325fb29fbf56612018a571e950ada5a".equals(sub.getId())){
-            System.out.println(666);
-        }
-
         if(CollUtil.isNotEmpty(userReportPOList)) {
             Map<String, UserLedgerVO> userLedgerVOMap = userReportPOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
 
@@ -670,7 +665,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
      * @date 2021/7/19
      */
     public List<TerminalTree> getChildren(TerminalTree item, List<TerminalTree> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
     }
 
     /**