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

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]);
+    }
+}

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);
-
+            // 去除空格
-            // 去除前后空格
+            ObjectUtil.objectToTrim(data);
-            // todo
             // 根据网格名是否能找到网格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());

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.*;
-import com.epmet.dao.IcEnterpriseDao;
+import com.epmet.dto.SysDictDataDTO;
-import com.epmet.dao.IcEnterprisePatrolAttachmentDao;
-import com.epmet.dao.IcEnterprisePatrolRecordDao;
 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.*;
-import com.epmet.dto.result.EnterprisePatrolResultDTO;
-import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
-import com.epmet.dto.result.UploadImgResultDTO;
 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
+            //2、规模名称
-            Map<String, String> scaleMap=new HashMap<>();
+            Result<List<SysDictDataDTO>> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode());
-            Map<String,String> gridMap=new HashMap<>();
+            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();