Merge remote-tracking branch 'origin/feature/phaseOne'

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a
+Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit f49128405cd591b9aab7f129df01518c5aea143e
+Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2

epdc-cloud-parent-yushan

@@ -1 +1 @@
-Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d

epdc-cloud-user/pom.xml

@@ -149,27 +149,28 @@
 
                 <server.port>9068</server.port>
 
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
                 <dynamic.datasource.first.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </dynamic.datasource.first.url>
-                <dynamic.datasource.first.username>epdcyushan</dynamic.datasource.first.username>
-                <dynamic.datasource.first.password>elink833066</dynamic.datasource.first.password>
+                <dynamic.datasource.first.username>yushan_epdc_test</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>elink-epdc@yushan</dynamic.datasource.first.password>
+
 
                 <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
@@ -185,27 +186,27 @@
 
                 <server.port>10014</server.port>
 
-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
                 <dynamic.datasource.first.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </dynamic.datasource.first.url>
-                <dynamic.datasource.first.username>epdcyushan</dynamic.datasource.first.username>
-                <dynamic.datasource.first.password>elink833066</dynamic.datasource.first.password>
+                <dynamic.datasource.first.username>yushan_epdc_test</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>elink-epdc@yushan</dynamic.datasource.first.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
+                <nacos.ip>115.29.142.202</nacos.ip>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
 
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>

epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java

