添加表单配置枚举类 IcFormCodeEnum

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IcFormCodeEnum.java

@@ -0,0 +1,46 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * desc：数字社区平台-表单配置枚举类
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum IcFormCodeEnum {
+	/**
+	 * 表单code枚举
+	 */
+	RESI_BASE_INFO("resi_base_info", "居民信息"),
+
+	;
+
+	private String code;
+	private String name;
+
+
+
+	IcFormCodeEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+	public static IcFormCodeEnum getEnum(String code) {
+		IcFormCodeEnum[] values = IcFormCodeEnum.values();
+		for (IcFormCodeEnum value : values) {
+			if (value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java

@@ -16,6 +16,9 @@ public class CustomerFormQueryDTO implements Serializable {
     // 获取表单相关信息
     public interface GetFormInfoGroup {}
 
+    /**
+     * @see com.epmet.commons.tools.enums.IcFormCodeEnum
+     */
     @NotBlank(message = "formCode不能为空,居民信息默认传:resi_base_info",groups = { AddUserInternalGroup.class, GetFormInfoGroup.class} )
     private String formCode;
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java

@@ -47,6 +47,8 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 
     /**
      * ic_form.form_code，举例：resi_base_info
+	 * @see com.epmet.commons.tools.enums.IcFormCodeEnum
+	 *
      */
 	private String formCode;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -21,6 +22,6 @@ public class DelIcResiUserFormDTO implements Serializable {
     private String icResiUserId;
     @NotBlank(message = "token获取的customerId不能为空", groups = IdGroup.class)
     private String customerId;
-    private String formCode="resi_base_info";
+    private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode();
 }
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DynamicQueryFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -14,7 +15,7 @@ import java.util.List;
 @Data
 public class DynamicQueryFormDTO implements Serializable {
     private String customerId;
-    private String formCode="resi_base_info";
+    private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode();
     @NotBlank(message = "resultTableName不能为空")
     private String resultTableName;
     private List<ResiUserQueryValueDTO> conditions;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -91,9 +92,6 @@ import java.util.stream.Collectors;
 @RequestMapping("icresiuser")
 public class IcResiUserController {
 
-    //todo 枚举吧
-    private static final String IC_RESI_FORM_CODE = "resi_base_info";
-
     /**
      * 居民上传临时目录
      */
@@ -312,7 +310,7 @@ public class IcResiUserController {
             Set<String> stopSearchSet = new HashSet<>();
 
             //获取表单项
-            List<FormItemResult> resiFormAllItems = icResiUserService.listFormItems(customerId, IC_RESI_FORM_CODE);
+            List<FormItemResult> resiFormAllItems = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode());
             Map<String, FormItemResult> allItemMap = resiFormAllItems.stream().collect(Collectors.toMap(FormItemResult::getItemId, o -> o));
             Map<String, ExportResiUserItemDTO> map = new HashMap<>();
             allItemMap.values().forEach(item->{
@@ -436,7 +434,7 @@ public class IcResiUserController {
             savePath = IC_RESI_UPLOAD_DIR.resolve(fileName);
 
             IOUtils.copy(file.getInputStream(), new FileOutputStream(savePath.toString()));
-            List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId,IC_RESI_FORM_CODE);
+            List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId,IcFormCodeEnum.RESI_BASE_INFO.getCode());
             icResiUserImportService.importIcResiInfoFromExcel(formItemList, savePath.toString(), response);
         } catch (IOException e) {
             String errorMsg = ExceptionUtils.getErrorStackTrace(e);
@@ -444,7 +442,9 @@ public class IcResiUserController {
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } finally {
             try {
-                Files.delete(savePath);
+                if (savePath != null){
+                    Files.delete(savePath);
+                }
             } catch (IOException e) {
                 log.error("【导入居民信息失败】清理上传的文件失败：{}", ExceptionUtils.getErrorStackTrace(e));
             }
@@ -491,7 +491,7 @@ public class IcResiUserController {
     @NotNull
     private CustomerFormResultDTO getResiFormAddItems(String customerId) {
         CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO();
-        queryDTO.setFormCode("resi_base_info");
+        queryDTO.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         queryDTO.setCustomerId(customerId);
         Result<CustomerFormResultDTO> resultForm = operCustomizeOpenFeignClient.getCustomerForm(queryDTO);
         if (resultForm == null || !resultForm.success() || resultForm.getData() == null) {
@@ -656,7 +656,7 @@ public class IcResiUserController {
         input.setKeyword(input.getKeyword().trim());
         input.setCustomerId(loginUser.getCustomerId());
         input.setStaffId(loginUser.getUserId());
-        input.setFormCode("resi_base_info");
+        input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         if (input.getPageNo() == null) {
             input.setPageNo(1);
         }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1181,7 +1181,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private Map<String, String> getVolunteerCategoryOptions(String customerId) {
         IcFormOptionsQueryFormDTO optionsQuery = new IcFormOptionsQueryFormDTO();
         optionsQuery.setCustomerId(customerId);
-        optionsQuery.setFormCode("resi_base_info");
+        optionsQuery.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         optionsQuery.setLabel("志愿者类别");
         List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
                 ServiceConstant.OPER_CUSTOMIZE_SERVER,

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.feign.ResultDataResolver;
@@ -16,13 +17,12 @@ import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.VolunteerService;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.google.common.collect.Lists;
-
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -68,7 +68,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
         // 2.补充图例
         IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
         optionsForm.setCustomerId(customerId);
-        optionsForm.setFormCode("resi_base_info");
+        optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         optionsForm.setLabel("志愿者类别");
 
         String errorMsg = "【志愿者分布】查询志愿者图例失败";

epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/IcResiUserControllerTest.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -61,7 +62,7 @@ public class IcResiUserControllerTest {
     @NotNull
     private CustomerFormResultDTO getResiFormItems(String customerId) {
         CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO();
-        queryDTO.setFormCode("resi_base_info");
+        queryDTO.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         queryDTO.setCustomerId(customerId);
         Result<CustomerFormResultDTO> resultForm = operCustomizeOpenFeignClient.getCustomerForm(queryDTO);
         if (resultForm == null || !resultForm.success() ||resultForm.getData() == null){