From faaf084b7b3c98776f6d37dc0666a26e0095e6a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Sep 2021 15:30:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemResDetailConcatResultDTO.java | 9 ++- .../impl/PrUserProjectServiceImpl.java | 79 ++++++++++--------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java index f8b5acb128..ea4bb06164 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java @@ -4,10 +4,12 @@ import lombok.Data; import java.io.Serializable; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** - * @Description TODO + * @Description 联系人组件 * @Author yinzuomei * @Date 2021/9/22 2:54 下午 */ @@ -15,11 +17,12 @@ import java.util.List; public class ItemResDetailConcatResultDTO implements Serializable { private static final long serialVersionUID = -3695200094740706700L; private List tableHeaderList; - private List> dataList; + private Map> dataMap; + //private List> dataList; public ItemResDetailConcatResultDTO(){ this.tableHeaderList=new ArrayList<>(); - this.dataList=new ArrayList<>(); + this.dataMap=new HashMap<>(); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index eeba85b869..4219fc8d2e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -617,63 +617,64 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl> dataList=new ArrayList<>(); - for(PrUserProjectResultEntity res:resultList){ - List userAnswer=new ArrayList<>(); - JSONObject originalData = JSON.parseObject(res.getOriginalData()); + Map> dataList=new HashMap<>(); + //start + for (ConcatTableHeaderDTO header : tableHeaderList) { + String mapKey=header.getFormItemId(); + List mapValue=new ArrayList<>(); - for(ConcatTableHeaderDTO header:tableHeaderList){ - String key="field".concat(header.getFormItemId()); + for (PrUserProjectResultEntity res : resultList) { + JSONObject originalData = JSON.parseObject(res.getOriginalData()); + String key = "field".concat(header.getFormItemId()); //手机号、邮箱、身份证、单行文本: INPUT - if(ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())){ - if(originalData.containsKey(key)){ - if(StringUtils.isNotBlank(originalData.get(key).toString())){ - userAnswer.add((String) originalData.get(key)); - }else{ - userAnswer.add(StrConstant.EPMETY_STR); + if (ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())) { + if (originalData.containsKey(key)) { + if (StringUtils.isNotBlank(originalData.get(key).toString())) { + mapValue.add((String) originalData.get(key)); + } else { + mapValue.add(StrConstant.EPMETY_STR); } - }else{ - log.warn("没有当前的key:,可能用户没填写吧"+key); - userAnswer.add(StrConstant.HYPHEN); + } else { + log.warn("没有当前的key:,可能用户没填写吧" + key); + mapValue.add(StrConstant.HYPHEN); } } //省市联动： PROVINCE_CITY - if(ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(header.getType())){ - if(originalData.containsKey(key)){ - List provinceCityList= (List) originalData.get(key); - if(!CollectionUtils.isEmpty(provinceCityList)){ - userAnswer.add(StringUtils.join(provinceCityList,StrConstant.HYPHEN)); - }else{ - userAnswer.add(StrConstant.EPMETY_STR); + if (ProjectItemTypeEnum.PROVINCE_CITY.getValue().equals(header.getType())) { + if (originalData.containsKey(key)) { + List provinceCityList = (List) originalData.get(key); + if (!CollectionUtils.isEmpty(provinceCityList)) { + mapValue.add(StringUtils.join(provinceCityList, StrConstant.HYPHEN)); + } else { + mapValue.add(StrConstant.EPMETY_STR); } - }else{ - log.warn("没有当前的key:,可能用户没填写吧"+key); - userAnswer.add(StrConstant.HYPHEN); + } else { + log.warn("没有当前的key:,可能用户没填写吧" + key); + mapValue.add(StrConstant.HYPHEN); } } //地理位置：INPUT_MAP - if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(header.getType())){ - if(originalData.containsKey(key)){ - List inputMap= (List) originalData.get(key); - log.info("地理位置："+JSON.toJSONString(inputMap,true)); + if (ProjectItemTypeEnum.INPUT_MAP.getValue().equals(header.getType())) { + if (originalData.containsKey(key)) { + List inputMap = (List) originalData.get(key); + log.info("地理位置：" + JSON.toJSONString(inputMap, true)); if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) { - userAnswer.add(inputMap.get(2)); - }else{ - userAnswer.add(StrConstant.EPMETY_STR); + mapValue.add(inputMap.get(2)); + } else { + mapValue.add(StrConstant.EPMETY_STR); } - }else{ - log.warn("没有当前的key:,可能用户没填写吧"+key); - userAnswer.add(StrConstant.HYPHEN); + } else { + log.warn("没有当前的key:,可能用户没填写吧" + key); + mapValue.add(StrConstant.HYPHEN); } } - } - dataList.add(userAnswer); - } + dataList.put(mapKey,mapValue); + }//end resultDTO.setTableHeaderList(tableHeaderList); - resultDTO.setDataList(dataList); + resultDTO.setDataMap(dataList); return resultDTO; } From 22cf09fb820a19eb4b2c67d9545a5f43d9d70949 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Sep 2021 15:46:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemResDetailConcatResultDTO.java | 5 +-- .../impl/PrUserProjectServiceImpl.java | 42 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java index ea4bb06164..8bb7fb8ccc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serializable; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,12 +16,12 @@ import java.util.Map; public class ItemResDetailConcatResultDTO implements Serializable { private static final long serialVersionUID = -3695200094740706700L; private List tableHeaderList; - private Map> dataMap; + private List> dataMap; //private List> dataList; public ItemResDetailConcatResultDTO(){ this.tableHeaderList=new ArrayList<>(); - this.dataMap=new HashMap<>(); + this.dataMap=new ArrayList<>(); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 4219fc8d2e..1030c10c32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -617,27 +617,25 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl> dataList=new HashMap<>(); - //start - for (ConcatTableHeaderDTO header : tableHeaderList) { - String mapKey=header.getFormItemId(); - List mapValue=new ArrayList<>(); - - for (PrUserProjectResultEntity res : resultList) { - JSONObject originalData = JSON.parseObject(res.getOriginalData()); - String key = "field".concat(header.getFormItemId()); + List> dataMap=new ArrayList<>(); + for (PrUserProjectResultEntity res : resultList) { + JSONObject originalData = JSON.parseObject(res.getOriginalData()); + Map mapUnit=new HashMap<>(); + //start + for (ConcatTableHeaderDTO header : tableHeaderList) { + String key = "field".concat(header.getFormItemId()); //手机号、邮箱、身份证、单行文本: INPUT if (ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())) { if (originalData.containsKey(key)) { if (StringUtils.isNotBlank(originalData.get(key).toString())) { - mapValue.add((String) originalData.get(key)); + mapUnit.put(header.getFormItemId(),(String) originalData.get(key)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } //省市联动： PROVINCE_CITY @@ -645,13 +643,13 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl provinceCityList = (List) originalData.get(key); if (!CollectionUtils.isEmpty(provinceCityList)) { - mapValue.add(StringUtils.join(provinceCityList, StrConstant.HYPHEN)); + mapUnit.put(header.getFormItemId(),StringUtils.join(provinceCityList, StrConstant.HYPHEN)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } @@ -661,20 +659,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl inputMap = (List) originalData.get(key); log.info("地理位置：" + JSON.toJSONString(inputMap, true)); if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) { - mapValue.add(inputMap.get(2)); + mapUnit.put(header.getFormItemId(),inputMap.get(2)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } - } - dataList.put(mapKey,mapValue); - }//end + }//end + dataMap.add(mapUnit); + } resultDTO.setTableHeaderList(tableHeaderList); - resultDTO.setDataMap(dataList); + resultDTO.setDataMap(dataMap); return resultDTO; }