Merge remote-tracking branch 'origin/dev_resi_export' into develop

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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/AuthCodeUtil.java

@@ -24,7 +24,7 @@ public class AuthCodeUtil {
 
     /**
      * <summary>
-     * 从字符串的指定位置截取指定长度的子字符串
+     * 从字符串的指定位置截取指定长度的子字符串￿
      * </summary>
      * <param name="str">原字符串</param>
      * <param name="startIndex">子字符串的起始位置</param>

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/group/ExportGroup.java

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.validator.group;
+
+/**
+ * 导出 Group
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ExportGroup {
+
+}

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

@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+public class IcExportTemplateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+	private String tempId;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+	private String formCode;
+
+    /**
+     * 模板名称
+     */
+	private String name;
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 自定义表单导出模板配置项 for 导出时使用
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+public class IcCustomExportResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表头
+     */
+    private List<List<String>> headers = new ArrayList<>();
+
+
+    /**
+     * sql中要返回的 列名 顺序跟表头顺序一致
+     */
+    private List<SqlColumn> sqlColumns;
+
+    @AllArgsConstructor
+    @Data
+    public static class SqlColumn {
+        private String tableName;
+        private String columnName;
+    }
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java

@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 自定义表单导出模板配置项 for 导出时使用
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+public class IcExportTemplateForExportResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 模板主键id
+     */
+    private String tempId;
+
+    /**
+     * 父id
+     */
+    private String pid;
+
+    /**
+     * 表头宽度
+     */
+    private Integer width;
+
+    /**
+     * 项标签
+     */
+    private String label;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+    /**
+     * 列名
+     */
+    private String columnName;
+
+    /**
+     * 子节点
+     */
+    private List<IcExportTemplateForExportResultDTO> children;
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -161,4 +161,12 @@ public interface OperCustomizeOpenFeignClient {
      */
     @PostMapping("/oper/customize/icformitem/resi-category-items/list")
     Result<List<ResiCategoryItemResultDTO>> listResiCategoryItems(@RequestParam("customer-id") String customerId);
+
+    /**
+     * 查询要导出的表头和sql返回结果的列的 用于导出
+     * @param param
+     * @return
+     */
+    @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport")
+    Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param);
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -124,4 +124,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	public Result<List<ResiCategoryItemResultDTO>> listResiCategoryItems(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listResiCategoryItems", customerId);
 	}
+
+    @Override
+    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param);
+    }
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java

@@ -7,7 +7,10 @@ import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.ExportGroup;
 import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.service.IcExportTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,20 +32,20 @@ public class IcExportTemplateController {
     private IcExportTemplateService icExportTemplateService;
 
     @RequestMapping("page")
-    public Result<PageData<IcExportTemplateDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcExportTemplateDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<IcExportTemplateDTO> page = icExportTemplateService.page(params);
         return new Result<PageData<IcExportTemplateDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<IcExportTemplateDTO> get(@PathVariable("id") String id){
+    public Result<IcExportTemplateDTO> get(@PathVariable("id") String id) {
         IcExportTemplateDTO data = icExportTemplateService.get(id);
         return new Result<IcExportTemplateDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody IcExportTemplateDTO dto){
+    public Result save(@RequestBody IcExportTemplateDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         icExportTemplateService.save(dto);
@@ -51,12 +54,24 @@ public class IcExportTemplateController {
 
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         icExportTemplateService.delete(ids);
         return new Result();
     }
 
+    /**
+     * desc:查询要导出的表头和sql返回结果的列的 用于导出
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping("getExcelHeaderAndSqlColumnForExport")
+    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) {
+        ValidatorUtils.validateEntity(param, ExportGroup.class);
+        return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param));
+    }
+
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java

@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.result.IcExportTemplateForExportResultDTO;
 import com.epmet.entity.IcExportTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 自定义表单导出模板
  *
@@ -13,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcExportTemplateDao extends BaseDao<IcExportTemplateEntity> {
 
+    List<IcExportTemplateForExportResultDTO> getTemplateConfigForExport(IcExportTemplateFormDTO param);
 }

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

@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 自定义表单导出模板
  *

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

@@ -72,6 +72,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 	 */
 	private String funType;
 
+	/**
+	 * 手机号：mobile; 身份证：id_card；只能输入数字:num
+	 */
+	private String validType;
+	
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java

@@ -3,6 +3,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.entity.IcExportTemplateEntity;
 
 import java.util.List;
@@ -75,4 +77,14 @@ public interface IcExportTemplateService extends BaseService<IcExportTemplateEnt
      * @date 2022-04-21
      */
     void delete(String[] ids);
+
+    /**
+     * desc: 获取导出配置
+     *
+     * @param param
+     * @return java.util.List<com.epmet.dto.result.IcExportTemplateForExportResultDTO>
+     * @author LiuJanJun
+     * @date 2022/4/22 3:55 下午
+     */
+    IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateFormDTO param);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -8,15 +8,19 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcExportTemplateDao;
 import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.result.IcCustomExportResultDTO;
+import com.epmet.dto.result.IcExportTemplateForExportResultDTO;
 import com.epmet.entity.IcExportTemplateEntity;
 import com.epmet.service.IcExportTemplateService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
-import java.util.Map;
 
 /**
  * 自定义表单导出模板
@@ -27,6 +31,8 @@ import java.util.Map;
 @Service
 public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplateDao, IcExportTemplateEntity> implements IcExportTemplateService {
 
+    @Autowired
+    private IcExportTemplateDao icExportTemplateDao;
 
     @Override
     public PageData<IcExportTemplateDTO> page(Map<String, Object> params) {
@@ -44,8 +50,8 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
         return ConvertUtils.sourceToTarget(entityList, IcExportTemplateDTO.class);
     }
 
-    private QueryWrapper<IcExportTemplateEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<IcExportTemplateEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcExportTemplateEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -80,4 +86,27 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateFormDTO param) {
+        List<IcExportTemplateForExportResultDTO> list = icExportTemplateDao.getTemplateConfigForExport(param);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList()));
+        List<List<String>> headerMap = new ArrayList<>();
+        List<IcCustomExportResultDTO.SqlColumn> sqlColumns = new ArrayList<>();
+        resultTemp.forEach((pid, groupList) -> {
+            List<String> headerGroupList = new ArrayList<>();
+            for (IcExportTemplateForExportResultDTO item : groupList) {
+                headerGroupList.add(item.getLabel());
+                sqlColumns.add(new IcCustomExportResultDTO.SqlColumn(item.getTableName(), item.getColumnName()));
+            }
+            headerMap.add(headerGroupList);
+        });
+        IcCustomExportResultDTO result = new IcCustomExportResultDTO();
+        result.setHeaders(headerMap);
+        result.setSqlColumns(sqlColumns);
+        return result;
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql

@@ -0,0 +1,6 @@
+alter table ic_form_query_builder add COLUMN VALID_TYPE VARCHAR(32) COMMENT '手机号：mobile; 身份证：id_card；只能输入数字:num' after FUN_TYPE;
+
+update ic_form_query_builder set VALID_TYPE=(
+select i.VALID_TYPE from ic_form_item i where i.id=FORM_ITEM_ID
+and i.CUSTOMER_ID=CUSTOMER_ID
+)where DEL_FLAG='0';

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml

@@ -18,6 +18,15 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getTemplateConfigForExport" resultType="com.epmet.dto.result.IcExportTemplateForExportResultDTO">
+        SELECT
+            c.ID,c.TEMP_ID,c.LABEL,c.PID,c.sort,ifig.TABLE_NAME,concat(ifi.COLUMN_NAME,if(ifi.COLUMN_NUM = 0,'',ifi.COLUMN_NUM)) columnName
+        FROM ic_export_template_config c
+        LEFT JOIN ic_form_item ifi ON c.FORM_ITEM_ID = ifi.ID
+        LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID
+        WHERE TEMP_ID = #{tempId} and c.CUSTOMER_ID = #{customerId} and c.DEL_FLAG = '0'
+        ORDER BY c.PID,c.SORT
+    </select>
 
 
 </mapper>

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -77,7 +77,7 @@
             b.ITEM_TYPE,
             i.ITEM_GROUP_ID,
             i.REQUIRED,
-            IFNULL(i.VALID_TYPE,'')as VALID_TYPE,
+            IFNULL(b.VALID_TYPE,'')as VALID_TYPE,
             IFNULL(i.DEFAULT_VALUE,'') as DEFAULT_VALUE,
             IFNULL(i.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE,
             IFNULL(i.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE,

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.ExportGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -43,5 +44,8 @@ public class IcResiUserPageFormDTO implements Serializable {
      */
     private String keyword;
 
+    @NotBlank(message = "模板id不能为空", groups = ExportGroup.class)
+    private String templateId;
+
 }
 

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

@@ -58,6 +58,7 @@ import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
+import com.epmet.service.IcResiUserExportService;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
 import feign.RequestInterceptor;
@@ -124,6 +125,8 @@ public class IcResiUserController implements ResultDataResolver {
     @Autowired
     private IcResiUserImportService icResiUserImportService;
     @Autowired
+    private IcResiUserExportService icResiUserExportService;
+    @Autowired
     private RedisUtils redisUtils;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
@@ -397,6 +400,28 @@ public class IcResiUserController implements ResultDataResolver {
         }
     }
 
+    /**
+     * desc: 自定义导出居民信息
+     *
+     * @param tokenDto
+     * @param pageFormDTO
+     * @param response
+     * @return void
+     * @author LiuJanJun
+     * @date 2021/11/19 4:24 下午
+     * @remark:分页批量导出  oss目录在 各个环境对应的前缀文件夹/file-template/resi-template/客户ID.xlsx,
+     * 如果某个客户需要更新模版 则替换掉上面的模版文件；然后 更新缓存里的值或者删除也行 再导出就会下载新的模版了
+     */
+    @NoRepeatSubmit
+    @RequestMapping(value = "/exportExcelCustom")
+    public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+        //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
+        //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class);
+        //获取导出配置
+        icResiUserExportService.exportIcResiUser(pageFormDTO,response);
+
+    }
     /**
      * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserExportService.java

@@ -0,0 +1,24 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.IcResiUserPageFormDTO;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+  *@Description 居民信息导出service
+  *@Author      wangxianzhang
+  *@Date        2021/11/4
+  */
+public interface IcResiUserExportService {
+
+    /**
+     * desc: 根据条件查询居民信息并根据配置模板导出
+     *
+     * @param pageFormDTO
+     * @param response
+     * @return void
+     * @author LiuJanJun
+     * @date 2022/4/22 1:35 下午
+     */
+    void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response);
+}

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

@@ -0,0 +1,48 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcResiUserPageFormDTO;
+import com.epmet.dto.result.IcCustomExportResultDTO;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
+import com.epmet.service.IcResiUserExportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2022/4/22 1:36 下午
+ * @version: 1.0
+ */
+@Slf4j
+@Service
+public class IcResiUserExportServiceImpl implements IcResiUserExportService {
+    @Autowired
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+    /**
+     * desc: 根据条件查询居民信息并根据配置模板导出
+     *
+     * @param pageFormDTO
+     * @param response
+     * @return void
+     * @author LiuJanJun
+     * @date 2022/4/22 1:35 下午
+     */
+    @Override
+    public void exportIcResiUser(IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) {
+        //获取模板条件
+        IcExportTemplateFormDTO param = new IcExportTemplateFormDTO();
+        param.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+        param.setTempId(pageFormDTO.getTemplateId());
+        Result<IcCustomExportResultDTO> exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param);
+
+    }
+}