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

bug调整

Browse Source
This commit is contained in:
xy
2024-08-15 13:25:56 +08:00
parent 3a05f30128
commit d808355704
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
View File

@@ -51,5 +51,7 @@ public class ProjectEquipmentVO {
private String isPrimaryUser; private String isPrimaryUser;
private Integer runStatus; private Integer runStatus;
private String mac; private String mac;
@ApiModelProperty(value = "设备nDid")
private String nDid;
} }

1
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -36,6 +36,7 @@
b.id projectId, b.id projectId,
b.name projectName, b.name projectName,
c.id equipmentId, c.id equipmentId,
c.ndid nDid,
c.name equipmentName, c.name equipmentName,
c.create_time createTime, c.create_time createTime,
c.run_status, c.run_status,

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

@@ -68,7 +68,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
commonQueryParam.setPhasic(temp.getPhase()); commonQueryParam.setPhasic(temp.getPhase());
commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime() + " 00:00:00"); commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime() + " 00:00:00");
commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime() + " 23:59:59"); commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime() + " 23:59:59");
commonQueryParam.setDataType( temp.getStatMethod()); commonQueryParam.setDataType(temp.getStatMethod());
commonQueryParam.setProcess(data1.get(0).getProcess()+""); commonQueryParam.setProcess(data1.get(0).getProcess()+"");
commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(devicDataTrendQueryParam.getLineId())); commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(devicDataTrendQueryParam.getLineId()));
EleEpdPqd epdPqd = epdFeignClient.selectByIds(Collections.singletonList(temp.getDataId())).getData().get(0); EleEpdPqd epdPqd = epdFeignClient.selectByIds(Collections.singletonList(temp.getDataId())).getData().get(0);