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-10 08:49:07 +08:00
parent b045860a43
commit 8d8eb4d274
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -438,7 +438,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
addDataSet(dataSetList, item, "历史统计数据", "history"); addDataSet(dataSetList, item, "历史统计数据", "history");
addDataSet(dataSetList, item, "历史趋势", "trenddata"); addDataSet(dataSetList, item, "历史趋势", "trenddata");
if (item.getClDev() == 0 && item.getType() == 0) { if (item.getClDev() == 0 && item.getType() == 0) {
addDataSet(dataSetList, item, "模块运行状态", "moduleData"); addDataSet(dataSetList, item, "模块数据", "moduleData");
} }
if (isPortableDevice) { if (isPortableDevice) {
// 便携式设备特有的数据集 // 便携式设备特有的数据集

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

@@ -117,7 +117,7 @@ public class EventDetailVO {
private String systemType="ZL"; private String systemType="ZL";
@ApiModelProperty("子模块编号") @ApiModelProperty("子模块编号")
private String modelNo; private String moduleNo;
@ApiModelProperty("逻辑子设备编码") @ApiModelProperty("逻辑子设备编码")

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

@@ -423,7 +423,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
temp.setShowName(ele.getShowName()); temp.setShowName(ele.getShowName());
temp.setCode(ele.getDefaultValue()); temp.setCode(ele.getDefaultValue());
if (temp.getLineId().endsWith("0")) { if (temp.getLineId().endsWith("0")) {
temp.setModelNo("模块" + temp.getClDid()); temp.setModuleNo("模块" + temp.getClDid());
} }
if(Objects.equals(csEventUserQueryPage.getType(),"0")){ if(Objects.equals(csEventUserQueryPage.getType(),"0")){