切换网格v2

epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/SwitchGridFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -14,14 +15,21 @@ public class SwitchGridFormDTO implements Serializable {
     private static final long serialVersionUID = -2898130727929596798L;
 
     /**
-     * sessionKey
+     * customerId
      */
+    @NotBlank(message = "customerId不能为空")
     private String customerId;
 
     /**
-     * sessionKey
+     * gridId
      */
+    @NotBlank(message = "gridId不能为空")
     private String gridId;
 
+    /**
+     * staffId从tokenTto获取
+     */
+    @NotBlank(message = "staffId不能为空")
+    private String staffId;
 }
 

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

@@ -20,9 +20,9 @@ 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.dto.form.SwitchGridFormDTO;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.service.StaffAgencyService;
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -77,7 +78,8 @@ public class StaffAgencyController {
 	 * @Date 2020/4/23 10:34
 	 **/
 	@PostMapping("switchgrid")
-	public Result<List<String>> switchGrid(@LoginUser TokenDto tokenDto, @RequestBody @Valid SwitchGridFormDTO switchGridFormDTO) {
+	public Result<Set<String>> switchGrid(@LoginUser TokenDto tokenDto, @RequestBody @Valid SwitchGridFormDTO switchGridFormDTO) {
+		switchGridFormDTO.setStaffId(tokenDto.getUserId());
 		return staffAgencyService.switchGrid(switchGridFormDTO);
 	}
 	/**

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

@@ -23,11 +23,6 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
         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,16 +17,15 @@
 
 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.SwitchGridFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -58,7 +57,7 @@ public interface StaffAgencyService {
      * @Description 切换网格
      * @Date 2020/4/23 10:49
      **/
-    Result<List<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO);
+    Result<Set<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO);
 
     /**
      * @Description 得到工作人员最后一次登录的网格

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

@@ -28,6 +28,7 @@ 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.AccessService;
 import com.epmet.service.StaffAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -49,7 +51,8 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
-
+    @Autowired
+    private AccessService accessService;
     /**
      * @param tokenDTO
      * @return
@@ -91,16 +94,17 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
 
 
     @Override
-    public Result<List<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO) {
+    public Result<Set<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO) {
         //记录网格访问记录
         StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class);
         Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
         if (!saveStaffGridVisitedRecord.success()) {
             logger.error("保存网格访问记录失败");
-            return new Result<List<String>>().error();
+            return new Result<Set<String>>().error();
         }
         //查询网格的权限
-        return new Result<>();
+        Set<String> opeKeys = accessService.listOpeKeysByStaffId(switchGridFormDTO.getStaffId(), null, switchGridFormDTO.getGridId());
+        return new Result<Set<String>>().ok(opeKeys);
     }