rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

错误信息具体化

dev
zxc 4 years ago
parent
38f340b37c
commit
23fecfa3a6
4 changed files with 51 additions and 45 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. 14
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
  2. 28
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
  3. 32
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
  4. 22
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

14
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
View File

@ -9,14 +9,16 @@ public interface ImportErrorMsgConstants {
String EXIST_ERROR = "数据已存在";
String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租的值未填写，或者所填写信息在系统中未找到";
String DOCUMENT_EXIST_ERROR = "文件中存在重复数据";
String BUILDING_ERROR = "所属组织、所属网格、所属小区、楼栋类型、单元数的值未填写，或者所填写信息在系统中未找到";
String BELONG_GRID_ERROR = "所属网格的值未填写或者所填写信息在系统中未找到";
String NEIGHBOR_HOOD_ERROR = "所属组织、所属网格、详细地址的值未填写，或者所填写信息在系统中未找到";
String BELONG_AGENCY_ERROR = "所属组织的值未填写或者所填写信息在系统中未找到";
String HOUSE_ERROR_NAME = "导入失败的列表-房屋";
String BUILDING_ERROR_NAME = "导入失败的列表-楼宇";
String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区";
String HOUSE_TYPE_ERROR = "房屋类型的值未填写或者所填写信息在系统中未找到";
String BUILDING_TYPE_ERROR = "楼栋类型的值未填写或者所填写信息在系统中未找到";
String NEIGHBORHOOD_TYPE_ERROR = "小区名称的值未填写或者所填写信息在系统中未找到";
}

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

@ -30,6 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.epmet.constant.ImportErrorMsgConstants.*;
/**
* @Author zxc
* @DateTime 2022/2/15 10:06 上午
@ -117,7 +119,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
// 应产品要求添加
if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BUILDING_TYPE_ERROR);
return;
}
dto.setType(BuildingTypeEnums.getKeyByValue(dto.getType()));
@ -150,7 +152,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
// 集合里重复的
nums.add(r.getNum());
BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
disposeErrorMsg(buildingInfoModel,DOCUMENT_EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
@ -231,19 +233,19 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
//排除不是本小区的
if (!dto.getNeighborHoodName().equals(neighborHoodGeneralDTO.getNeighborHoodName())){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,"所属小区的值未填写或者所填写信息在系统中未找到");
}else {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BELONG_GRID_ERROR);
return;
}
// 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
(!gridInfo.getAgencyName().equals(dto.getAgencyName()) && gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setNeighborHoodId(formDTO.getOrgId());
@ -252,7 +254,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -273,13 +275,13 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BELONG_GRID_ERROR);
return;
}
//排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
}else {
//
dto.setGridId(formDTO.getOrgId());
@ -287,7 +289,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -308,21 +310,21 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
//排除不是本组织的
if (!dto.getAgencyName().equals(agencyName)){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,BELONG_AGENCY_ERROR);
}else {
// 根据组织查询出所有网格，甩出不是本组织下的网格
gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
if (null == gridInfos){
// 组织下确实不存在网格
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
// 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
if (null == cacheGridName){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setGridId(cacheGridName.toString());
@ -330,7 +332,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());

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

@ -36,6 +36,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.epmet.constant.ImportErrorMsgConstants.*;
/**
* @Author zxc
* @DateTime 2022/2/13 1:25 下午
@ -163,7 +165,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
if (StringUtils.isNotBlank(dto.getHouseType()) ){
if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
nums.add(num);
disposeErrorMsg(info,"房屋类型的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info,HOUSE_TYPE_ERROR);
return;
}
}
@ -229,7 +231,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
if (!r.getAddStatus()){
nums.add(r.getNum());
info = ConvertUtils.sourceToTarget(r,HouseInfoModel.class);
disposeErrorMsg(info,"文件中存在重复数据");
disposeErrorMsg(info,DOCUMENT_EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
@ -302,7 +304,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_GRID_ERROR);
return;
}
// 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
@ -310,7 +312,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
|| (!gridInfo.getGridName().equals(dto.getGridName())&&buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))
|| (!gridInfo.getAgencyName().equals(dto.getAgencyName())&&gridInfo.getGridName().equals(dto.getGridName())&&buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setBuildingId(formDTO.getOrgId());
@ -320,7 +322,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -358,14 +360,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_GRID_ERROR);
return;
}
// 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
(!gridInfo.getAgencyName().equals(dto.getAgencyName()) && gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setNeighborHoodId(formDTO.getOrgId());
@ -374,7 +376,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -395,13 +397,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_GRID_ERROR);
return;
}
//排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
}else {
//
dto.setGridId(formDTO.getOrgId());
@ -409,7 +411,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -430,21 +432,21 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
//排除不是本组织的
if (!dto.getAgencyName().equals(agencyName)){
nums.add(num);
disposeErrorMsg(info,"所属组织的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info,BELONG_AGENCY_ERROR);
}else {
// 根据组织查询出所有网格，甩出不是本组织下的网格
gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
if (null == gridInfos){
// 组织下确实不存在网格
nums.add(num);
disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
// 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
if (null == cacheGridName){
nums.add(num);
disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setGridId(cacheGridName.toString());
@ -452,7 +454,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
disposeErrorMsg(info, BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());

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

@ -33,6 +33,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.epmet.constant.ImportErrorMsgConstants.*;
/**
* @Author zxc
* @DateTime 2022/2/15 2:16 下午
@ -84,11 +86,10 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
}
info = data;
num = num + NumConstant.ONE;
log.info("读数据"+num);
if (StringUtils.isBlank(data.getNeighborHoodName()) ||
StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,NEIGHBORHOOD_TYPE_ERROR);
return;
}
if(StringUtils.isBlank(data.getAgencyName())){
@ -123,7 +124,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
if (num%NumConstant.ONE_HUNDRED == NumConstant.ZERO){
finalDispose();
}
log.info("读数据"+num+"完毕");
}
public void finalDispose(){
@ -140,7 +140,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
// 集合里重复的
nums.add(r.getNum());
NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
disposeErrorMsg(neighborHoodInfoModel, DOCUMENT_EXIST_ERROR);
r.setExistStatus(true);
r.setAddStatus(true);
}
@ -219,13 +219,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
//排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
}else {
//
dto.setGridId(formDTO.getOrgId());
@ -233,7 +233,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());
@ -253,21 +253,21 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
//排除不是本组织的
if (!dto.getAgencyName().equals(agencyName)){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_AGENCY_ERROR);
}else {
// 根据组织查询出所有网格，甩出不是本组织下的网格
gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
if (null == gridInfos){
// 组织下确实不存在网格
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
// 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
if (null == cacheGridName){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_GRID_ERROR);
return;
}
dto.setGridId(cacheGridName.toString());
@ -275,7 +275,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
disposeErrorMsg(info,BELONG_AGENCY_ERROR);
return;
}
dto.setPid(agencyInfo.getPid());

Write Preview
Loading…
Cancel
Save