新增单客户居民端查询最后一次访问网格接口、third服务修改客户Id

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;
+
+}

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信息失败";
 }

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<CustomerMpEntity> {
      * @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);
 }

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<PaCustomerAgencyEntity> {
      * @Description 公众号-查询客户组织信息
      **/
     PaCustomerAgencyDTO selectAgency(@Param("customerId") String customerId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 修改pa_customer_agency表客户Id
+     **/
+    int updateCustomerId(ModifyCustomerFormDTO formDTO);
 }

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<PaCustomerEntity> {
      **/
     List<RegisterByAuthResultDTO> selectCustomerList(RegisterByAuthFormDTO formDTO);
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 修改pa_customer表主键值
+     **/
+    int updateIdById(ModifyCustomerFormDTO formDTO);
 }

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<PaCustomerUserAgencyEnt
      * @Description 根据userId查询客户信息
      **/
     PaCustomerUserAgencyDTO selectCustomerIdByUserId(@Param("userId") String userId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 修改pa_customer_user_agency表客户Id
+     **/
+    int updateCustomerId(ModifyCustomerFormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.PaCustomerDTO;
-import com.epmet.dto.form.CreateAgencyFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.RegisterByAuthFormDTO;
-import com.epmet.dto.form.RegisterFormDTO;
-import com.epmet.dto.form.RegisterInfoFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.PaCustomerEntity;
 
@@ -163,4 +160,12 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
      * @Description 根据初始化状态获取公众号注册的客户列表
      **/
     List<RegisterByAuthResultDTO> registerByAuth(RegisterByAuthFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 修改各业务表customerId(兼容党群e事通已上线客户，将已有客户Id同步到第三方问题)
+     **/
+    void modifyCustomer(ModifyCustomerFormDTO formDTO);
 }

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.*;
-import com.epmet.dto.form.RegisterByAuthFormDTO;
-import com.epmet.dto.form.RegisterFormDTO;
-import com.epmet.dto.form.RegisterInfoFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.redis.PaCustomerRedis;
@@ -505,4 +502,36 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         return baseDao.selectCustomerList(formDTO);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 修改各业务表customerId(兼容党群e事通已上线客户，将已有客户Id同步到第三方问题)
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyCustomer(ModifyCustomerFormDTO formDTO) {
+        //1.修改pa_customer表主键
+        if (baseDao.updateIdById(formDTO) < NumConstant.ONE) {
+            logger.error(String.format("修改pa_customer表Id失败，待修改的客户Id->%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);
+        }
+
+    }
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml

@@ -145,4 +145,12 @@
             AND client = #{clientType}
     </select>
 
+    <update id="updateCustomerId">
+        UPDATE customer_mp
+        SET customer_id = #{newCustonerId}
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{oldCustomerId}
+    </update>
+
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerAgencyDao.xml

@@ -82,4 +82,12 @@
         LIMIT 1
     </select>
 
+    <update id="updateCustomerId">
+        UPDATE pa_customer_agency
+        SET customer_id = #{newCustonerId}
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{oldCustomerId}
+    </update>
+
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@@ -79,4 +79,12 @@
         AND id = #{id}
     </update>
 
+    <update id="updateIdById">
+        UPDATE pa_customer
+        SET id = #{newCustonerId}
+        WHERE
+            del_flag = '0'
+        AND id = #{oldCustomerId}
+    </update>
+
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml

@@ -34,4 +34,12 @@
             AND pcua.user_id = #{userId}
     </select>
 
+    <update id="updateCustomerId">
+        UPDATE pa_customer_user_agency
+        SET customer_id = #{newCustonerId}
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{oldCustomerId}
+    </update>
+
 </mapper>

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -90,6 +90,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -48,4 +47,19 @@ public class ResiMineGridController {
 	public Result<List<AllGridsByUserIdResultDTO>> allGrids(@LoginUser TokenDto tokenDto){
 		return resiMineGridService.allGrids(tokenDto.getUserId());
 	}
+
+	/**
+	 * @return
+	 * @param formDTO
+	 * @Author sun
+	 * @Description 单客户-获取用户最近访问网格
+	 * @Date 2020/8/3
+	 **/
+	@GetMapping("latestgridinfo")
+	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		formDTO.setUserId(token.getUserId());
+		return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
+	}
+
 }

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<List<AllGridsByUserIdResultDTO>> allGrids(String userId);
+
+	/**
+	 * @return
+	 * @param formDTO
+	 * @Author sun
+	 * @Description 单客户-获取用户最近访问网格
+	 * @Date 2020/8/3
+	 **/
+    LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO);
 }

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<String, Object> 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<LatestGridInfoResultDTO> 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();
+	}
+
 }

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;
+
+}

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<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 }

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<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO);
+    }
 }

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<List<CustomerUser4PointResultDTO>>().ok(gridLatestService.getCustomerUsers(param));
     }
 
+    /**
+     * @return
+     * @param formDTO
+     * @Author sun
+     * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
+     * @Date 2020/8/3
+     **/
+    @GetMapping("latestgridinfo")
+    public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
+        return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
+    }
+
 }

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<GridLatestEntity> {
      * @date 2020.07.25 15:26
     **/
     List<String> selectAllUserByCustomerId(@Param("customerId")String customerId);
+
+    /**
+     * @return
+     * @param formDTO
+     * @Author sun
+     * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
+     * @Date 2020/8/3
+     **/
+    LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO);
 }

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<GridLatestEntity> {
     **/
     List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO);
 
+    /**
+     * @return
+     * @param formDTO
+     * @Author sun
+     * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
+     * @Date 2020/8/3
+     **/
+    LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO);
 }

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<GridLatestDao, GridLa
         return allData;
     }
 
+    /**
+     * @return
+     * @param formDTO
+     * @Author sun
+     * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
+     * @Date 2020/8/3
+     **/
+    @Override
+    public LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO) {
+
+        return baseDao.selectLatestGridInfo(formDTO);
+    }
+
 }

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

@@ -93,4 +93,19 @@
             del_flag = '0'
         AND customer_id = #{customerId}
     </select>
+
+    <select id="selectLatestGridInfo" resultType="com.epmet.dto.result.LatestGridInfoResultDTO">
+        SELECT
+            gl.GRID_ID,
+            gl.CUSTOMER_ID
+        FROM
+            grid_latest gl
+        WHERE
+            gl.DEL_FLAG = '0'
+            AND gl.CUSTOMER_ID = #{customerId}
+            AND gl.CUSTOMER_USER_ID = #{userId}
+        ORDER BY
+            gl.LATEST_TIME DESC
+            LIMIT 1
+    </select>
 </mapper>