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

数据模板调整

Browse Source
This commit is contained in:
xuyang
2023-09-12 13:14:54 +08:00
parent 0e57b01326
commit 90cd11a1de
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
View File

@@ -64,4 +64,11 @@ public class CsEventPO extends BaseEntity {
*/
@TableField(value = "type")
private Integer type;
/**
* 逻辑子设备id
* 电能质量设备是监测点、治理设备是各个模块
*/
@TableField(value = "cl_did")
private Integer clDid;
}

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

@@ -86,13 +86,13 @@ public class LineTargetServiceImpl implements ILineTargetService {
modelId = devModelRelationFeignClient.getModelByType(devId,0).getData();
dataSetList = dataSetFeignClient.getDataSet(modelId,0).getData();
}
//负载侧监测点
else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
//电网侧监测点
else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
modelId = devModelRelationFeignClient.getModelByType(devId,1).getData();
dataSetList = dataSetFeignClient.getDataSet(modelId,1).getData();
}
//电网侧监测点
else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
//负载侧监测点
else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
modelId = devModelRelationFeignClient.getModelByType(devId,1).getData();
dataSetList = dataSetFeignClient.getDataSet(modelId,2).getData();
}
@@ -149,9 +149,9 @@ public class LineTargetServiceImpl implements ILineTargetService {
String areaCode = dicDataFeignClient.getDicDataById(position).getData().getCode();
if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){
clDid = "0";
} else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
clDid = "1";
} else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){
clDid = "1";
} else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
clDid = "2";
}
return clDid;