user服务提供两个对外接口查询用户基础信息

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java

@@ -0,0 +1,23 @@
+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;
+
+/**
+ * @Author sun
+ * @Description 工作端-查询用户基础信息-接口入参
+ **/
+@Data
+public class StaffBasicInfoFormDTO implements Serializable{
+    private static final long serialVersionUID = -7994579456530273809L;
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空" , groups = { StaffBasicInfoGroup.class })
+    private String staffId;
+    public interface StaffBasicInfoGroup {}
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java

@@ -0,0 +1,22 @@
+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;
+
+/**
+ * @Author sun
+ * @Description 居民端-查询用户基础信息-接口入参
+ **/
+@Data
+public class UserBasicInfoFormDTO implements Serializable{
+    private static final long serialVersionUID = -7994579456530273809L;
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空" , groups = { UserBasicInfoGroup.class })
+    private String userId;
+    public interface UserBasicInfoGroup {}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfo.java

@@ -0,0 +1,39 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 工作端-查询用户基础信息-接口返参
+ **/
+@Data
+public class StaffBasicInfo implements Serializable {
+
+	/**
+	 * 客户Id
+	 */
+	private String customerId;
+
+	/**
+	 * 用户Id
+	 */
+	private String staffId;
+
+	/**
+	 * wx_open_id
+	 */
+	private String openId;
+
+	/**
+	 * 是否禁用（未禁用enable,已禁用disabled）
+	 */
+	private String enableFlag;
+
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBasicInfo.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 居民端-查询用户基础信息-接口返参
+ **/
+@Data
+public class UserBasicInfo implements Serializable {
+
+	/**
+	 * 用户Id
+	 */
+	private String userId;
+
+	/**
+	 * wx_open_id
+	 */
+	private String openId;
+
+}

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

@@ -313,4 +313,18 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping("epmetuser/role/getuserrolekeylist")
     Result<List<String>> getUserRoleKeyList(@RequestBody GetRoleKeyListFormDTO dto);
+
+    /**
+     * @Author sun
+     * @Description 居民端-查询用户基础信息
+     **/
+    @PostMapping(value = "epmetuser/user/getuserbasicinfo")
+    Result<UserBasicInfo> getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 工作端-查询用户基础信息
+     **/
+    @PostMapping(value = "epmetuser/staffagencyvisited/getstaffbasicinfo")
+    Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO);
 }

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

@@ -210,4 +210,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<String>> getUserRoleKeyList(GetRoleKeyListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleKeyList", dto);
     }
+
+    @Override
+    public Result<UserBasicInfo> getUserBasicInfo(UserBasicInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserBasicInfo", formDTO);
+    }
+
+    @Override
+    public Result<StaffBasicInfo> getStaffBasicInfo(StaffBasicInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", formDTO);
+    }
 }

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

@@ -18,8 +18,11 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
+import com.epmet.dto.result.UserBasicInfo;
 import com.epmet.service.StaffAgencyVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -62,5 +65,13 @@ public class StaffAgencyVisitedController {
 		return staffAgencyVisitedService.saveStaffLoginRecord(formDTO);
 	}
 
+	/**
+	 * @Author sun
+	 * @Description 工作端-查询用户基础信息
+	 **/
+	@PostMapping(value = "getstaffbasicinfo")
+	public Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO){
+		return new Result<StaffBasicInfo>().ok(staffAgencyVisitedService.getStaffBasicInfo(formDTO));
+	}
 
 }

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

@@ -143,4 +143,14 @@ public class UserController {
 		ValidatorUtils.validateEntity(wxUserInfoFormDTO);
 		return userService.updateWxUserInfo(wxUserInfoFormDTO);
 	}
+
+	/**
+	 * @Author sun
+	 * @Description 居民端-查询用户基础信息
+	 **/
+	@PostMapping("getuserbasicinfo")
+	public  Result<UserBasicInfo> getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO){
+		return new Result<UserBasicInfo>().ok(userService.getUserBasicInfo(formDTO));
+	}
+
 }

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

@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.StaffBasicInfoFormDTO;
+import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.entity.StaffAgencyVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,5 +41,9 @@ public interface StaffAgencyVisitedDao extends BaseDao<StaffAgencyVisitedEntity>
      **/
     StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId);
 
