elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

master
zxc 4 years ago
parent
35e68b5b86 2b9de61853
commit
4cb11982d1
4 changed files with 45 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
  2. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
  3. 25
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
  4. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
View File

@ -138,6 +138,11 @@ public class ImportGeneralDTO implements Serializable {
private Boolean existStatus = false;
/**
* 错误信息添加状态
*/
private Boolean addStatus = false;
/**
* 楼栋重复状态
*/

18
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
View File

@ -142,10 +142,13 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
for (ImportGeneralDTO r : needDisposeList) {
if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
r.getNeighborHoodName() + "_" + r.getBuildingName())){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
if (!r.getAddStatus()){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -158,8 +161,11 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
if (!CollectionUtils.isEmpty(existList)){
existList.forEach(e -> {
nums.add(e.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
if (!e.getAddStatus()){
nums.add(e.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
e.setAddStatus(true);
}
});
}
}

25
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
View File

@ -210,13 +210,17 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
}
Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
collect.forEach((k,v) -> {
if (Integer.valueOf(v.toString()).compareTo(1) > 0){
if (Integer.valueOf(v.toString()).compareTo(1) != 0){
for (ImportGeneralDTO r : needInsertList) {
if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
// 只添加没添加过的
if (!r.getAddStatus()){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -227,10 +231,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
existHouses.forEach(e -> {
for (ImportGeneralDTO n : needInsertList) {
if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
// 库里存在的
nums.add(n.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
n.setExistStatus(true);
if (!n.getAddStatus()){
// 库里存在的
nums.add(n.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
n.setExistStatus(true);
n.setAddStatus(true);
}
}
}
});

18
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
View File

@ -136,10 +136,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
if (Integer.valueOf(v.toString()).compareTo(1) > 0){
for (ImportGeneralDTO r : needDisposeList) {
if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
if (!r.getAddStatus()){
// 集合里重复的
nums.add(r.getNum());
disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -152,8 +155,11 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
if (!CollectionUtils.isEmpty(existList)){
existList.forEach(e -> {
nums.add(e.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
if (!e.getAddStatus()){
nums.add(e.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
e.setAddStatus(true);
}
});
}
List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);

Write Preview
Loading…
Cancel
Save