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 606d4d9d44..318b7f6aa6 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 @@ -50,15 +50,16 @@ public class ResiMineGridController { /** * @return - * @param appId * @Author sun * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ @GetMapping("latestgridinfo") - public Result latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) { + //public Result latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) { + public Result latestGridInfo_new(@LoginUser TokenDto token) { LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO(); - formDTO.setAppId(appId); + //formDTO.setAppId(appId); + formDTO.setCustomerId(token.getCustomerId()); formDTO.setUserId(token.getUserId()); return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); } 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 68ac4ef3c1..3778e941c3 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 @@ -130,7 +130,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { } } } - //1.调用third服务,根据appId获取客户Id + + /* + //2022.4.29 应前端要求 入参不再传appid值 + //1.调用third服务,根据appId获取客户Id JSONObject jsonObject = new JSONObject(); String customerMsgUrl = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/"; String data = HttpClientManager.getInstance().sendPostByJSON(customerMsgUrl + formDTO.getAppId(), JSON.toJSONString(jsonObject)).getData(); @@ -148,10 +151,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); Map map = (Map) json.get("customer"); PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); - logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); + logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);*/ //2.调用epmet-user服务,根据客户Id和用户Id查询最后一次访问记录 - formDTO.setCustomerId(customer.getId()); + //formDTO.setCustomerId(customer.getId()); Result userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO); if (!userResult.success()) { logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult)));