-
+    /**
+     * @Author sun
+     * @Description 工作端-查询用户基础信息
+     **/
+    StaffBasicInfo selectStaffBasicInfo(StaffBasicInfoFormDTO formDTO);
 }

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

@@ -2,9 +2,11 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
+import com.epmet.dto.form.UserBasicInfoFormDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
 import com.epmet.dto.result.MyselfMsgResultDTO;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
+import com.epmet.dto.result.UserBasicInfo;
 import com.epmet.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,4 +46,10 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2020.05.22 19:19
     **/
     MyselfMsgResultDTO getMyselfMsg(@Param("userId")String userId);
+
+    /**
+     * @Author sun
+     * @Description 居民端-查询用户基础信息
+     **/
+    UserBasicInfo selectUserBasicInfo(UserBasicInfoFormDTO formDTO);
 }

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

@@ -21,7 +21,9 @@ 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.StaffAgencyVisitedDTO;
+import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.entity.StaffAgencyVisitedEntity;
 
@@ -114,5 +116,9 @@ public interface StaffAgencyVisitedService extends BaseService<StaffAgencyVisite
 	 **/
 	Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
 
-
+	/**
+	 * @Author sun
+	 * @Description 工作端-查询用户基础信息
+	 **/
+    StaffBasicInfo getStaffBasicInfo(StaffBasicInfoFormDTO formDTO);
 }

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

@@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.dto.result.MyResiUserInfoResultDTO;
-import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.entity.UserEntity;
 
 /**
@@ -83,4 +80,10 @@ public interface UserService extends BaseService<UserEntity> {
      * @Description 小程序微信用户登陆，新增或更新用户信息
      **/
     UserDTO saveWxUser(WxUserFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 居民端-查询用户基础信息
+     **/
+    UserBasicInfo getUserBasicInfo(UserBasicInfoFormDTO formDTO);
 }

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

@@ -26,7 +26,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StaffAgencyVisitedDao;
 import com.epmet.dto.StaffAgencyVisitedDTO;
+import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.entity.StaffAgencyVisitedEntity;
 import com.epmet.feign.OperCrmFeignClient;
@@ -127,6 +129,14 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 		return new Result();
 	}
 
+	/**
+	 * @Author sun
+	 * @Description 工作端-查询用户基础信息
+	 **/
+	@Override
+	public StaffBasicInfo getStaffBasicInfo(StaffBasicInfoFormDTO formDTO) {
+		return baseDao.selectStaffBasicInfo(formDTO);
+	}
 
 
 }

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

@@ -270,4 +270,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return resultDTO;
     }
 
+    /**
+     * @Author sun
+     * @Description 居民端-查询用户基础信息
+     **/
+    @Override
+    public UserBasicInfo getUserBasicInfo(UserBasicInfoFormDTO formDTO) {
+        return baseDao.selectUserBasicInfo(formDTO);
+    }
+
 }

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

@@ -36,4 +36,26 @@
             LIMIT 1
     </select>
 
+    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.StaffBasicInfo">
+        SELECT
+            sav.staff_id AS "staffId",
+            sav.customer_id AS "customerId	",
+            sav.wx_open_id AS "openId",
+            cs.enable_flag AS "enableFlag",
+            sav.mobile AS "mobile"
+        FROM
+            staff_agency_visited sav
+        LEFT JOIN USER u ON sav.staff_id = u.id
+        LEFT JOIN customer_staff cs ON sav.staff_id = cs.user_id
+        WHERE
+            sav.del_flag = '0'
+        AND u.del_flag = '0'
+        AND cs.del_flag = '0'
+        AND u.from_app = 'gov'
+        AND sav.staff_id = #{staffId}
+        ORDER BY
+            sav.created_time DESC
+        LIMIT 1
+    </select>
+
 </mapper>

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

@@ -52,4 +52,19 @@
             AND
             user.FROM_APP = 'resi'
     </select>
+
+    <select id="selectUserBasicInfo" resultType="com.epmet.dto.result.UserBasicInfo">
+        SELECT
+            u.id AS "userId",
+            uw.wx_open_id AS "openId"
+        FROM
+            `user` u
+        INNER JOIN user_wechat uw ON u.id = uw.user_id
+        WHERE
+            u.del_flag = '0'
+        AND uw.del_flag = '0'
+        AND u.from_app = 'resi'
+        AND u.id = #{userId}
+        LIMIT 1
+    </select>
 </mapper>