Merge remote-tracking branch 'origin/dev_bug_2021408' into dev_temp

# Conflicts:
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -401,7 +401,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         //0、验证码是否正确
         String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile());
         if (!formDTO.getSmsCode().equals(rightSmsCode)) {
-            logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
+            logger.warn(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
             throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
         }
         //1.根据appId查询对应客户Id

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.13__addPlatformDDLS.sql

@@ -13,7 +13,7 @@ CREATE TABLE `thirdplatform` (
   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台列表';
 
 
 CREATE TABLE `thirdplatform_customer_action` (
@@ -44,7 +44,7 @@ CREATE TABLE `thirdplatform_customer_register` (
   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户接入的平台列表';
 
 CREATE TABLE `thirdplatform_action` (
   `ID` varchar(64) NOT NULL,
@@ -58,4 +58,4 @@ CREATE TABLE `thirdplatform_action` (
   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台功能列表'

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -254,5 +254,4 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<GovIssueDetailResultDTO> votingissuedetail(IssueDetailFormDTO issueDetail) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "votingissuedetail", issueDetail);
 	}
-
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -11,10 +11,7 @@ import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import com.epmet.resi.mine.dto.from.MyResiUserInfoFormDTO;
 import com.epmet.resi.mine.dto.result.MyResiUserInfoResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -64,7 +61,7 @@ public interface EpmetUserFeignClient {
      * @Author sun
      **/
     @PostMapping(value = "epmetuser/gridlatest/getgridsbyuserid/{userId}")
-    Result<List<String>> getGridsByUserId(@PathVariable("userId") String userId);
+    Result<List<String>> getGridsByUserId(@PathVariable("userId") String userId,@RequestParam("customerId") String customerId);
 
     /**
      * @Description 居民端获取个人信息

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -72,8 +72,8 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
      * @Author sun
      **/
     @Override
-    public Result<List<String>> getGridsByUserId(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getGridsByUserId", userId);
+    public Result<List<String>> getGridsByUserId(String userId,String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getGridsByUserId", userId,customerId);
     }
 
     /**

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@@ -45,7 +45,7 @@ public class ResiMineGridController {
 	 **/
 	@PostMapping("allgrids")
 	public Result<List<AllGridsByUserIdResultDTO>> allGrids(@LoginUser TokenDto tokenDto){
-		return resiMineGridService.allGrids(tokenDto.getUserId());
+		return resiMineGridService.allGrids(tokenDto.getUserId(),tokenDto.getCustomerId());
 	}
 
 	/**

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java

@@ -29,7 +29,7 @@ public interface ResiMineGridService {
 	 * @Description 获取用户访问过的所有网格列表
 	 * @Author sun
 	 **/
-	Result<List<AllGridsByUserIdResultDTO>> allGrids(String userId);
+	Result<List<AllGridsByUserIdResultDTO>> allGrids(String userId,String customerId);
 
 	/**
 	 * @return

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@@ -76,10 +76,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 	 * @Author sun
 	 **/
 	@Override
-	public Result<List<AllGridsByUserIdResultDTO>> allGrids(String userId) {
+	public Result<List<AllGridsByUserIdResultDTO>> allGrids(String userId,String customerId) {
 		Result<List<AllGridsByUserIdResultDTO>> result = new Result<List<AllGridsByUserIdResultDTO>>();
 		//1:调用epmet-user服务，根据用户Id查询用户访问过的网格列表Id集合
-		Result<List<String>> resultGridIds = epmetUserFeignClient.getGridsByUserId(userId);
+		Result<List<String>> resultGridIds = epmetUserFeignClient.getGridsByUserId(userId,customerId);
 		if (!resultGridIds.success()) {
 			throw new RenException(ModuleConstant.SELECT_EXCEPTION);
 		}

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

@@ -114,8 +114,8 @@ public class GridLatestController {
      * @Author sun
      **/
     @PostMapping("getgridsbyuserid/{userId}")
-    public Result<List<String>> getGridsByUserId(@PathVariable("userId") String userId){
-        return gridLatestService.getGridsByUserId(userId);
+    public Result<List<String>> getGridsByUserId(@PathVariable("userId") String userId,@RequestParam("customerId") String customerId){
+        return gridLatestService.getGridsByUserId(userId,customerId);
     }
 
 

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

@@ -55,7 +55,7 @@ public interface GridLatestDao extends BaseDao<GridLatestEntity> {
      * @Description 根据用户Id查询用户访问过的网格列表Id集合
      * @Author sun
      **/
-    List<String> selectAllGridsByUserId(@Param("userId") String userId);
+    List<String> selectAllGridsByUserId(@Param("userId") String userId,@Param("customerId") String customerId);
 
     /**
      * @Description 查询一个客户下的所有用户：注册居民、陌生人

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

@@ -121,7 +121,7 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @Description 根据用户Id查询用户访问过的网格列表Id集合
      * @Author sun
      **/
-    Result<List<String>> getGridsByUserId(String userId);
+    Result<List<String>> getGridsByUserId(String userId,String customerId);
 
     /**
      * @Description 查询客户下所有用户包括陌生人

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

@@ -176,8 +176,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      * @Author sun
      **/
     @Override
-    public Result<List<String>> getGridsByUserId(String userId) {
-        List<String> gridList = baseDao.selectAllGridsByUserId(userId);
+    public Result<List<String>> getGridsByUserId(String userId,String customerId) {
+        List<String> gridList = baseDao.selectAllGridsByUserId(userId,customerId);
         return new Result<List<String>>().ok(gridList);
     }
 

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

@@ -80,6 +80,7 @@
         WHERE
             del_flag = '0'
         AND customer_user_id = #{userId}
+        AND CUSTOMER_ID = #{customerId}
         ORDER BY latest_time DESC
     </select>