政府工作人员获取上一次登录的网格信息

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/constant/StaffAgencyConstant.java

@@ -0,0 +1,12 @@
+package com.epmet.constant;
+
+/**
+ * @Description 机构员工的常量
+ * @IntefaceName StaffAgencyConstant
+ * @Author wangc
+ * @date 2020.04.23 11:25
+ */
+public interface StaffAgencyConstant {
+
+    String QUERY_LATEST_GRID_INFO_FAILED = "查询上一次登录的网格信息失败";
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java

@@ -20,11 +20,14 @@ package com.epmet.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.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.service.StaffAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -64,4 +67,19 @@ public class StaffAgencyController {
 		return staffAgencyService.getLatestCustomer(tokenDTO);
 	}
 
+	/**
+	 * @Description 得到工作人员最后一次登录的网格
+	 * @Param TokenDto -> userId/staffId
+	 * @Param LatestGridFormDTO -> customerId
+	 * @return Result<CustomerGridByUserIdResultDTO>
+	 * @Author wangc
+	 * @Date 2020.04.23 11:16
+	 **/
+	@PostMapping("getlatestgrid")
+	public Result<CustomerGridByUserIdResultDTO> getLatestGrid(@LoginUser TokenDto tokenDto, @RequestBody LatestGridFormDTO latestGridFormDTO){
+		latestGridFormDTO.setStaffId(tokenDto.getUserId());
+		ValidatorUtils.validateEntity(latestGridFormDTO);
+		return staffAgencyService.getLatestGrid(latestGridFormDTO);
+	}
+
 }

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

@@ -2,11 +2,14 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
 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;
 
 /**
  * @Description
@@ -15,4 +18,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
 
+    /**
+     * @Description 查询工作人员上次登录的网格
+     * @Param customerId ; staffId
+     * @return Result<CustomerGridByUserIdResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 10:44
+     **/
+    @PostMapping(value = "/epmetuser/staffgridvisited/getstafflatestgrid")
+    Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO);
+
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -2,12 +2,15 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 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 java.util.List;
 
@@ -35,4 +38,15 @@ public interface GovOrgFeignClient {
      */
     @GetMapping("/gov/org/customerstaffagency/getlatestcustomer/{userId}")
     Result<LatestCustomerResultDTO> getLatestCustomer(@PathVariable("userId") String userId);
+
+    /**
+     * @Description 查询指定客户下一个用户所在的网格,调用gov-org
+     * @Param LatestGridFormDTO -> customerId ; staffId
+     * @return Result<CustomerGridDTO>
+     * @Author wangc
+     * @Date 2020.04.23 10:53
+     **/
+    @PostMapping(value = "/gov/org/customerstaffgrid/getstaffgrid")
+    Result<CustomerGridByUserIdResultDTO> getStaffGrid(@RequestBody LatestGridFormDTO latestGridFormDTO);
+
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java

@@ -1,9 +1,11 @@
 package com.epmet.feign.fallback;
 
+
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -14,4 +16,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 
+    @Override
+    public Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffLatestGrid",latestGridFormDTO);
+    }
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -3,7 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -20,4 +22,14 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getMyGrids", userId);
     }
+
+    @Override
+    public Result<LatestCustomerResultDTO> getLatestCustomer(String userId) {
+        return null;
+    }
+
+    @Override
+    public Result<CustomerGridByUserIdResultDTO> getStaffGrid(LatestGridFormDTO latestGridFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGrid",latestGridFormDTO);
+    }
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java

@@ -17,10 +17,13 @@
 
 package com.epmet.service;
 
+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.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -45,4 +48,13 @@ public interface StaffAgencyService {
      * @return
      */
     Result<LatestCustomerResultDTO> getLatestCustomer(TokenDto tokenDTO);
+
+    /**
+     * @Description 得到工作人员最后一次登录的网格
+     * @Param LatestGridFormDTO -> staffId ; customerId
+     * @return Result<CustomerGridByUserIdResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 11:14
+     **/
+    Result<CustomerGridByUserIdResultDTO> getLatestGrid(LatestGridFormDTO latestGridFormDTO);
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -19,11 +19,14 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.StaffAgencyConstant;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffAgencyService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,5 +61,28 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
         return govOrgFeignClient.getLatestCustomer(tokenDTO.getUserId());
     }
 
