党群议事、友邻社群评论增加党员标识

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java

@@ -143,4 +143,8 @@ public class EventCommentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * PARTY_FLAG 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/UserBaseInfoDto.java

@@ -25,4 +25,9 @@ public class UserBaseInfoDto implements Serializable {
      * 用户头像
      */
     private String userFace;
+
+    /**
+     * PARTY_FLAG 党员标识（0-否，1-是）
+     */
+    private String partyFlag;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -56,6 +56,12 @@
             <artifactId>epdc-commons-tools-wx-ma</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-user-client</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java

@@ -108,4 +108,8 @@ public class EventCommentEntity extends BaseEpdcEntity {
 	 */
 	private String shieldFlag;
 
+	/**
+	 * PARTY_FLAG 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
@@ -46,6 +47,7 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentUserAttitudeEntity
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
 import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
@@ -88,6 +90,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
     @Autowired
     private EventCommentUserAttitudeService eventCommentUserAttitudeService;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public PageData<EventCommentDTO> page(Map<String, Object> params) {
         IPage<EventCommentEntity> page = baseDao.selectPage(
@@ -151,6 +156,11 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         commentEntity.setUserId(commentFormDTO.getUserId());
         commentEntity.setUserName(commentFormDTO.getUserName());
         commentEntity.setUserFace(commentFormDTO.getUserFace());
+        Result<UserDTO> userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId());
+        if(!userDTOResult.success()){
+            return new Result().error("获取用户信息失败");
+        }
+        commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag());
 
         boolean isIssue = true;
         boolean isComment = true;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 用户接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
+public interface UserFeignClient {
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description  查询用户基础信息
+     * @Date 2019/12/16 9:57
+     **/
+    @GetMapping("app-user/epdc-app/user/getById/{userId}")
+    Result<UserDTO> getUserInfoById(@PathVariable("userId") String userId);
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.modules.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户接口 Fallback
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class UserFeignClientFallback implements UserFeignClient {
+
+	@Override
+	public Result<UserDTO> getUserInfoById(String userId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
+	}
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@@ -24,6 +24,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="partyFlag" column="PARTY_FLAG"/>
     </resultMap>
 
     <resultMap id="listOfCommentsMap" type="com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO">
@@ -33,6 +34,7 @@
         <result property="user.userId" column="USER_ID"/>
         <result property="user.userName" column="USER_NAME"/>
         <result property="user.userFace" column="USER_FACE"/>
+        <result property="user.partyFlag" column="PARTY_FLAG"/>
         <result property="approveNum" column="LIKE_COUNT"/>
         <result property="opposeNum" column="UN_LIKE_COUNT"/>
         <result property="userLike" column="userLike"/>
@@ -50,6 +52,7 @@
             t2.USER_ID,
             t2.USER_FACE,
             t2.USER_NAME,
+            t2.PARTY_FLAG,
             t2.LIKE_COUNT,
             t2.UN_LIKE_COUNT,
             t2.userLike,
@@ -72,6 +75,7 @@
                 t1.USER_ID,
                 t1.USER_FACE,
                 t1.USER_NAME,
+                t1.PARTY_FLAG,
                 t1.LIKE_COUNT,
                 t1.UN_LIKE_COUNT,
                 (t1.REPLY_COUNT + t1.LIKE_COUNT + t1.UN_LIKE_COUNT) AS attitudeNum

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentDTO.java

@@ -138,4 +138,9 @@ public class TopicCommentDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * PARTY_FLAG 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/UserBaseInfoDto.java

@@ -25,4 +25,9 @@ public class UserBaseInfoDto implements Serializable {
      * 用户头像
      */
     private String userFace;
+
+    /**
+     * 党员标识是否是党员(0-否，1-是)
+     */
+    private String partyFlag;
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/entity/TopicCommentEntity.java

@@ -108,4 +108,9 @@ public class TopicCommentEntity extends BaseEpdcEntity {
      */
 	private String shieldFlag;
 
+	/**
+	 * PARTY_FLAG 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.comment.*;
 import com.elink.esua.epdc.dto.constant.TopicNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
@@ -36,6 +37,7 @@ import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao;
 import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity;
 import com.elink.esua.epdc.modules.comment.redis.TopicCommentRedis;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentService;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.topic.service.TopicService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,9 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
     @Autowired
     private NewsTask newsTask;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public PageData<TopicCommentDTO> page(Map<String, Object> params) {
         IPage<TopicCommentEntity> page = baseDao.selectPage(
@@ -122,6 +127,11 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         commentEntity.setUsername(commentFormDTO.getUserName());
         commentEntity.setUserFace(commentFormDTO.getUserFace());
         commentEntity.setTopicId(commentFormDTO.getTopicId());
+        Result<UserDTO> userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId());
+        if(!userDTOResult.success()){
+            return new Result().error("获取用户信息失败");
+        }
+        commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag());
 
         boolean isComment = true;
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
@@ -45,4 +46,14 @@ public interface UserFeignClient {
      */
     @GetMapping("app-user/usergrid/listUserGrid/{userId}")
     Result<List<UserGridRelationDTO>> listUserGrid(@PathVariable("userId") String userId);
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @Author yinzuomei
+     * @Description  查询用户基础信息
+     * @Date 2019/12/16 9:57
+     **/
+    @GetMapping("app-user/epdc-app/user/getById/{userId}")
+    Result<UserDTO> getUserInfoById(@PathVariable("userId") String userId);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
@@ -27,4 +28,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<List<UserGridRelationDTO>> listUserGrid(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listUserGrid", userId);
     }
+
+    @Override
+    public Result<UserDTO> getUserInfoById(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml

@@ -25,6 +25,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="partyFlag" column="PARTY_FLAG"/>
     </resultMap>
 
 
@@ -82,6 +83,7 @@
         <result property="user.userId" column="USER_ID"/>
         <result property="user.userName" column="USERNAME"/>
         <result property="user.userFace" column="USER_FACE"/>
+        <result property="user.partyFlag" column="PARTY_FLAG"/>
         <result property="approveNum" column="LIKE_COUNT"/>
         <result property="opposeNum" column="UN_LIKE_COUNT"/>
         <result property="userLike" column="userLike"/>
@@ -100,6 +102,7 @@
         t2.USER_ID,
         t2.USER_FACE,
         t2.USERNAME,
+        t2.PARTY_FLAG,
         t2.LIKE_COUNT,
         t2.UN_LIKE_COUNT,
         t2.userLike,
@@ -122,6 +125,7 @@
         t1.USER_ID,
         t1.USER_FACE,
         t1.USERNAME,
+        t1.PARTY_FLAG,
         t1.LIKE_COUNT,
         t1.UN_LIKE_COUNT,
         (t1.REPLY_COUNT + t1.LIKE_COUNT + t1.UN_LIKE_COUNT) AS attitudeNum

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml

@@ -16,10 +16,10 @@
             AND ugp.GROUP_ID = #{groupId}
             AND ugp.STATE = 10
             <if test="nickname != null and nickname != ''">
-                AND ugp.NICKNAME LIKE concat('%', #{nickname}, '%')
+                AND ugp.NICKNAME LIKE concat('%', trim(#{nickname}), '%')
             </if>
             <if test="mobile != null and mobile != ''">
-                AND ugp.MOBILE = #{mobile}
+                AND ugp.MOBILE = trim(#{mobile})
             </if>
         ORDER BY
             ugp.LORD_FLAG DESC,
@@ -97,4 +97,4 @@
         UPDATE epdc_user_group SET PARTY_MEMBER = #{partyMember} WHERE USER_ID = #{userId}
     </update>
 
-</mapper>
+</mapper>

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -219,7 +219,7 @@
             AND temp.GROUP_ID = #{groupId}
         </if>
         <if test="keyword != null and keyword != ''">
-            AND temp.TOPIC_CONTENT like concat('%', #{keyword}, '%')
+            AND temp.TOPIC_CONTENT like concat('%', trim(#{keyword}), '%')
         </if>
         ORDER BY
         <if test="orderType == 0">