Browse Source

Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

master
wangxianzhang 3 years ago
parent
commit
fecdc20494
  1. 66
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java
  2. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java
  3. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java
  4. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java
  5. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java
  6. 14
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
  7. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
  8. 27
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
  9. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx

66
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java

@ -0,0 +1,66 @@
package com.epmet.commons.tools.utils;
import java.util.*;
import java.lang.reflect.Field;
public class ObjectUtil {
/**
* 对象字符串属性去空格
*/
public static void objectToTrim(Object object) {
Map<String,String> map = new HashMap<>();
Field[] fields = getAllFields(object);
for (Field field : fields){
String type = field.getType().getCanonicalName();
if ("java.lang.String".equals(type)){
field.setAccessible(true);
Object getObject = null;
try {
getObject = field.get(object);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
if (getObject != null) {
String trim = getObject.toString().replace(" ","");
map.put(field.getName(), trim);
}
}
}
for (Field field : fields) {
if (map.get(field.getName()) != null){
String s = map.get(field.getName());
field.setAccessible(true);
try {
field.set(object, s);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
}
/**
* 获取子类和父类所有字段信息
*/
private static Field[] getAllFields(Object object) {
Class clazz = object.getClass();
List<Field[]> fieldsList = new ArrayList<>(); // 保存属性对象数组到列表
while (clazz != null) { // 遍历所有父类字节码对象
Field[] declaredFields = clazz.getDeclaredFields(); // 获取字节码对象的属性对象数组
fieldsList.add(declaredFields);
clazz = clazz.getSuperclass(); // 获得父类的字节码对象
}
List<Field> allFields = new ArrayList<>();
for (Field[] fields : fieldsList) {
allFields.addAll(Arrays.asList(fields));
}
return allFields.toArray(new Field[0]);
}
}

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java

@ -138,7 +138,7 @@ public class IcCityManagementController implements ResultDataResolver {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
try {
String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx";
String fileName = "城市管理" + DateUtils.format(new Date()) + ".xlsx";
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcCityManagementExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcCityManagementListResultDTO> data = null;
@ -200,8 +200,8 @@ public class IcCityManagementController implements ResultDataResolver {
ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_CITY_MANAGEMENT),
ServiceConstant.EPMET_COMMON_SERVICE,
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
"excel导入优势资源管理信息错误",
"导入势资源管理信息失败");
"excel导入城市管理信息错误",
"导入城市管理信息失败");
// 3.执行导入
icCityManagementService.importExcel(fileSavePath, rstData.getTaskId());

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java

@ -141,7 +141,7 @@ public class IcDangerousChemicalsController {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
try {
String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx";
String fileName = "重点危化管理" + DateUtils.format(new Date()) + ".xlsx";
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcDangerousChemicalsExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcDangerousChemicalsListResultDTO> data = null;

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java

@ -139,7 +139,7 @@ public class IcPublicServiceController implements ResultDataResolver {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
try {
String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx";
String fileName = "公共服务管理" + DateUtils.format(new Date()) + ".xlsx";
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPublicServiceExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcPublicServiceListResultDTO> data = null;
@ -179,7 +179,7 @@ public class IcPublicServiceController implements ResultDataResolver {
fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName));
} catch (IOException e) {
String errorMsg = ExceptionUtils.getErrorStackTrace(e);
log.error("【优势资源管理导入】创建临时存储文件失败:{}", errorMsg);
log.error("【公共服务管理导入】创建临时存储文件失败:{}", errorMsg);
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败");
}
@ -201,8 +201,8 @@ public class IcPublicServiceController implements ResultDataResolver {
ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PUBLIC_SERVICE),
ServiceConstant.EPMET_COMMON_SERVICE,
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
"excel导入优势资源管理信息错误",
"导入势资源管理信息失败");
"excel导入公共服务管理信息错误",
"导入公共服务管理信息失败");
// 3.执行导入
icPublicServiceService.importExcel(fileSavePath, rstData.getTaskId());

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java

@ -202,7 +202,7 @@ public class IcSuperiorResourceController implements ResultDataResolver {
ServiceConstant.EPMET_COMMON_SERVICE,
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
"excel导入优势资源管理信息错误",
"导入势资源管理信息失败");
"导入势资源管理信息失败");
// 3.执行导入
icSuperiorResourceService.importExcel(fileSavePath, rstData.getTaskId());

14
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java

@ -7,6 +7,7 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.ValidateException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.ObjectUtil;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.entity.IcEnterpriseEntity;
import com.epmet.excel.EnterpriseImportExcelDTO;
@ -57,11 +58,12 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
try {
// 不能为空先校验数据
ValidatorUtils.validateEntity(data);
// 去除前后空格
// todo
// 去除空格
ObjectUtil.objectToTrim(data);
// 根据网格名是否能找到网格id
// todo
if (!gridMap.containsKey(data.getGridName())) {
throw new ValidateException(String.format("您所在的组织,%s不存在", data.getGridName()));
}
if(!placeTypeMap.containsKey(data.getPlaceTypeName())){
throw new ValidateException(String.format("%s场所类型不存在",data.getPlaceTypeName()));
}
@ -71,7 +73,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
IcEnterpriseEntity enterpriseEntity = ConvertUtils.sourceToTarget(data, IcEnterpriseEntity.class);
enterpriseEntity.setCustomerId(currentCustomerId);
//网格id
enterpriseEntity.setGridId("todo");
enterpriseEntity.setGridId(gridMap.get(data.getGridName()));
enterpriseEntity.setAgencyId(staffInfo.getAgencyId());
enterpriseEntity.setAgencyPids(staffInfo.getAgencyPIds());
@ -93,7 +95,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
errorMsg = ((ValidateException) e).getMsg();
} else {
errorMsg = "未知错误";
log.error("【公共服务管理导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
log.error("【企事业单位导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
}
EnterpriseImportExcelDTO.ErrorRow errorRow = new EnterpriseImportExcelDTO.ErrorRow();
errorRow.setPlaceTypeName(data.getPlaceTypeName());

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@ -104,7 +104,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
//企业类别字典数据
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "dangerous_chemicals");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
for (IcDangerousChemicalsListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {

27
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@ -21,18 +21,13 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.FileUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcCoverageCategoryDictDao;
import com.epmet.dao.IcEnterpriseDao;
import com.epmet.dao.IcEnterprisePatrolAttachmentDao;
import com.epmet.dao.IcEnterprisePatrolRecordDao;
import com.epmet.dao.*;
import com.epmet.dto.SysDictDataDTO;
import com.epmet.dto.form.EnterpriseFormDTO;
import com.epmet.dto.form.EnterprisePageFormDTO;
import com.epmet.dto.form.EnterprisePatrolFormDTO;
import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.result.EnterpriseDetailDTO;
import com.epmet.dto.result.EnterprisePatrolResultDTO;
import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.IcEnterpriseEntity;
import com.epmet.entity.IcEnterprisePatrolAttachmentEntity;
import com.epmet.entity.IcEnterprisePatrolRecordEntity;
@ -92,6 +87,8 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
@Autowired
private CoverageService coverageService;
@Autowired
private CustomerGridDao customerGridDao;
/**
* 企事业单位巡查新增/编辑
@ -290,11 +287,19 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
//获取当前登录用户所属组织id
CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId);
//1、查询 ic_coverage_category_dict 注意key:场所的名称 value:编码
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode());
Map<String, String> placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue));
//todo
Map<String, String> scaleMap=new HashMap<>();
Map<String,String> gridMap=new HashMap<>();
//2、规模名称
Result<List<SysDictDataDTO>> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode());
Map<String, String> scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel,SysDictDataDTO::getDictValue)) : new HashMap<>();
//3、当前工作人员所属组织下的网格列表
List<GridListResultDTO> gridList = customerGridDao.selectGridList(staffInfo.getAgencyId());
if (CollectionUtils.isEmpty(gridList)) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下没有网格", "当前组织下没有直属网格");
}
Map<String,String> gridMap=gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName,GridListResultDTO::getGridId));
IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap);
EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(2).sheet(0).doRead();

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx

Binary file not shown.
Loading…
Cancel
Save