+    /**
+     * @Description 得到工作人员最后一次登录的网格
+     * @Param LatestGridFormDTO -> staffId ; customerId
+     * @return Result<CustomerGridByUserIdResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 11:14
+     **/
+    @Override
+    public Result<CustomerGridByUserIdResultDTO> getLatestGrid(LatestGridFormDTO latestGridFormDTO) {
+        Result<CustomerGridByUserIdResultDTO> latestGridResult =
+                epmetUserFeignClient.getStaffLatestGrid(latestGridFormDTO);
+        if(latestGridResult.success() && null != latestGridResult.getData() && StringUtils.isNotBlank(latestGridResult.getData().getGridId())){
+            return latestGridResult;
+        }else{
+            Result<CustomerGridByUserIdResultDTO> staffGridResult =
+                govOrgFeignClient.getStaffGrid(latestGridFormDTO);
+            if(staffGridResult.success() && null != staffGridResult.getData() && StringUtils.isNotBlank(staffGridResult.getData().getGridId())){
+                return staffGridResult;
+            }
+        }
+        return new Result<CustomerGridByUserIdResultDTO>().error(StaffAgencyConstant.QUERY_LATEST_GRID_INFO_FAILED);
+    }
+
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/LatestGridFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author: wangc
+ * @description:
+ * @date: Created in 2020-04-22 18:19
+ */
+@Data
+public class LatestGridFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+
+    /**
+     * 工作人员Id
+     * */
+    @NotBlank(message = "工作人员Id不能为空")
+    private String staffId;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.excel.CustomerStaffGridExcel;
 import com.epmet.service.CustomerStaffGridService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +39,7 @@ import java.util.Map;
 
 
 /**
- * 网格人员关系表 
+ * 网格人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -45,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerstaffgrid")
 public class CustomerStaffGridController {
-    
+
     @Autowired
     private CustomerStaffGridService customerStaffGridService;
 
@@ -91,4 +93,16 @@ public class CustomerStaffGridController {
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class);
     }
 
+    /**
+     * @Description 查询指定客户下一个用户所在的网格,调用gov-org
+     * @Param LatestGridFormDTO -> customerId ; staffId
+     * @return Result<CustomerGridDTO>
+     * @Author wangc
+     * @Date 2020.04.23 10:53
+     **/
+    @PostMapping("getstaffgrid")
+    public  Result<CustomerGridByUserIdResultDTO> getStaffGrid(@RequestBody LatestGridFormDTO latestGridFormDTO){
+        ValidatorUtils.validateEntity(latestGridFormDTO);
+        return customerStaffGridService.getStaffGridOrderByGridName(latestGridFormDTO);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
-	
+
+    /**
+     * @Description 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个
+     * @Param LatestGridFormDTO -> customerId ; userId
+     * @return CustomerGridDTO
+     * @Author wangc
+     * @Date 2020.04.23 01:09
+     **/
+    CustomerGridDTO selectStaffGridOrderByGridName(LatestGridFormDTO latestGridFormDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java

@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 
 import java.util.List;
@@ -92,4 +95,13 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      * @date 2020-04-20
      */
     void delete(String[] ids);
+    
+    /**
+     * @Description 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个
+     * @Param LatestGridFormDTO -> customerId ; staffId
+     * @return CustomerGridDTO
+     * @Author wangc
+     * @Date 2020.04.23 09:11
+     **/
+    Result<CustomerGridByUserIdResultDTO> getStaffGridOrderByGridName(LatestGridFormDTO latestGridFormDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -23,8 +23,12 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStaffGridDao;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 import com.epmet.redis.CustomerStaffGridRedis;
 import com.epmet.service.CustomerStaffGridService;
@@ -101,4 +105,14 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<CustomerGridByUserIdResultDTO> getStaffGridOrderByGridName(LatestGridFormDTO latestGridFormDTO) {
+        CustomerGridDTO grid = baseDao.selectStaffGridOrderByGridName(latestGridFormDTO);
+        CustomerGridByUserIdResultDTO result = new CustomerGridByUserIdResultDTO();
+        result.setGridName(grid.getGridName());
+        result.setGridId(grid.getId());
+        result.setAgencyId(grid.getPid());
+        return new Result<CustomerGridByUserIdResultDTO>().ok(result);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -17,4 +17,28 @@
     </resultMap>
 
 
+    <!-- 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个 -->
+    <select id="selectStaffGridOrderByGridName" parameterType="com.epmet.dto.form.LatestGridFormDTO" resultType="com.epmet.dto.CustomerGridDTO">
+        SELECT
+        grid.ID,
+        grid.GRID_NAME,
+        grid.PID
+        FROM CUSTOMER_GRID grid
+        LEFT JOIN
+        CUSTOMER_STAFF_GRID staff ON
+        (
+        grid.ID = staff.GRID_ID
+        AND
+        staff.DEL_FLAG = '0'
+        AND
+        staff.CUSTOMER_ID = #{customerId}
+        AND
+        staff.USER_ID = #{staffId}
+        )
+        WHERE
+        grid.DEL_FLAG = '0'
+        ORDER BY grid.GRID_NAME ASC
+        LIMIT 1
+    </select>
+
 </mapper>

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

@@ -17,8 +17,14 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.service.StaffGridVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -35,5 +41,17 @@ public class StaffGridVisitedController {
     
     @Autowired
     private StaffGridVisitedService staffGridVisitedService;
-
+    
+    /**
+     * @Description 查询工作人员上次登录的网格
+     * @Param LatestGridFormDTO -> customerId ; staffId
+     * @return Result<CustomerGridByUserIdResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 10:05
+     **/
+    @PostMapping("getstafflatestgrid")
+    Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(@RequestBody LatestGridFormDTO latestGridFormDTO){
+        ValidatorUtils.validateEntity(latestGridFormDTO);
+        return staffGridVisitedService.getStaffLatestGrid(latestGridFormDTO);
+    }
 }

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

@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.StaffGridVisitedDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface StaffGridVisitedDao extends BaseDao<StaffGridVisitedEntity> {
-	
+
+    /**
+     * @Description 通过staffId和customerId查询当前用户上一次登录的网格信息
+     * @Param LatestGridFormDTO
+     * @return gridId
+     * @Author wangc
+     * @Date 2020.04.23 00:40
+     **/
+    String selectStaffLatestGrid(LatestGridFormDTO latestGridFormDTO);
+
 }

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

@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StaffGridVisitedDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 
 import java.util.List;
@@ -92,4 +95,13 @@ public interface StaffGridVisitedService extends BaseService<StaffGridVisitedEnt
      * @date 2020-04-21
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 得到工作人员上次登录的网格
+     * @Param LatestGridFormDTO -> staffId ; customerId
+     * @return Result<CustomerGridByUserIdResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 00:28
+     **/
+    Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO);
 }

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

@@ -23,11 +23,21 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.GridVisitedConstant;
 import com.epmet.dao.StaffGridVisitedDao;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.StaffGridVisitedDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffGridVisitedService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +54,12 @@ import java.util.Map;
 @Service
 public class StaffGridVisitedServiceImpl extends BaseServiceImpl<StaffGridVisitedDao, StaffGridVisitedEntity> implements StaffGridVisitedService {
 
+    private static final Logger logger = LoggerFactory.getLogger(StaffGridVisitedServiceImpl.class);
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+
     @Override
     public PageData<StaffGridVisitedDTO> page(Map<String, Object> params) {
         IPage<StaffGridVisitedEntity> page = baseDao.selectPage(
@@ -96,4 +112,26 @@ public class StaffGridVisitedServiceImpl extends BaseServiceImpl<StaffGridVisite
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO) {
+
+        CustomerGridByUserIdResultDTO gridResult = new CustomerGridByUserIdResultDTO();
+        String gridId = baseDao.selectStaffLatestGrid(latestGridFormDTO);
+        if(StringUtils.isNotBlank(gridId)){
+            CustomerGridFormDTO param = new CustomerGridFormDTO();
+            param.setGridId(gridId);
+            Result<CustomerGridDTO> gridInfoResult =
+            govOrgFeignClient.getCustomerGridByGridId(param);
+            if(gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getId())){
+                gridResult.setAgencyId(gridInfoResult.getData().getPid());
+                gridResult.setGridId(gridId);
+                gridResult.setGridName(gridInfoResult.getData().getGridName());
+            }else{
+                logger.warn(GridVisitedConstant.QUERY_EXCEPTION);
+            }
+        }
+
+        return new Result<CustomerGridByUserIdResultDTO>().ok(gridResult);
+    }
+
 }

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

@@ -16,5 +16,21 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 通过staffId和customerId查询当前用户上一次登录的网格信息 -->
+    <select id="selectStaffLatestGrid" parameterType="com.epmet.dto.form.LatestGridFormDTO" resultType="string">
+        SELECT
+        GRID_ID
+        FROM
+        STAFF_GRID_VISITED
+        WHERE
+        DEL_FLAG = '0'
+        AND
+        CUSTOMER_ID = #{customerId}
+        AND
+        STAFF_ID = #{staffId}
+        ORDER BY
+        CREATED_TIME DESC
+        LIMIT 1
+    </select>
 
 </mapper>