Merge branch 'dev_group_code' into dev_temp

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/UploadBytesFormDTO.java

@@ -1,24 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @description:
- * @author: liushaowen
- * @date: 2020/11/13 10:56
- */
-
-@Data
-public class UploadBytesFormDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @NotNull(message = "字节数组不能为空")
-    private byte[] bytes;
-
-    @NotBlank(message = "后缀不能为空")
-    private String extension;
-}

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

@@ -10,7 +10,6 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.fallback.OssFeignClientFallback;
 import feign.codec.Encoder;
@@ -20,7 +19,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -45,10 +43,6 @@ public interface OssFeignClient {
     @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result<UploadImgResultDTO> uploadQrCode(@RequestPart(value = "file") MultipartFile file);
 
-    @PostMapping(value ="oss/file/uploadbytes", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<UploadImgResultDTO> uploadBytes(@RequestBody UploadBytesFormDTO dto);
-
-
     @Configuration
     class MultipartSupportConfig {
         @Bean

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java

@@ -11,7 +11,6 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.OssFeignClient;
 import org.springframework.stereotype.Component;
@@ -36,8 +35,4 @@ public class OssFeignClientFallback implements OssFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCode", file);
 	}
 
-	@Override
-	public Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadBytes", dto);
-	}
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -20,7 +20,6 @@ import com.epmet.commons.tools.validator.group.AliyunGroup;
 import com.epmet.commons.tools.validator.group.QcloudGroup;
 import com.epmet.commons.tools.validator.group.QiniuGroup;
 import com.epmet.dto.UploadDTO;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import com.epmet.enums.OssTypeEnum;
@@ -161,12 +160,6 @@ public class OssController {
 		return ossService.uploadImg(file);
 	}
 
-	@PostMapping("uploadbytes")
-	public Result<UploadImgResultDTO> uploadBytes(@RequestBody UploadBytesFormDTO dto){
-	    ValidatorUtils.validateEntity(dto);
-		return ossService.uploadBytes(dto);
-	}
-
 	/**
 	 * 上传客户logo(考虑到以后可能会针对不同的业务有不同的限制条件，这里不再使用通用的接口
 	 * 针对每一个业务新建上传接口)

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -11,7 +11,6 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +31,4 @@ public interface OssService extends BaseService<OssEntity> {
 	Result<UploadImgResultDTO> uploadImg(MultipartFile file);
 
 	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName);
-
-    Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto);
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -17,7 +17,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.OssDao;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import com.epmet.exception.ModuleErrorCode;
@@ -105,22 +104,4 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		dto.setUrl(url);
 		return new Result<UploadImgResultDTO>().ok(dto);
 	}
-
-	@Override
-	public Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto) {
-		if (dto.getBytes().length == 0) {
-			return new Result<UploadImgResultDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
-		}
-		//上传文件
-		String url = null;
-		url = OssFactory.build().uploadSuffix(dto.getBytes(), dto.getExtension());
-		//保存文件信息
-		OssEntity ossEntity = new OssEntity();
-		ossEntity.setUrl(url);
-		baseDao.insert(ossEntity);
-		//文件信息
-		UploadImgResultDTO uploadImgResultDTO = new UploadImgResultDTO();
-		uploadImgResultDTO.setUrl(url);
-		return new Result<UploadImgResultDTO>().ok(uploadImgResultDTO);
-	}
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java

@@ -0,0 +1,66 @@
+package com.epmet.resi.group.dto;
+
+import lombok.Data;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/16 13:52
+ */
+@Data
+public class QRCodeMultipartFileDTO implements MultipartFile {
+
+    private String name = "file";
+
+    private String originalFilename;
+
+    private String contentType = "image/jpeg";
+
+    private byte[] bytes;
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String getOriginalFilename() {
+        return this.originalFilename;
+    }
+
+    @Override
+    public String getContentType() {
+        return this.contentType;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return  ArrayUtils.isEmpty(bytes)?true:false;
+    }
+
+    @Override
+    public long getSize() {
+        return ArrayUtils.isEmpty(bytes)?bytes.length:0;
+    }
+
+    @Override
+    public byte[] getBytes() {
+        return this.bytes;
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return null;
+    }
+
+    @Override
+    public void transferTo(File file) {
+
+    }
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @description:  获取生成海报(小组码)信息-接口入参
+ * @author: sun
+ */
+@Data
+public class GroupCodeBasicInfoFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 客户id
+     */
+    //@NotBlank(message = "客户id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
+    private String customerId;
+    /**
+     * 网格id
+     */
+    //@NotBlank(message = "网格id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
+    private String gridId;
+    /**
+     * 组id
+     */
+    @NotBlank(message = "群组id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
+    private String groupId;
+
+    public interface GroupCodeInfo {}
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:  获取生成海报(小组码)信息-接口入参
+ * @author: sun
+ */
+@Data
+public class GroupCodeBasicInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = -1590972041272087570L;
+
+    /**
+     * 小组Id
+     */
+    private String groupId;
+    /**
+     * 小组名称
+     */
+    private String groupName;
+    /**
+     * 小组头像
+     */
+    private String groupHeadPhoto;
+    /**
+     * 小组介绍
+     */
+    private String groupIntroduction;
+    /**
+     * 小组二维码路径
+     */
+    private String groupCodeUrl;
+    /**
+     * 小组创建人称谓(街道-姓氏+称谓)(南宁路-李先生)
+     */
+    private String showName;
+    /**
+     * 小组创建人Id
+     */
+    private String groupUserId;
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupCodeController.java

@@ -19,7 +19,6 @@ package com.epmet.modules.group.controller;
 
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -30,11 +29,11 @@ import com.epmet.modules.group.service.ResiGroupCodeService;
 import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
 import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 
@@ -99,4 +98,15 @@ public class ResiGroupCodeController {
         return resiGroupCodeService.getGroupCode(dto);
     }
 
+    /**
+     * @param formDTO
+     * @Description 获取生成海报(小组码)信息
+     * @author sun
+     */
+    @PostMapping("groupcodebasicinfo")
+    public Result<GroupCodeBasicInfoResultDTO> groupCodeBasicInfo(@RequestBody GroupCodeBasicInfoFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GroupCodeBasicInfoFormDTO.GroupCodeInfo.class);
+        return new Result<GroupCodeBasicInfoResultDTO>().ok(resiGroupCodeService.groupCodeBasicInfo(formDTO));
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupCodeDao.java

@@ -19,6 +19,8 @@ package com.epmet.modules.group.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.group.entity.ResiGroupCodeEntity;
+import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -30,4 +32,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiGroupCodeDao extends BaseDao<ResiGroupCodeEntity> {
 
+    /**
+     * @param formDTO
+     * @Description 获取生成海报(小组码)信息
+     * @author sun
+     */
+    GroupCodeBasicInfoResultDTO selectGroupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupCodeService.java

@@ -25,6 +25,8 @@ import com.epmet.modules.group.entity.ResiGroupCodeEntity;
 import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
 import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -114,4 +116,11 @@ public interface ResiGroupCodeService extends BaseService<ResiGroupCodeEntity> {
      * @Date 2020/11/16 9:37
      */
     Result<String> getGroupCode(GetGroupCodeFormDTO dto);
+
+    /**
+     * @param formDTO
+     * @Description 获取生成海报(小组码)信息
+     * @author sun
+     */
+    GroupCodeBasicInfoResultDTO groupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java

@@ -21,27 +21,32 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.CustomerTokensResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.modules.group.dao.ResiGroupCodeDao;
 import com.epmet.modules.group.entity.ResiGroupCodeEntity;
 import com.epmet.modules.group.redis.ResiGroupCodeRedis;
 import com.epmet.modules.group.service.ResiGroupCodeService;
 import com.epmet.modules.utils.ModuleConstant;
+import com.epmet.resi.group.dto.QRCodeMultipartFileDTO;
 import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
 import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupCodeBasicInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,10 +56,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 小组二维码 小组唯一二维码，海报码和小组码是同一个二维码，长期有效的
@@ -73,6 +75,9 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
     @Autowired
     private OssFeignClient ossFeignClient;
 
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Override
     public PageData<ResiGroupCodeDTO> page(Map<String, Object> params) {
         IPage<ResiGroupCodeEntity> page = baseDao.selectPage(
@@ -170,10 +175,10 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
                 }
             }
             //上传
-            UploadBytesFormDTO uploadBytesFormDTO = new UploadBytesFormDTO();
+            QRCodeMultipartFileDTO qrCodeMultipartFile = new QRCodeMultipartFileDTO();
-            uploadBytesFormDTO.setBytes(buffer);
+            qrCodeMultipartFile.setBytes(buffer);
-            uploadBytesFormDTO.setExtension("jpg");
+            qrCodeMultipartFile.setOriginalFilename("qrcode.jpg");
-            Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadBytes(uploadBytesFormDTO);
+            Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile);
             if (uploadResult.success()) {
                 result = uploadResult.getData().getUrl();
                 //存表
@@ -252,4 +257,32 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
         }
         return resiAccessToken;
     }
+
+    /**
+     * @param formDTO
+     * @Description 获取生成海报(小组码)信息
+     * @author sun
+     */
+    @Override
+    public GroupCodeBasicInfoResultDTO groupCodeBasicInfo(GroupCodeBasicInfoFormDTO formDTO) {
+        //1.获取小组基本信息
+        GroupCodeBasicInfoResultDTO resultDTO = baseDao.selectGroupCodeBasicInfo(formDTO);
+        if (null == resultDTO) {
+            logger.error(String.format("获取小组码基本信息失败，小组Id：%s", formDTO.getGroupId()));
+            throw new RenException("获取小组码基本信息失败");
+        }
+        //2.获取小组创建人称谓信息
+        UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(resultDTO.getGroupUserId());
+        userResiInfoListFormDTO.setUserIdList(userIdList);
+        Result<List<UserResiInfoResultDTO>> resultList = epmetUserOpenFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
+        if (!resultList.success() || null == resultList.getData() || resultList.getData().size() < NumConstant.ONE) {
+            logger.error(String.format("调用user服务，查询用户基本信息失败，userId：%s", resultDTO.getGroupUserId()));
+            throw new RenException("获取小组创建人基本信息失败");
+        }
+        resultDTO.setShowName(resultList.getData().get(NumConstant.ZERO).getShowName());
+        return resultDTO;
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml

@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.resi.group.dto.group.ResiGroupCodeDTO">
+<mapper namespace="com.epmet.modules.group.dao.ResiGroupCodeDao">
-
-    <resultMap type="com.epmet.modules.group.entity.ResiGroupCodeEntity" id="resiGroupCodeMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="groupId" column="GROUP_ID"/>
-        <result property="type" column="TYPE"/>
-        <result property="url" column="URL"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
 
+    <select id="selectGroupCodeBasicInfo" resultType="com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO">
+        SELECT
+            rgc.GROUP_ID AS "groupId",
+            rgc.URL AS "groupCodeUrl",
+            rg.GROUP_NAME AS "groupName",
+            rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto",
+            rg.GROUP_INTRODUCTION AS "groupIntroduction",
+            rg.CREATED_BY AS "groupUserId"
+        FROM
+            resi_group_code rgc
+        INNER JOIN resi_group rg ON rgc.GROUP_ID = rg.ID
+        WHERE
+            rgc.DEL_FLAG = '0'
+        AND rg.DEL_FLAG = '0'
+        AND rgc.GROUP_ID = #{groupId}
+        <if test='null != customerId and "" != customerId'>
+            and rgc.customer_id = #{customerId}
+        </if>
+        <if test='null != gridId and "" != gridId'>
+            and rgc.grid_id = #{gridId}
+        </if>
+    </select>
 
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -440,4 +440,12 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount",consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList);
+
+    /**
+     * 根据userId集合查询用户注册信息
+     * @author sun
+     */
+    @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+    Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -311,4 +311,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryGridAuditingBadgeCount", gridIdList);
     }
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
+    }
 }