plugin staffINfo

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 部门信息
+ * @ClassName ExtDeptResultDTO
+ * @Auth wangc
+ * @Date 2020-08-17 17:16
+ */
+@Data
+public class ExtDeptResultDTO implements Serializable {
+    private static final long serialVersionUID = 1792371558965832432L;
+
+    /**
+     * 部门Id
+     * */
+    private String deptId;
+
+    /**
+     * 部门名称
+     * */
+    private String deptName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * @Description
+ * @Description 网格信息
  * @ClassName ExtGridResultDTO
  * @Auth wangc
  * @Date 2020-08-17 15:28
@@ -14,7 +14,13 @@ import java.io.Serializable;
 public class ExtGridResultDTO implements Serializable {
     private static final long serialVersionUID = -4531574240525562587L;
 
+    /**
+     * 网格Id
+     * */
     private String gridId;
 
+    /**
+     * 网格名称
+     * */
     private String gridName;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description
+ * @Description 工作人员数据权限
  * @ClassName ExtStaffPermissionResultDTO
  * @Auth wangc
  * @Date 2020-08-17 15:24
@@ -15,9 +15,28 @@ import java.util.List;
 public class ExtStaffPermissionResultDTO implements Serializable {
     private static final long serialVersionUID = 2513553862809278219L;
 
+    /**
+     * 直属机关Id
+     * */
     private String agencyId;
 
+    /**
+     * 直属机关名称
+     * */
     private String agencyName;
 
+    /**
+     * 直属机关直属网格列表
+     * */
     private List<ExtGridResultDTO> gridList;
+
+    /**
+     * 直属机关直属部门列表
+     * */
+    private List<ExtDeptResultDTO> departmentList;
+
+    /**
+     * 子集机关列表
+     * */
+    private List<ExtStaffPermissionResultDTO> subAgencyList;
 }

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

@@ -187,4 +187,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @date 2020.08.17 09:29
     **/
     ExtStaffInfoResultDTO staffInfoExt(ExtStaffInfoResultDTO result);
+
+    /**
+     * @Description 根据staffId，查询当前这个用户的数据权限
+     * @param staffId
+     * @return
+     * @author wangc
+     * @date 2020.08.17 17:30
+    **/
+    ExtStaffPermissionResultDTO staffPermissionExt(String staffId);
 }

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

@@ -871,6 +871,23 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return result;
     }
 
+    /**
+     * @Description 根据staffId，查询当前这个用户的数据权限
+     * @param staffId
+     * @return
+     * @author wangc
+     * @date 2020.08.17 17:30
+     **/
+    @Override
+    public ExtStaffPermissionResultDTO staffPermissionExt(String staffId) {
+        //1.通过staffId去user服务查询最近一次登陆的agencyId
+        Result<String> agency =
+                epmetUserOpenFeignClient.latestAgency(staffId);
+
+        //2.根据此agencyId查询数据权限
+
+        return null;
+    }
 
 
     public <T> void mergeObject(T origin, T destination) {

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -268,4 +268,14 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("epmetuser/customerstaff/getstaffinfolist")
     Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO);
+
+    /**
+     * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
+     * @param staffId
+     * @return
+     * @author wangc
+     * @date 2020.08.17 17:45
+     **/
+    @GetMapping("/epmet/staffagencyvisited/latestagency/{staffId}")
+    Result<String> latestAgency(@PathVariable("staffId") String staffId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -188,4 +188,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<StaffSinGridResultDTO>> getStaffInfoList(UserIdsFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffInfoList", formDTO);
     }
+
+    @Override
+    public Result<String> latestAgency(String staffId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestAgency", staffId);
+    }
 }

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

@@ -62,4 +62,17 @@ public class StaffAgencyVisitedController {
 		return staffAgencyVisitedService.saveStaffLoginRecord(formDTO);
 	}
 
+
+	/**
+	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
+	 * @param staffId
+	 * @return
+	 * @author wangc
+	 * @date 2020.08.17 17:45
+	 **/
+	@GetMapping(value = "latestagency/{staffId}")
+	public Result<String> latestAgency(@PathVariable("staffId") String staffId){
+		return new Result<String>().ok(staffAgencyVisitedService.getLatestStaffAgencyId(staffId));
+	}
+
 }

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

@@ -114,4 +114,13 @@ public interface StaffAgencyVisitedService extends BaseService<StaffAgencyVisite
 	 **/
 	Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
 
+	/**
+	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
+	 * @param staffId
+	 * @return
+	 * @author wangc
+	 * @date 2020.08.17 17:45
+	**/
+	String getLatestStaffAgencyId(String staffId);
+
 }

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

@@ -127,4 +127,20 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 		return new Result();
 	}
 
+	/**
+	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
+	 * @param staffId
+	 * @return
+	 * @author wangc
+	 * @date 2020.08.17 17:45
+	 **/
+	@Override
+	public String getLatestStaffAgencyId(String staffId) {
+		StaffLatestAgencyResultDTO latestAgency =
+			baseDao.selectLatestCustomer(staffId);
+		if(null != latestAgency)
+			return latestAgency.getAgencyId();
+		return null;
+	}
+
 }