From 03cbc108e2ac9c356612867cfb9bed0cd86d75d3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 3 Aug 2020 17:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=9F=A5=E8=AF=A2=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=AE=BF=E9=97=AE=E7=BD=91=E6=A0=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81third=E6=9C=8D=E5=8A=A1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A2=E6=88=B7Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/ModifyCustomerFormDTO.java | 26 ++++++++++ .../java/com/epmet/constant/PaConstant.java | 4 ++ .../java/com/epmet/dao/CustomerMpDao.java | 9 ++++ .../com/epmet/dao/PaCustomerAgencyDao.java | 9 ++++ .../java/com/epmet/dao/PaCustomerDao.java | 8 ++++ .../epmet/dao/PaCustomerUserAgencyDao.java | 9 ++++ .../com/epmet/service/PaCustomerService.java | 13 +++-- .../service/impl/PaCustomerServiceImpl.java | 37 +++++++++++++-- .../main/resources/mapper/CustomerMpDao.xml | 8 ++++ .../resources/mapper/PaCustomerAgencyDao.xml | 8 ++++ .../main/resources/mapper/PaCustomerDao.xml | 8 ++++ .../mapper/PaCustomerUserAgencyDao.xml | 8 ++++ .../resi-mine/resi-mine-server/pom.xml | 6 +++ .../controller/ResiMineGridController.java | 22 +++++++-- .../grid/service/ResiMineGridService.java | 10 ++++ .../service/impl/ResiMineGridServiceImpl.java | 47 +++++++++++++++++++ .../epmet/dto/form/LatestGridInfoFormDTO.java | 38 +++++++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 10 ++++ .../EpmetUserOpenFeignClientFallback.java | 5 ++ .../controller/GridLatestController.java | 13 +++++ .../java/com/epmet/dao/GridLatestDao.java | 10 ++++ .../com/epmet/service/GridLatestService.java | 9 ++++ .../service/impl/GridLatestServiceImpl.java | 14 ++++++ .../main/resources/mapper/GridLatestDao.xml | 15 ++++++ 24 files changed, 334 insertions(+), 12 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyCustomerFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyCustomerFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyCustomerFormDTO.java new file mode 100644 index 0000000000..3b6afe2a8f --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyCustomerFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * @Description 修改各业务表customerId(兼容党群e事通已上线客户，将已有客户Id同步到第三方问题)-接口入参 + */ +@Data +public class ModifyCustomerFormDTO implements Serializable { + + private static final long serialVersionUID = -6547893374373422628L; + + /** + * 待修改的客户Id + * */ + private String oldCustomerId; + + /** + * 修改后的客户Id + */ + private String newCustonerId; + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java index 7f25762c5e..21e369aec9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java @@ -78,4 +78,8 @@ public interface PaConstant { * 获取访问记录表数据失败失败 */ String SELECT_VISITED_EXCEPTION = "获取访问记录表数据失败"; + /** + * 更新客户Id信息失败 + */ + String UPDATE_CUSTOMER_EXCEPTION = "更新客户Id信息失败"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java index a3fca59cc8..0e5243e6e7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerMpDTO; import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.AuthCodeFormDTO; +import com.epmet.dto.form.ModifyCustomerFormDTO; import com.epmet.entity.CustomerMpEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -123,4 +124,12 @@ public interface CustomerMpDao extends BaseDao { * @author zxc */ String getAppId(@Param("customerId")String customerId,@Param("clientType")String clientType); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 修改customer_mp表客户Id + **/ + int updateCustomerId(ModifyCustomerFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerAgencyDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerAgencyDao.java index a3031b9b15..46938bfc31 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerAgencyDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerAgencyDTO; +import com.epmet.dto.form.ModifyCustomerFormDTO; import com.epmet.entity.PaCustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -54,4 +55,12 @@ public interface PaCustomerAgencyDao extends BaseDao { * @Description 公众号-查询客户组织信息 **/ PaCustomerAgencyDTO selectAgency(@Param("customerId") String customerId); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 修改pa_customer_agency表客户Id + **/ + int updateCustomerId(ModifyCustomerFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index 5d403cb1cf..c977d5d7f4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerDTO; +import com.epmet.dto.form.ModifyCustomerFormDTO; import com.epmet.dto.form.RegisterByAuthFormDTO; import com.epmet.dto.result.CustomerAgencyResultDTO; import com.epmet.dto.result.RegisterByAuthResultDTO; @@ -69,4 +70,11 @@ public interface PaCustomerDao extends BaseDao { **/ List selectCustomerList(RegisterByAuthFormDTO formDTO); + /** + * @param formDTO + * @return + * @Author sun + * @Description 修改pa_customer表主键值 + **/ + int updateIdById(ModifyCustomerFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java index 2083f9c1e9..bd0c8253c4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerUserAgencyDTO; +import com.epmet.dto.form.ModifyCustomerFormDTO; import com.epmet.entity.PaCustomerUserAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,4 +48,12 @@ public interface PaCustomerUserAgencyDao extends BaseDao { * @Description 根据初始化状态获取公众号注册的客户列表 **/ List registerByAuth(RegisterByAuthFormDTO formDTO); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 修改各业务表customerId(兼容党群e事通已上线客户，将已有客户Id同步到第三方问题) + **/ + void modifyCustomer(ModifyCustomerFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 2652afb556..3f72254505 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -34,10 +34,7 @@ import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.constant.PaConstant; import com.epmet.dao.*; import com.epmet.dto.*; -import com.epmet.dto.form.CreateAgencyFormDTO; -import com.epmet.dto.form.RegisterByAuthFormDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.RegisterInfoFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.redis.PaCustomerRedis; @@ -505,4 +502,36 @@ public class PaCustomerServiceImpl extends BaseServiceImpl%s,修改后的客户Id->%s", formDTO.getOldCustomerId(), formDTO.getNewCustonerId())); + throw new RenException(PaConstant.UPDATE_CUSTOMER_EXCEPTION); + } + //2.修改pa_customer_agency表customerId + if (paCustomerAgencyDao.updateCustomerId(formDTO) < NumConstant.ONE) { + logger.error(String.format("修改pa_customer_agency表客户Id失败，待修改的客户Id->%s,修改后的客户Id->%s", formDTO.getOldCustomerId(), formDTO.getNewCustonerId())); + throw new RenException(PaConstant.UPDATE_CUSTOMER_EXCEPTION); + } + //3.修改customer_mp表customerId + if (customerMpDao.updateCustomerId(formDTO) < NumConstant.ONE) { + logger.error(String.format("修改customer_mp表客户Id失败，待修改的客户Id->%s,修改后的客户Id->%s", formDTO.getOldCustomerId(), formDTO.getNewCustonerId())); + throw new RenException(PaConstant.UPDATE_CUSTOMER_EXCEPTION); + } + //4.修改pa_customer_user_agency表customerId + if (paCustomerUserAgencyDao.updateCustomerId(formDTO) < NumConstant.ONE) { + logger.error(String.format("修改pa_customer_user_agency表客户Id失败，待修改的客户Id->%s,修改后的客户Id->%s", formDTO.getOldCustomerId(), formDTO.getNewCustonerId())); + throw new RenException(PaConstant.UPDATE_CUSTOMER_EXCEPTION); + } + + } + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml index d7281d2a9f..f8f3d37ff6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml @@ -145,4 +145,12 @@ AND client = #{clientType} + + UPDATE customer_mp + SET customer_id = #{newCustonerId} + WHERE + del_flag = '0' + AND customer_id = #{oldCustomerId} + + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml index 9911ae88ff..752fb6081a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml @@ -82,4 +82,12 @@ LIMIT 1 + + UPDATE pa_customer_agency + SET customer_id = #{newCustonerId} + WHERE + del_flag = '0' + AND customer_id = #{oldCustomerId} + + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml index 0c584b7615..f56a663a07 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml @@ -79,4 +79,12 @@ AND id = #{id} + + UPDATE pa_customer + SET id = #{newCustonerId} + WHERE + del_flag = '0' + AND id = #{oldCustomerId} + + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml index 93a0b840f0..dee9a80f90 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml @@ -34,4 +34,12 @@ AND pcua.user_id = #{userId} + + UPDATE pa_customer_user_agency + SET customer_id = #{newCustonerId} + WHERE + del_flag = '0' + AND customer_id = #{oldCustomerId} + + \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 7b2dbcaf2d..382d1f2a4c 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -90,6 +90,12 @@ 2.0.0 compile + + com.epmet + epmet-third-client + 2.0.0 + compile + 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 bb6bcc34ae..641b6b410f 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 @@ -3,14 +3,13 @@ package com.epmet.modules.grid.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.modules.grid.service.ResiMineGridService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -48,4 +47,19 @@ public class ResiMineGridController { public Result> allGrids(@LoginUser TokenDto tokenDto){ return resiMineGridService.allGrids(tokenDto.getUserId()); } + + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-获取用户最近访问网格 + * @Date 2020/8/3 + **/ + @GetMapping("latestgridinfo") + public Result latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + 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/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java index f4f398306c..0d1c3f3f8f 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 @@ -2,6 +2,7 @@ package com.epmet.modules.grid.service; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; @@ -29,4 +30,13 @@ public interface ResiMineGridService { * @Author sun **/ Result> allGrids(String userId); + + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-获取用户最近访问网格 + * @Date 2020/8/3 + **/ + LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO 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 279b7eae9e..7ba79252b2 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 @@ -1,13 +1,19 @@ package com.epmet.modules.grid.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; +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.PaCustomerDTO; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.grid.service.ResiMineGridService; @@ -20,6 +26,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @Description 居民端用户网格信息service @@ -33,6 +40,8 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { private EpmetUserFeignClient epmetUserFeignClient; @Autowired private GovOrgFeignClient govOrgFeignClient; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; /** * @param tokenDto @@ -88,4 +97,42 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { } return result.ok(resultGrids.getData()); } + + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-获取用户最近访问网格 + * @Date 2020/8/3 + **/ + @Override + public LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO) { + logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(formDTO))); + //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(); + logger.info("调用third服务，根据appId查询客户信息：httpclient->url:" + customerMsgUrl + "，结果->" + data); + JSONObject toResult = JSON.parseObject(data); + Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); + if (!mapToResult.success()) { + logger.error(String.format("根据appId查询客户信息失败，对应appId->" + formDTO.getAppId())); + throw new RenException(mapToResult.getMsg()); + } + Object PublicCustomerResultDTO = mapToResult.getData(); + JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); + Map map = (Map) json.get("customer"); + PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); + logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); + + //2.调用epmet-user服务，根据客户Id和用户Id查询最后一次访问记录 + 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))); + } + + return userResult.getData(); + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java new file mode 100644 index 0000000000..3df970fc0c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 单客户-获取用户最近访问网格-接口入参 + * @Auth sun + */ +@Data +public class LatestGridInfoFormDTO implements Serializable { + private static final long serialVersionUID = -6534841370041338474L; + + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 小程序绑定的appId + */ + @NotBlank(message = "数据来源不能为空", groups = {LatestGridInfoFormDTO.AddUserInternalGroup.class, LatestGridInfoFormDTO.AddUserShowGroup.class}) + private String appId; + + /** + * 根据appId查询到的客户Id + */ + private String customerId; + + /** + * token中userId + */ + private String userId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 857df537c1..c986552e72 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -249,4 +249,14 @@ public interface EpmetUserOpenFeignClient { **/ @PostMapping("/epmetuser/userbaseinfo/volunteerbaseinfo") Result volunteerBaseInfo(@RequestBody ResiVolunteerAuthenticateFormDTO param); + + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-获取用户最近访问网格 + * @Date 2020/8/3 + **/ + @GetMapping(value = "epmetuser/gridlatest/latestgridinfo") + Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 0be4d08c3d..6e137becc1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -178,4 +178,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result volunteerBaseInfo(ResiVolunteerAuthenticateFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "volunteerBaseInfo", param); } + + @Override + public Result latestGridInfo(LatestGridInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO); + } } 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 342300ea58..61452175ba 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 @@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.excel.GridLatestExcel; @@ -130,4 +131,16 @@ public class GridLatestController { return new Result>().ok(gridLatestService.getCustomerUsers(param)); } + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 + * @Date 2020/8/3 + **/ + @GetMapping("latestgridinfo") + public Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ + return new Result().ok(gridLatestService.latestGridInfo(formDTO)); + } + } 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 2e5b9e7b8f..84450fc6f1 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 @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.GridLatestDTO; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.entity.GridLatestEntity; import org.apache.ibatis.annotations.Mapper; @@ -64,4 +65,13 @@ public interface GridLatestDao extends BaseDao { * @date 2020.07.25 15:26 **/ List selectAllUserByCustomerId(@Param("customerId")String customerId); + + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 + * @Date 2020/8/3 + **/ + LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO); } 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 4298d1ef68..1395099c22 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 @@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.form.VisitedFormDTO; import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; @@ -131,4 +132,12 @@ public interface GridLatestService extends BaseService { **/ List getCustomerUsers(CustomerUserFormDTO customerUserFormDTO); + /** + * @return + * @param formDTO + * @Author sun + * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 + * @Date 2020/8/3 + **/ + LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO); } 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 71c4005717..fbeac02c2b 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 @@ -30,6 +30,7 @@ import com.epmet.dao.UserWechatDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; +import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.form.VisitedFormDTO; import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; @@ -204,4 +205,17 @@ public class GridLatestServiceImpl extends BaseServiceImpl + +