Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into develop

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

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

@@ -138,6 +138,7 @@ public class IcResiUserController {
         IC_RESI_DOWNLOAD_DIR = exportDir;
     }
 
+    @NoRepeatSubmit
     @PostMapping("delete")
     public Result delete(@LoginUser TokenDto tokenDto, @RequestBody DelIcResiUserFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -159,6 +160,7 @@ public class IcResiUserController {
      * @Author sun
      * @Description 党建互联平台--保存居民信息
      **/
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody List<IcResiUserFormDTO> formDTO) {
         String resiUserId = icResiUserService.add(tokenDto, formDTO);
@@ -177,6 +179,7 @@ public class IcResiUserController {
      * @Author sun
      * @Description 党建互联平台--修改居民信息
      **/
+    @NoRepeatSubmit
     @PostMapping("edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody List<IcResiUserFormDTO> formDTO) {
         String resiUserId = icResiUserService.edit(tokenDto, formDTO);
@@ -241,6 +244,7 @@ public class IcResiUserController {
      * @remark:分页批量导出  oss目录在 各个环境对应的前缀文件夹/file-template/resi-template/客户ID.xlsx,
      * 如果某个客户需要更新模版 则替换掉上面的模版文件；然后 更新缓存里的值或者删除也行 再导出就会下载新的模版了
      */
+    @NoRepeatSubmit
     @RequestMapping(value = "/exportExcel")
     public void exportExcelByEasyExcel(@RequestHeader String customerId,@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
         //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -147,6 +147,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     Map<String,String> selectPersonType(@Param("columns")List<String> columns,@Param("customerId")String customerId,
                                         @Param("tableName")String tableName,@Param("userId")String userId);
 
+    /**
+     * @Author sun
+     * @Description 查询居民信息
+     **/
+    IcResiUserDTO getResiUser(IcResiUserDTO dto);
     /**
      *
      * @param agencyId
@@ -157,9 +162,4 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<DemandUserResDTO> selectDemandUsers(@Param("agencyId") String agencyId,
                                              @Param("gridId")String gridId,
                                              @Param("name")String name);
-    /**
-     * @Author sun
-     * @Description 查询居民信息
-     **/
-    IcResiUserDTO getResiUser(IcResiUserDTO dto);
-}
+}

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -271,6 +271,19 @@
             AND IC_RESI_USER = #{userId}
         </if>
     </select>
+    <select id="getResiUser" resultType="com.epmet.dto.IcResiUserDTO">
+        SELECT
+            id,
+            `name`,
+            id_card,
+            mobile
+        FROM
+            ic_resi_user
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND id_card = #{idCard}
+    </select>
 
 
     <select id="selectDemandUsers" parameterType="map" resultType="com.epmet.dto.result.DemandUserResDTO">
@@ -295,17 +308,4 @@
     ORDER BY
         CONVERT ( ir.NAME USING gbk ) ASC
     </select>
-    <select id="getResiUser" resultType="com.epmet.dto.IcResiUserDTO">
-        SELECT
-            id,
-            `name`,
-            id_card,
-            mobile
-        FROM
-            ic_resi_user
-        WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
-        AND id_card = #{idCard}
-    </select>
 </mapper>