Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

电能量物接入-代码调整

Browse Source
This commit is contained in:
xuyang
2022-06-30 20:09:02 +08:00
parent 045683dc43
commit 7affd72b1d
2 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/EleDo.java
View File

@@ -24,16 +24,10 @@ public class EleDo {
private Integer idx; private Integer idx;
private Integer storeFlag;
private Integer curSts; private Integer curSts;
private Integer ctlSts;
private String classId; private String classId;
private String statMethod;
private String tranRule;
private Integer tranFlag;
} }

66
pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java
View File

@@ -682,7 +682,6 @@ public class ModelServiceImpl implements IModelService {
dataArrayParam.setSort(list.get(i).getIdx()); dataArrayParam.setSort(list.get(i).getIdx());
switch (list.get(i).getType()) { switch (list.get(i).getType()) {
case DataType.EPD: case DataType.EPD:
case DataType.PQD:
EleEpdPqd epd = eleEpdPqdService.findByName(item.getEpd().get(list.get(i).getIdx()).getName(),item.getEpd().get(list.get(i).getIdx()).getPhase()); EleEpdPqd epd = eleEpdPqdService.findByName(item.getEpd().get(list.get(i).getIdx()).getName(),item.getEpd().get(list.get(i).getIdx()).getPhase());
dataArrayParam.setClassName("ele_epd_pqd"); dataArrayParam.setClassName("ele_epd_pqd");
dataArrayParam.setDataId(epd.getId()); dataArrayParam.setDataId(epd.getId());
@@ -747,6 +746,71 @@ public class ModelServiceImpl implements IModelService {
} }
} }
break; break;
case DataType.PQD:
EleEpdPqd pqd = eleEpdPqdService.findByName(item.getPqd().get(list.get(i).getIdx()).getName(),item.getPqd().get(list.get(i).getIdx()).getPhase());
dataArrayParam.setClassName("ele_epd_pqd");
dataArrayParam.setDataId(pqd.getId());
if (StringUtils.isBlank(pqd.getStatMethod())){
if (!Objects.isNull(pqd.getHarmStart()) && !Objects.isNull(pqd.getHarmEnd())){
for (int j=pqd.getHarmStart(); j<=pqd.getHarmEnd(); j++){
BeanUtil.copyProperties(pqd,dataArrayParam);
dataArrayParam.setName(pqd.getName() + j);
dataArrayParam.setAnotherName(j + "次" + pqd.getAnotherName());
dataGroupParam.setName(j + "次" + pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
}
} else {
BeanUtil.copyProperties(pqd,dataArrayParam);
dataGroupParam.setName(pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
}
} else {
String[] type = StringUtils.split(pqd.getStatMethod(), ",");
for (String s : type) {
if (!Objects.isNull(pqd.getHarmStart()) && !Objects.isNull(pqd.getHarmEnd())) {
for (int j = pqd.getHarmStart(); j <= pqd.getHarmEnd(); j++) {
BeanUtil.copyProperties(pqd, dataArrayParam);
dataArrayParam.setName(pqd.getName() + j);
dataArrayParam.setAnotherName(j + "次" + pqd.getAnotherName());
dataGroupParam.setName(j + "次" + pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
}
} else {
BeanUtil.copyProperties(pqd, dataArrayParam);
dataGroupParam.setName(pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
}
}
}
break;
case DataType.MD: case DataType.MD:
EleMd md = eleMdService.findByName(item.getMd().get(list.get(i).getIdx()).getName(),item.getMd().get(list.get(i).getIdx()).getPhase()); EleMd md = eleMdService.findByName(item.getMd().get(list.get(i).getIdx()).getName(),item.getMd().get(list.get(i).getIdx()).getPhase());
if (StringUtils.isBlank(md.getStatMethod())){ if (StringUtils.isBlank(md.getStatMethod())){