elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

dev
jianjun 3 years ago
parent
759ada7236 ca40bfca12
commit
b74a7d5ab1
5 changed files with 54 additions and 23 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. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
  3. 27
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
  4. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
  5. 5
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

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;
/**
* 楼栋重复状态
*/

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

@ -142,10 +142,14 @@ 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());
BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -158,8 +162,12 @@ 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());
BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class);
disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
e.setAddStatus(true);
}
});
}
}

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

@ -210,13 +210,18 @@ 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());
HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(r, HouseInfoModel.class);
disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -227,10 +232,14 @@ 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());
HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(n, HouseInfoModel.class);
disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
n.setExistStatus(true);
n.setAddStatus(true);
}
}
}
});

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

@ -136,10 +136,14 @@ 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());
NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
}
}
}
@ -152,8 +156,12 @@ 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());
NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(e, NeighborHoodInfoModel.class);
disposeErrorMsg(neighborHoodInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
e.setAddStatus(true);
}
});
}
List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);

5
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
View File

@ -756,10 +756,11 @@
cg.mobile,
<!-- 网格没有经纬度时获取客户根组织下的 -->
IFNULL(cg.longitude,ca.longitude) longitude,
IFNULL(cg.latitude,ca.latitude) latitude
IFNULL(cg.latitude,ca.latitude) latitude,
ca.ORGANIZATION_NAME agencyName
FROM
customer_grid cg
INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id)
WHERE
cg.del_flag = '0'
AND ca.del_flag = '0'

Write Preview
Loading…
Cancel
Save