Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.46
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.47
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.46</version>
+    <version>0.3.47</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml

@@ -28,7 +28,6 @@
         cfd.icon_large_img AS "iconLargeImg",
         cfd.icon_small_img AS "iconSmallImg",
         CONCAT(
-        'https://',
         cfd.domain_name,
         cfd.target_link
         ) AS "url",

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

@@ -19,7 +19,7 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	/**
 	 * 用户Id
 	 */
-	private String userId;
+	private String id;
 
 	/**
 	 * 真实姓名
@@ -31,6 +31,11 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 */
 	private String gender;
 
+	/**
+	 * 头像
+	 */
+	private String headUrl;
+
 	/**
 	 * 邮箱
 	 */
@@ -39,10 +44,20 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	/**
 	 * 手机号
 	 */
-	private String mobile;
+	private String phone;
 
 	/**
-	 * 地址
+	 * 微信openId
 	 */
-	private String address;
+	private String wxOpenId;
+
+    /**
+     * 超级管理员   0：否   1：是
+     */
+    private Integer superAdmin;
+
+    /**
+     * 状态  0：停用    1：正常
+     */
+    private Integer status;
 }

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.123
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.124
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.123</version>
+    <version>0.3.124</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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

@@ -180,4 +180,15 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 根据客户Id和手机号查询工作人员信息
 	 **/
     GovWebOperLoginResultDTO selectByCustomerIdAndPhone(GovWebOperLoginFormDTO formDTO);
-}
+
+    /**
+     * 获取pc工作端登陆用户信息
+     *  根据token中userId，去查询登陆用户基本信息
+     *
+     * @param userId
+     * @return com.epmet.dto.result.StaffBasicInfoResultDTO
+     * @Author zhangyong
+     * @Date 10:07 2020-08-26
+     **/
+	StaffBasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
+}

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

@@ -649,9 +649,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
-        CustomerStaffEntity staffEntity = baseDao.selectByUserId(userId);
-        StaffBasicInfoResultDTO resultDTO = ConvertUtils.sourceToTarget(staffEntity, StaffBasicInfoResultDTO.class);
-        resultDTO.setGender(String.valueOf(staffEntity.getGender()));
+        StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
 

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

@@ -309,4 +309,28 @@
         ORDER BY created_time DESC
         LIMIT 1
     </select>
-</mapper>
+
+    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.StaffBasicInfoResultDTO">
+        SELECT
+            cs.CUSTOMER_ID customerId,
+            cs.USER_ID id,
+            cs.REAL_NAME realName,
+            cs.GENDER gender,
+            cs.EMAIL email,
+            cs.MOBILE phone,
+            1 superAdmin,
+            CASE cs.ENABLE_FLAG
+                WHEN 'enable' THEN
+                    1
+                ELSE
+                    0
+            END `status`,
+            cs.HEAD_PHOTO headUrl,
+            '' wxOpenId
+        FROM
+            customer_staff cs
+        WHERE
+            cs.DEL_FLAG = '0'
+            AND cs.USER_ID = #{userId}
+    </select>
+</mapper>