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-07-01 16:04:19 +08:00
parent 4eac5c3028
commit d734473038
6 changed files with 144 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/param/DataGroupParam.java
View File

@@ -22,6 +22,12 @@ public class DataGroupParam {
@ApiModelProperty(value = "分组名称")
private String name;
@ApiModelProperty(value = "统计方式")
private String statMethod;
@ApiModelProperty(value = "相别")
private String phase;
@ApiModelProperty(value = "排序")
private Integer sort;

4
pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/po/DataGroup.java
View File

@@ -33,6 +33,10 @@ public class DataGroup {
*/
private String name;
private String statMethod;
private String phase;
private Integer sort;
}

93
pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/ModelServiceImpl.java
View File

@@ -671,6 +671,7 @@ public class ModelServiceImpl implements IModelService {
DataSet dataSet = dataSetService.add(dataSetParam);
//入库->ele_data_array
if (!CollectionUtils.isEmpty(dataSetDTO.getDataArray())){
int sort = 0;
List<DataArrayDTO> list = dataSetDTO.getDataArray();
for (int i=0;i<list.size();i++){
DataGroupParam dataGroupParam = new DataGroupParam();
@@ -681,7 +682,6 @@ public class ModelServiceImpl implements IModelService {
dataArrayParam.setSort(list.get(i).getIdx());
switch (list.get(i).getType()) {
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());
dataArrayParam.setClassName("ele_epd_pqd");
dataArrayParam.setDataId(epd.getId());
@@ -694,9 +694,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -706,9 +709,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -724,9 +730,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -736,9 +745,89 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
}
}
}
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");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(pqd.getPhase());
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");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(pqd.getPhase());
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);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(pqd.getPhase());
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);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(pqd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -862,6 +951,8 @@ public class ModelServiceImpl implements IModelService {
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase("M");
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());

6
pqs-quality/quality-api/src/main/java/com/njcn/quality/param/DataGroupParam.java
View File

@@ -22,6 +22,12 @@ public class DataGroupParam {
@ApiModelProperty(value = "分组名称")
private String name;
@ApiModelProperty(value = "统计方式")
private String statMethod;
@ApiModelProperty(value = "相别")
private String phase;
@ApiModelProperty(value = "排序")
private Integer sort;

4
pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/DataGroup.java
View File

@@ -31,6 +31,10 @@ public class DataGroup {
*/
private String name;
private String statMethod;
private String phase;
private Integer sort;
}

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

@@ -672,6 +672,7 @@ public class ModelServiceImpl implements IModelService {
DataSet dataSet = dataSetService.add(dataSetParam);
//入库->ele_data_array
if (!CollectionUtils.isEmpty(dataSetDTO.getDataArray())){
int sort = 0;
List<DataArrayDTO> list = dataSetDTO.getDataArray();
for (int i=0;i<list.size();i++){
DataGroupParam dataGroupParam = new DataGroupParam();
@@ -694,9 +695,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -706,9 +710,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -724,9 +731,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -736,9 +746,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(epd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(epd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -759,9 +772,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(pqd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -771,9 +787,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase(pqd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -789,9 +808,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(j + "次" + pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(pqd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -801,9 +823,12 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(pqd.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
dataGroupParam.setPhase(pqd.getPhase());
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -819,10 +844,12 @@ public class ModelServiceImpl implements IModelService {
BeanUtil.copyProperties(md,dataArrayParam);
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod("avg");
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setName(md.getAnotherName());
dataGroupParam.setStatMethod("avg");
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());
@@ -835,9 +862,11 @@ public class ModelServiceImpl implements IModelService {
dataGroupParam.setName(md.getAnotherName());
dataArrayParam.setIdx(i);
dataArrayParam.setStatMethod(s);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod(s);
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId());
@@ -924,9 +953,12 @@ public class ModelServiceImpl implements IModelService {
}
if (!Objects.equals(list.get(i).getType(),DataType.EPD) && !Objects.equals(list.get(i).getType(),DataType.PQD) && !Objects.equals(list.get(i).getType(),DataType.MD)){
dataArrayParam.setIdx(i);
dataArrayParam.setSort(sort++);
DataArray dataArray = dataArrayService.addDataArray(dataArrayParam);
//入库->分组表
dataGroupParam.setSort(i);
dataGroupParam.setStatMethod("avg");
dataGroupParam.setPhase("M");
DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam);
//入库->group和dataArray关系
groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId());