From d73447303873f9e4f656e919e8ef6d7747e6732e Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 1 Jul 2022 16:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=8E=A5=E5=85=A5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energy/pojo/param/DataGroupParam.java | 6 ++ .../com/njcn/energy/pojo/po/DataGroup.java | 4 + .../energy/service/impl/ModelServiceImpl.java | 93 ++++++++++++++++++- .../njcn/quality/param/DataGroupParam.java | 6 ++ .../com/njcn/quality/pojo/po/DataGroup.java | 4 + .../service/impl/ModelServiceImpl.java | 32 +++++++ 6 files changed, 144 insertions(+), 1 deletion(-) diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/param/DataGroupParam.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/param/DataGroupParam.java index 27608d43b..ce6f6834f 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/param/DataGroupParam.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/param/DataGroupParam.java @@ -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; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/po/DataGroup.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/po/DataGroup.java index 7f50951a5..c985290a5 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/po/DataGroup.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/po/DataGroup.java @@ -33,6 +33,10 @@ public class DataGroup { */ private String name; + private String statMethod; + + private String phase; + private Integer sort; } diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/ModelServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/ModelServiceImpl.java index 4f9b309e4..e31879279 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/ModelServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/ModelServiceImpl.java @@ -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 list = dataSetDTO.getDataArray(); for (int i=0;i分组表 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()); diff --git a/pqs-quality/quality-api/src/main/java/com/njcn/quality/param/DataGroupParam.java b/pqs-quality/quality-api/src/main/java/com/njcn/quality/param/DataGroupParam.java index d808e2c22..7bd481a43 100644 --- a/pqs-quality/quality-api/src/main/java/com/njcn/quality/param/DataGroupParam.java +++ b/pqs-quality/quality-api/src/main/java/com/njcn/quality/param/DataGroupParam.java @@ -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; diff --git a/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/DataGroup.java b/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/DataGroup.java index 96d7b4f9c..3f1edcf5a 100644 --- a/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/DataGroup.java +++ b/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/DataGroup.java @@ -31,6 +31,10 @@ public class DataGroup { */ private String name; + private String statMethod; + + private String phase; + private Integer sort; } diff --git a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java index 05bbdb997..706440bbb 100644 --- a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java +++ b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java @@ -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 list = dataSetDTO.getDataArray(); for (int i=0;i分组表 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());