diff --git a/epmet-module/epmet-ext/epmet-ext-client/pom.xml b/epmet-module/epmet-ext/epmet-ext-client/pom.xml
index edb8fb13a1..925703ab91 100644
--- a/epmet-module/epmet-ext/epmet-ext-client/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-client/pom.xml
@@ -26,6 +26,12 @@
3.6.0
compile
+
+ com.epmet
+ epmet-user-client
+ 2.0.0
+ compile
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtRoleMapResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtRoleMapResultDTO.java
new file mode 100644
index 0000000000..fc2083b935
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtRoleMapResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName ExtRoleMapResultDTO
+ * @Auth wangc
+ * @Date 2020-08-17 09:19
+ */
+@Data
+public class ExtRoleMapResultDTO implements Serializable {
+ private static final long serialVersionUID = 4988555173286922503L;
+
+ /**
+ * 角色key
+ * */
+ private String roleKey;
+
+ /**
+ * 角色名称
+ * */
+ private String roleName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java
new file mode 100644
index 0000000000..a0f76c8787
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java
@@ -0,0 +1,82 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName ExtStaffInfoResultDTO
+ * @Auth wangc
+ * @Date 2020-08-17 09:14
+ */
+@Data
+public class ExtStaffInfoResultDTO implements Serializable {
+ private static final long serialVersionUID = 3874334777882476292L;
+
+ /**
+ * 工作人员昵称
+ * */
+ private String nickname;
+
+ /**
+ * 工作人员头像
+ * */
+ private String profile;
+
+ /**
+ *
+ * */
+ private String realName;
+
+ /**
+ * 客户Id
+ * */
+ private String customerId;
+
+ /**
+ * 客户名称
+ * */
+ private String customerName;
+
+ /**
+ * 机关Id
+ * */
+ private String agencyId;
+
+ /**
+ * 机关名称
+ * */
+ private String agencyName;
+
+ /**
+ * 机关路径Id
+ * */
+ private String agencyIdPath;
+
+ /**
+ * 机关路径名称
+ * */
+ private String agencyNamePath;
+
+ /**
+ * 网格Id
+ * */
+ private String gridId;
+
+ /**
+ * 网格名称
+ * */
+ private String gridName;
+
+ /**
+ * 是否管理员标识 1是0否
+ * */
+ private String adminFlag;
+
+ /**
+ * 用户角色列表
+ * */
+ private List roleList;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index dbd11097bd..1694033b41 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -220,4 +220,14 @@ public interface GovOrgOpenFeignClient {
*/
@PostMapping(value = "/gov/org/customerstaffagency/getagencystaffs",consumes = MediaType.APPLICATION_JSON_VALUE)
Result> getAgencyStaffs(@RequestBody AgencyIdFormDTO formDTO);
+
+ /**
+ * @Description User模块调用gov-org查询工作人员所在机关的信息以及客户信息
+ * @param result
+ * @return
+ * @author wangc
+ * @date 2020.08.17 14:11
+ **/
+ @PostMapping("/gov/org/customeragency/staffinfoext")
+ Result staffInfoExt(@RequestBody ExtStaffInfoResultDTO result);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 1394cb2146..c845039399 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -131,4 +131,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result> getAgencyStaffs(AgencyIdFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyStaffs", formDTO);
}
+
+ @Override
+ public Result staffInfoExt(ExtStaffInfoResultDTO result) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "staffInfoExt", result);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 83250c4c17..c4cf4008e0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -193,4 +193,16 @@ public class CustomerAgencyController {
Result querySponsorList(@PathVariable("staffId") String staffId){
return new Result().ok(customerAgencyService.querySponsorList(staffId));
}
+
+ /**
+ * @Description 对外接口 获取工作人员基本信息
+ * @param result ExtStaffInfoResultDTO.class
+ * @return Result
+ * @author wangc
+ * @date 2020.08.17 13:52
+ **/
+ @PostMapping("staffinfoext")
+ Result staffInfoExt(@RequestBody ExtStaffInfoResultDTO result){
+ return new Result().ok(customerAgencyService.staffInfoExt(result));
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 8a51d3ad19..4b22c60245 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -124,4 +124,13 @@ public interface CustomerAgencyDao extends BaseDao {
* @Description 递归查询当前机关的下一级机关列表
**/
List selectAllSubAgency(@Param("subAgencyPids") String subAgencyPids);
+
+ /**
+ * @Description 查询一个工作人员最近登录的网格以及机关信息
+ * @param gridId
+ * @return
+ * @author wangc
+ * @date 2020.08.17 09:50
+ **/
+ ExtStaffInfoResultDTO selectAgencyAndGridInfoExt(@Param("gridId") String gridId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index cacba8512e..b6746c59f3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -178,4 +178,13 @@ public interface CustomerAgencyService extends BaseService
* @Date 2020/7/23 20:50
**/
ActSponsorResultDTO querySponsorList(String staffId);
+
+ /**
+ * @Description 查询工作人员的信息，多客户/单客户，epmet-plugin，对外开放调用
+ * @param result
+ * @return
+ * @author wangc
+ * @date 2020.08.17 09:29
+ **/
+ ExtStaffInfoResultDTO staffInfoExt(ExtStaffInfoResultDTO result);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index e399d29b85..344e947135 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.CustomerAgencyRedis;
import com.epmet.service.CustomerAgencyService;
+import com.epmet.util.ModuleConstant;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@@ -834,4 +836,74 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl customerResult =
+ operCrmFeignClient.getCustomerInfo(customerParam);
+ if(customerResult.success() && null != customerResult.getData()){
+ result.setCustomerName(customerResult.getData().getCustomerName());
+ }
+ checkFieldAndSetDefault(result);
+ return result;
+ }
+
+
+
+ public void mergeObject(T origin, T destination) {
+ if (origin == null || destination == null)
+ return;
+ if (!origin.getClass().equals(destination.getClass()))
+ return;
+
+ Field[] fields = origin.getClass().getDeclaredFields();
+ for (int i = 0; i < fields.length; i++) {
+ try {
+ fields[i].setAccessible(true);
+ Object value = fields[i].get(origin);
+ if (null != value) {
+ fields[i].set(destination, value);
+ }
+ fields[i].setAccessible(false);
+ } catch (Exception e) {
+
+ }
+ }
+ }
+
+
+
+ public void checkFieldAndSetDefault(T origin) {
+ if (origin == null)
+ return;
+ Field[] fields = origin.getClass().getDeclaredFields();
+ for (int i = 0; i < fields.length; i++) {
+ try {
+ fields[i].setAccessible(true);
+ Object value = fields[i].get(origin);
+ if (null == value && value.getClass().getName().equals("java.lang.String")) {
+ fields[i].set(origin, ModuleConstant.EMPTY_STR);
+ }
+ fields[i].setAccessible(false);
+ } catch (Exception e) {
+
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java
index a1539be232..143d496aec 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java
@@ -71,4 +71,6 @@ public interface ModuleConstant {
* 组织类型：网格
* */
String ORG_TYPE_GRID = "grid";
+
+ String EMPTY_STR = "";
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 61b9011343..ffcb626923 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -169,4 +169,21 @@
ORDER BY created_time DESC
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonStaffIdFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonStaffIdFormDTO.java
new file mode 100644
index 0000000000..95d8b74e9d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonStaffIdFormDTO.java
@@ -0,0 +1,24 @@
+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 工作人员Id
+ * @ClassName CommonStaffIdFormDTO
+ * @Auth wangc
+ * @Date 2020-08-17 10:28
+ */
+@Data
+public class CommonStaffIdFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -5093758817860808310L;
+
+ public interface StaffIdGroup extends CustomerClientShowGroup{}
+
+ @NotBlank(message = "工作人员Id不能为空" , groups = StaffIdGroup.class)
+ private String staffId;
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
index 8ed7c0727d..8d94810e84 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
@@ -333,4 +333,17 @@ public class CustomerStaffController {
ValidatorUtils.validateEntity(formDTO);
return new Result>().ok(customerStaffService.getStaffInfoList(formDTO));
}
+
+ /**
+ * @Description 查找工作人员的信息 - 对外开放接口
+ * @param staffParam
+ * @return
+ * @author wangc
+ * @date 2020.08.17 10:30
+ **/
+ @PostMapping("extstaffinfo")
+ public Result extStaffInfo(CommonStaffIdFormDTO staffParam){
+ ValidatorUtils.validateEntity(staffParam, CommonStaffIdFormDTO.StaffIdGroup.class);
+ return new Result().ok(customerStaffService.extStaffInfo(staffParam));
+ }
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index ce0ff406c7..fefa18a1d7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -153,4 +153,13 @@ public interface CustomerStaffDao extends BaseDao {
* @date 2020/8/13 1:45 下午
*/
List getStaffInfoList(@Param("userIds")List userIds);
+
+ /**
+ * @Description 查询工作人员信息 (对外接口)
+ * @param staffId
+ * @return
+ * @author wangc
+ * @date 2020.08.17 13:26
+ **/
+ ExtStaffInfoResultDTO selectStaffInfoExt(@Param("staffId") String staffId);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
index 1eb5e070e4..055d456159 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
@@ -266,4 +266,13 @@ public interface CustomerStaffService extends BaseService {
* @date 2020/8/13 1:45 下午
*/
List getStaffInfoList( UserIdsFormDTO formDTO);
+
+ /**
+ * @Description 查找工作人员的信息 - 对外开放接口
+ * @param staffParam
+ * @return
+ * @author wangc
+ * @date 2020.08.17 10:30
+ **/
+ ExtStaffInfoResultDTO extStaffInfo(CommonStaffIdFormDTO staffParam);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 2ff38361cb..162299581e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -576,4 +576,27 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl govOrgResult =
+ govOrgOpenFeignClient.staffInfoExt(result);
+ if(govOrgResult.success() && null != govOrgResult.getData()){
+ return govOrgResult.getData();
+ }
+ }
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index bcd20d8b96..5a8bc1743f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -235,4 +235,50 @@
cs.user_id = #{userId}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file