@@ -0,0 +1,61 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppShowIdentityFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO;
+import com.elink.esua.epdc.service.UserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * create by: zhangfenghe
+ * description: 党员亮身份表
+ * create time: 2021/8/29$ 10:32$
+ */
+@RestController
+@RequestMapping("partyMember")
+public class EpdcAppPartyMemberController {
+
+    @Autowired
+    private UserInfoService  userInfoService;
+
+    @PostMapping("showIdentity")
+    public Result saveShowIdentity(@RequestBody EpdcAppShowIdentityFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+        userInfoService.save(formDto);
+        return new Result();
+    }
+
+    @GetMapping("dentityDetail/{userId}")
+    public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(@PathVariable("userId") String userId){
+        EpdcAppIdentityDetailResultDTO data = userInfoService.getDentityDetail(userId);
+        return new Result<EpdcAppIdentityDetailResultDTO>().ok(data);
+    }
+
+    /**
+     * 党建引领-党员亮身份推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    @PostMapping("brightIdentity/recommended/{id}")
+    public Result recommended(@PathVariable("id") String id){
+        return userInfoService.recommended(id);
+    }
+
+    /**
+     * 党建引领-党员亮身份取消推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    @PostMapping("brightIdentity/recommendedCancel/{id}")
+    public Result recommendedCancel(@PathVariable("id") String id){
+        return userInfoService.recommendedCancel(id);
+    }
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO;
+import com.elink.esua.epdc.entity.UserInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+/**
+ *
+ * 用户信息表-党员亮身份
+ * @author zhangfenghe
+ * @since 2021/8/29 11:43
+ */
+@Mapper
+public interface UserInfoDao extends BaseDao<UserInfoEntity> {
+
+    String selectDentityIdByUserId(String userId);
+
+    /**
+     *获取党员亮身份详情接口
+     * @params [userId]
+     * @return com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO
+     * @author jyyzz
+     * @since 2021/8/29 11:44
+     */
+    EpdcAppIdentityDetailResultDTO selectDentityDetail(String userId);
+
+    /**
+     * 党建引领-党员亮身份推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    void recommended(String id);
+
+    /**
+     * 党建引领-党员亮身份取消推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    void recommendedCancel(String id);
+
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java

@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * create by: zhangfenghe
+ * description: 用户信息表
+ * create time: 2021/8/29$ 10:47$
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("epdc_user_info")
+public class UserInfoEntity extends BaseEpdcEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 头像地址
+     */
+    private String headUrl;
+
+    /**
+     * 格言
+     */
+    private String motto;
+
+    /**
+     * 承诺
+     */
+    private String promise;
+
+    /**
+     * 服务范围
+     */
+    private String serviceArea;
+
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppShowIdentityFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO;
+import com.elink.esua.epdc.entity.UserInfoEntity;
+
+public interface UserInfoService extends BaseService<UserInfoEntity> {
+
+
+     /**
+      * 用户信息表
+      * @params [dto]
+      * @return void
+      * @author zhangfenghe
+      * @since 2021/8/29 11:00
+      */
+    void save(EpdcAppShowIdentityFormDTO dto);
+
+    EpdcAppIdentityDetailResultDTO getDentityDetail(String userId);
+
+    /**
+     * 党建引领-党员亮身份推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    Result recommended(String id);
+
+    /**
+     * 党建引领-党员亮身份取消推荐
+     * @params [id]
+     * @return void
+     * @author zhangfenghe
+     * @since 2021/8/30 9:26
+     */
+    Result recommendedCancel(String id);
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java

@@ -0,0 +1,56 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.dao.UserInfoDao;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppShowIdentityFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO;
+import com.elink.esua.epdc.entity.UserInfoEntity;
+import com.elink.esua.epdc.service.UserInfoService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ *
+ * create by: zhangfenghe
+ * description: 党员亮身份
+ * create time: 2021/8/29$ 11:27$
+ */
+@Service
+public class UserInfoServiceImpl extends BaseServiceImpl<UserInfoDao, UserInfoEntity> implements UserInfoService {
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(EpdcAppShowIdentityFormDTO dto) {
+        UserInfoEntity entity = ConvertUtils.sourceToTarget(dto,UserInfoEntity.class);
+        String id = baseDao.selectDentityIdByUserId(dto.getUserId());
+        if ("".equalsIgnoreCase(id) || null == id){
+            insert(entity);
+        }else {
+            entity.setId(id);
+            updateById(entity);
+        }
+    }
+
+    @Override
+    public EpdcAppIdentityDetailResultDTO getDentityDetail(String userId) {
+        EpdcAppIdentityDetailResultDTO dentityDetail = baseDao.selectDentityDetail(userId);
+        return dentityDetail;
+    }
+
+    @Override
+    public Result recommended(String id) {
+        AssertUtils.isBlank(id,"id");
+        baseDao.recommended(id);
+        return new Result();
+    }
+
+    @Override
+    public Result recommendedCancel(String id) {
+        AssertUtils.isBlank(id,"id");
+        baseDao.recommendedCancel(id);
+        return new Result();
+    }
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -446,6 +446,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcUserInfoResultDTO> getInfoById(String id) {
+        EpdcUserInfoResultDTO user = baseDao.selectOneInfoById(id);
 
         return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id));
     }

epdc-cloud-user/src/main/resources/mapper/UserDao.xml

@@ -19,13 +19,20 @@
             eu.ROAD AS road,
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE AS dwellingPlace,
-            eu.PARTY_FLAG AS partyFlag
+            eu.PARTY_FLAG AS partyFlag,
+            CASE
+                COUNT( ui.ID )
+                WHEN 0 THEN
+                    '0' ELSE '1'
+                END AS showIdentityFlag
         FROM
             epdc_user eu
-        Left Join (select * from  epdc_user_grid_relation  where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr
-            on(eu.id=eugr.USER_ID)
+                LEFT JOIN ( SELECT gr.ALL_DEPT_NAMES, gr.USER_ID FROM epdc_user_grid_relation gr WHERE gr.DEL_FLAG = '0' AND gr.USER_ID = #{id} ORDER BY gr.UPDATED_TIME DESC LIMIT 0, 1 ) eugr ON ( eu.id = eugr.USER_ID )
+                LEFT JOIN epdc_user_info ui ON eu.ID = ui.USER_ID
+                AND ui.DEL_FLAG = '0'
         WHERE
             eu.ID = #{id}
+          AND eu.DEL_FLAG = '0'
     </select>
     <select id="deleteByUnionId">
         DELETE

epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.UserInfoDao">
+
+    <select id="selectDentityDetail" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO">
+        SELECT
+            ui.HEAD_URL,
+            ui.MOTTO,
+            ui.PROMISE,
+            ui.SERVICE_AREA
+        FROM epdc_user_info ui
+        WHERE ui.USER_ID = #{userId}
+            AND ui.DEL_FLAG = '0'
+
+    </select>
+    <select id="selectDentityIdByUserId" resultType="String">
+        SELECT
+            id
+        FROM epdc_user_info
+        WHERE USER_ID = #{userId}
+            AND DEL_FLAG = '0'
+    </select>
+    <update id="recommended">
+        UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0'
+    </update>
+    <update id="recommendedCancel">
+        UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '0' WHERE ID = #{id} AND DEL_FALG = '0'
+    </update>
+</mapper>