Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
xy
2025-07-15 18:45:09 +08:00
parent ffb6ead753
commit 0fe80e12b5
3 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/param/StatisticsDataParam.java
View File

@@ -23,6 +23,8 @@ public class StatisticsDataParam implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private String endTime; private String endTime;
private Integer process;
private List<String> idList; private List<String> idList;
} }

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
View File

@@ -316,7 +316,7 @@ public class DataServiceImpl implements IDataService {
if (Objects.equals(last.getDataType(),0)) { if (Objects.equals(last.getDataType(),0)) {
moduleVO.setModuleState(last.getStateDesc()); moduleVO.setModuleState(last.getStateDesc());
} else if (Objects.equals(last.getDataType(),1)) { } else if (Objects.equals(last.getDataType(),1)) {
moduleVO.setModuleState(Objects.equals(last.getStateDesc(),"Alm_Apf_ModDisConnect") ? "离线" : "运行"); moduleVO.setModuleState(Objects.equals(last.getEventCode(),"Alm_Apf_ModDisConnect") ? "离线" : "运行");
} }
} }
moduleVO.setModOutList(list2); moduleVO.setModOutList(list2);

11
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
View File

@@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -94,8 +91,10 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
//获取装置 //获取装置
List<CsEquipmentDeliveryPO> equipmentDeliveryList = equipmentFeignClient.getAll().getData(); List<CsEquipmentDeliveryPO> equipmentDeliveryList = equipmentFeignClient.getAll().getData();
if (CollectionUtil.isNotEmpty(equipmentDeliveryList)) { if (CollectionUtil.isNotEmpty(equipmentDeliveryList)) {
List<CsEquipmentDeliveryPO> processList = equipmentDeliveryList.stream().filter(item-> Objects.equals(item.getProcess(),param.getProcess())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(processList)) {
//获取监测点集合 //获取监测点集合
List<String> devList = equipmentDeliveryList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList()); List<String> devList = processList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
List<CsLinePO> csLineList = csLineFeignClient.getLinesByDevList(devList).getData(); List<CsLinePO> csLineList = csLineFeignClient.getLinesByDevList(devList).getData();
if (CollectionUtil.isNotEmpty(csLineList)) { if (CollectionUtil.isNotEmpty(csLineList)) {
Map<String,List<CsLinePO>> devMap = csLineList.stream().collect(Collectors.groupingBy(CsLinePO::getDeviceId)); Map<String,List<CsLinePO>> devMap = csLineList.stream().collect(Collectors.groupingBy(CsLinePO::getDeviceId));
@@ -157,6 +156,8 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
} }
} }
}
return result; return result;
} }