From fcd2092c7317778fedbc19e629dc8f6df781d72d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Apr 2021 17:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=EF=BC=8C=E5=9C=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=AE=A2=E6=88=B7=E4=B8=8B=E8=AE=BF=E9=97=AE=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E6=A0=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/modules/feign/EpmetUserFeignClient.java | 7 ++----- .../feign/fallback/EpmetUserFeignClientFallBack.java | 4 ++-- .../modules/grid/controller/ResiMineGridController.java | 2 +- .../epmet/modules/grid/service/ResiMineGridService.java | 2 +- .../modules/grid/service/impl/ResiMineGridServiceImpl.java | 4 ++-- .../java/com/epmet/controller/GridLatestController.java | 4 ++-- .../src/main/java/com/epmet/dao/GridLatestDao.java | 2 +- .../src/main/java/com/epmet/service/GridLatestService.java | 2 +- .../java/com/epmet/service/impl/GridLatestServiceImpl.java | 4 ++-- .../src/main/resources/mapper/GridLatestDao.xml | 1 + 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 985b869cc8..1f09936352 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/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> getGridsByUserId(@PathVariable("userId") String userId); + Result> getGridsByUserId(@PathVariable("userId") String userId,@RequestParam("customerId") String customerId); /** * @Description 居民端获取个人信息 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index d4e41a1bf7..781cf39d24 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/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> getGridsByUserId(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getGridsByUserId", userId); + public Result> getGridsByUserId(String userId,String customerId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getGridsByUserId", userId,customerId); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index 7ea7b24f3d..606d4d9d44 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/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> allGrids(@LoginUser TokenDto tokenDto){ - return resiMineGridService.allGrids(tokenDto.getUserId()); + return resiMineGridService.allGrids(tokenDto.getUserId(),tokenDto.getCustomerId()); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java index e6d8a70398..994f21fa31 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java +++ b/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> allGrids(String userId); + Result> allGrids(String userId,String customerId); /** * @return diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 455b7c0cbf..de5e28a457 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/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> allGrids(String userId) { + public Result> allGrids(String userId,String customerId) { Result> result = new Result>(); //1:调用epmet-user服务，根据用户Id查询用户访问过的网格列表Id集合 - Result> resultGridIds = epmetUserFeignClient.getGridsByUserId(userId); + Result> resultGridIds = epmetUserFeignClient.getGridsByUserId(userId,customerId); if (!resultGridIds.success()) { throw new RenException(ModuleConstant.SELECT_EXCEPTION); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index ba8fd626ce..c470d793a9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/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> getGridsByUserId(@PathVariable("userId") String userId){ - return gridLatestService.getGridsByUserId(userId); + public Result> getGridsByUserId(@PathVariable("userId") String userId,@RequestParam("customerId") String customerId){ + return gridLatestService.getGridsByUserId(userId,customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java index 84450fc6f1..979ac85a5f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java @@ -55,7 +55,7 @@ public interface GridLatestDao extends BaseDao { * @Description 根据用户Id查询用户访问过的网格列表Id集合 * @Author sun **/ - List selectAllGridsByUserId(@Param("userId") String userId); + List selectAllGridsByUserId(@Param("userId") String userId,@Param("customerId") String customerId); /** * @Description 查询一个客户下的所有用户：注册居民、陌生人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java index 1395099c22..e9ff239d1e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java @@ -121,7 +121,7 @@ public interface GridLatestService extends BaseService { * @Description 根据用户Id查询用户访问过的网格列表Id集合 * @Author sun **/ - Result> getGridsByUserId(String userId); + Result> getGridsByUserId(String userId,String customerId); /** * @Description 查询客户下所有用户包括陌生人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index c18e91c05d..e25a4600eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -176,8 +176,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl> getGridsByUserId(String userId) { - List gridList = baseDao.selectAllGridsByUserId(userId); + public Result> getGridsByUserId(String userId,String customerId) { + List gridList = baseDao.selectAllGridsByUserId(userId,customerId); return new Result>().ok(gridList); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml index 52887827e6..911c243bc8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml +++ b/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