政府端我的个人信息

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

@@ -0,0 +1,35 @@
+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.result.MineResultDTO;
+import com.epmet.service.MineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/22 17:59
+ */
+@RestController
+@RequestMapping("mine")
+public class MineController {
+	@Autowired
+	private MineService mineService;
+
+	/**
+	 * 我的个人信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/22 18:01
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.MineResultDTO>
+	 */
+	@PostMapping("profile")
+	public Result<MineResultDTO> profile(@LoginUser TokenDto tokenDto) {
+		return new Result<MineResultDTO>().ok(mineService.profile(tokenDto));
+	}
+}

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

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.result.MineResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -66,4 +68,12 @@ public interface GovOrgFeignClient {
      */
     @PostMapping("/gov/org/agency/agencybystaff/{staffId}")
     Result<CustomerAgencyDTO> getAgencyByStaff(@PathVariable("staffId") String staffId);
+
+    /**
+     * 我的个人信息
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("/gov/org/staff/mine")
+    Result<MineResultDTO> mine(@RequestBody StaffInfoFromDTO fromDTO);
 }

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

@@ -0,0 +1,20 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.result.MineResultDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/22 18:02
+ */
+public interface MineService {
+	/**
+	 * 我的个人信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/22 18:04
+	 * @param tokenDto
+	 * @return com.epmet.dto.result.MineResultDTO
+	 */
+	MineResultDTO profile(TokenDto tokenDto);
+}

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

@@ -0,0 +1,35 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.result.MineResultDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.service.MineService;
+import org.apache.poi.ss.formula.constant.ErrorConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/22 18:03
+ */
+@Service
+public class MineServiceImpl implements MineService {
+	@Autowired
+	GovOrgFeignClient govOrgFeignClient;
+	@Override
+	public MineResultDTO profile(TokenDto tokenDto) {
+		StaffInfoFromDTO fromDTO = new StaffInfoFromDTO();
+		fromDTO.setStaffId(tokenDto.getUserId());
+		Result<MineResultDTO> result = govOrgFeignClient.mine(fromDTO);
+		if(!result.success() || null == result.getData()) {
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		}
+		return result.getData();
+	}
+}

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

@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/22 16:52
+ */
+@NoArgsConstructor
+@Data
+public class MineResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 8987281818368677411L;
+	/**
+	 * 工作人员id,后台userId
+	 */
+	private String staffId;
+	/**
+	 * 头像
+	 */
+	private String staffHeadPhoto;
+	/**
+	 * 真实姓名
+	 */
+	private String realName;
+	/**
+	 * 性别0未知，1男2女
+	 */
+	private Integer gender;
+	/**
+	 * 所属机关单位名称（上级-所属）
+	 */
+	private String agencyName;
+	/**
+	 * 角色
+	 */
+	private List<String> roleList;
+}

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

@@ -130,4 +130,9 @@ public class StaffController {
 	public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.disabledStaff(tokenDto, fromDTO);
 	}
+
+	@PostMapping("mine")
+	public Result<MineResultDTO> mine(@RequestBody StaffInfoFromDTO fromDTO){
+		return new Result<MineResultDTO>().ok(staffService.mine(fromDTO));
+	}
 }

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

@@ -107,4 +107,13 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return
      */
     CustomerAgencyDTO getCustomerRootAgency(@Param("customerId") String customerId);
+
+    /**
+     * 获取所属机关单位名称（上级-所属）
+     * @author zhaoqifeng
+     * @date 2020/5/22 17:53
+     * @param agencyId
+     * @return java.lang.String
+     */
+    String selectAgencyName(@Param("agencyId") String agencyId);
 }

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

@@ -147,4 +147,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 根据当前组织ID查询上两级组织、本级组织和所有下级(迭代)组织
      **/
     ProcessorListResultDTO getProcessorList(String agencyId);
+
+    /**
+     * 获取所属机关单位名称（上级-所属）
+     * @author zhaoqifeng
+     * @date 2020/5/22 17:10
+     * @param agencyId
+     * @return java.lang.String
+     */
+    String getAgencyName(String agencyId);
 }

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

@@ -133,4 +133,13 @@ public interface CustomerStaffAgencyService extends BaseService<CustomerStaffAge
 	 * @Date 2020.04.26 16:37
 	 **/
 	Result<List<CommonStaffInfoResultDTO>> getSelectableDeptStaffs(CommonDepartmentFormDTO departmentFormDTO);
+
+	/**
+	 * 根据工作人员ID查询相关信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/22 17:01
+	 * @param userId
+	 * @return com.epmet.dto.CustomerStaffAgencyDTO
+	 */
+	CustomerStaffAgencyDTO getInfoByUserId(String userId);
 }

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

@@ -82,4 +82,13 @@ public interface StaffService {
 	 */
 	Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO);
 
+	/**
+	 * 我的基本信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/22 16:57
+	 * @param fromDTO
+	 * @return com.epmet.dto.result.MineResultDTO
+	 */
+	MineResultDTO mine(StaffInfoFromDTO fromDTO);
+
 }

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

@@ -606,6 +606,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return processorList;
     }
 
+    @Override
+    public String getAgencyName(String agencyId) {
+        return null;
+    }
+
     /**
      * @param subAgencyPids 当前组织的下一级组织的pids字段值(当前组织的pids+":"+当前组织Id)
      * @return

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

@@ -200,4 +200,12 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
     }
 
+    @Override
+    public CustomerStaffAgencyDTO getInfoByUserId(String userId) {
+        QueryWrapper<CustomerStaffAgencyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(userId), "USER_ID", userId);
+        CustomerStaffAgencyEntity entity = baseDao.selectList(wrapper).get(NumConstant.ZERO);
+        return ConvertUtils.sourceToTarget(entity, CustomerStaffAgencyDTO.class);
+    }
+
 }

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

@@ -157,4 +157,21 @@ public class StaffServiceImpl implements StaffService {
 		}
 		return epmetUserFeignClient.disabledStaff(fromDTO);
 	}
+
+	@Override
+	public MineResultDTO mine(StaffInfoFromDTO fromDTO) {
+		MineResultDTO result = new MineResultDTO();
+		CustomerStaffAgencyDTO customerStaffAgency = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
+		fromDTO.setCustomerId(customerStaffAgency.getCustomerId());
+		fromDTO.setAgencyId(customerStaffAgency.getAgencyId());
+		StaffDetailResultDTO staffDetail = epmetUserFeignClient.getStaffDetail(fromDTO).getData();
+		String agencyName = customerAgencyService.getAgencyName(customerStaffAgency.getAgencyId());
+		result.setStaffId(staffDetail.getStaffId());
+		result.setRealName(staffDetail.getName());
+		result.setStaffHeadPhoto(staffDetail.getHeadPhoto());
+		result.setGender(staffDetail.getGender());
+		result.setRoleList(staffDetail.getRoles());
+		result.setAgencyName(agencyName);
+		return result;
+	}
 }

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

@@ -143,5 +143,17 @@
           AND ca.CUSTOMER_ID = #{customerId}
           AND ca.DEL_FLAG = 0
     </select>
+    <select id="selectAgencyName" resultType="java.lang.String">
+        SELECT
+            IF
+                (
+                    IFNULL( b.ORGANIZATION_NAME, TRUE ),
+                    a.ORGANIZATION_NAME,
+                    CONCAT( b.ORGANIZATION_NAME, '-', a.ORGANIZATION_NAME )) AS agencyName
+        FROM
+            customer_agency a
+                LEFT JOIN customer_agency b ON a.PID = b.ID
+        WHERE a.ID = #{agencyId}
+    </select>
 
 </mapper>