物接入代码调整
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user