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

新增一次值、二次值标识

Browse Source
This commit is contained in:
xy
2024-08-09 08:30:43 +08:00
parent 329143772b
commit 6a0e15ef84
4 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -689,18 +689,19 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
if (CollectionUtil.isNotEmpty(dataSetList)){
dataSetList.forEach(item1->{
String id = IdUtil.fastSimpleUUID();
CsDataSet CsDataSet = new CsDataSet();
CsDataSet.setId(id);
CsDataSet.setPid(pId);
CsDataSet.setName(item1.getName());
CsDataSet.setAnotherName(dataSetName(item1.getName(),code));
CsDataSet.setIdx(item1.getIdx());
CsDataSet.setPeriod(item1.getPeriod());
CsDataSet.setStoreFlag(item1.getStoreFlag());
CsDataSet.setDataList(String.join(",",templateDto.getDataList()));
CsDataSet.setType(0);
CsDataSet.setClDev(0);
setList.add(CsDataSet);
CsDataSet csDataSet = new CsDataSet();
csDataSet.setId(id);
csDataSet.setPid(pId);
csDataSet.setName(item1.getName());
csDataSet.setAnotherName(dataSetName(item1.getName(),code));
csDataSet.setIdx(item1.getIdx());
csDataSet.setPeriod(item1.getPeriod());
csDataSet.setStoreFlag(item1.getStoreFlag());
csDataSet.setDataList(String.join(",",templateDto.getDataList()));
csDataSet.setType(0);
csDataSet.setClDev(0);
csDataSet.setDataLevel(item1.getDataLevel());
setList.add(csDataSet);
List<DataArrayDto> list = item1.getDataArrayDtoList();
if(CollectionUtil.isNotEmpty(list)) {
int i = 0;
@@ -724,23 +725,24 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
if (CollectionUtil.isNotEmpty(clDataSetList)){
clDataSetList.forEach(item4->{
String id = IdUtil.fastSimpleUUID();
CsDataSet CsDataSet = new CsDataSet();
CsDataSet.setId(id);
CsDataSet.setPid(pId);
CsDataSet.setName(item4.getName());
CsDataSet.setAnotherName(dataSetName(item4.getName(),code));
CsDataSet.setIdx(item4.getIdx());
CsDataSet.setPeriod(item4.getPeriod());
CsDataSet.setStoreFlag(item4.getStoreFlag());
CsDataSet.setDataList(String.join(",",item3.getDataList()));
CsDataSet csDataSet = new CsDataSet();
csDataSet.setId(id);
csDataSet.setPid(pId);
csDataSet.setName(item4.getName());
csDataSet.setAnotherName(dataSetName(item4.getName(),code));
csDataSet.setIdx(item4.getIdx());
csDataSet.setPeriod(item4.getPeriod());
csDataSet.setStoreFlag(item4.getStoreFlag());
csDataSet.setDataList(String.join(",",item3.getDataList()));
csDataSet.setDataLevel(item4.getDataLevel());
//fixme 先用数据类型来区分模板的类型
if (item3.getDataList().contains("Apf") || item3.getDataList().contains("Dvr")){
CsDataSet.setType(1);
csDataSet.setType(1);
} else {
CsDataSet.setType(2);
csDataSet.setType(2);
}
CsDataSet.setClDev(item3.getClDid());
setList.add(CsDataSet);
csDataSet.setClDev(item3.getClDid());
setList.add(csDataSet);
List<DataArrayDto> list = item4.getDataArrayDtoList();
if(CollectionUtil.isNotEmpty(list)) {
@@ -1063,14 +1065,14 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
showName = "APF模块8数据";
break;
case "Ds$Pqd$Stat$01":
if (Objects.isNull(code)){
if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){
showName = "电网侧数据";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测1路数据";
}
break;
case "Ds$Pqd$Stat$02":
if (Objects.isNull(code)){
if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){
showName = "负载侧数据";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测2路数据";