议题列表新增返回字段；修改测试环境nacos配置

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -186,7 +186,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>10021</server.port>
+                <server.port>10921</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
@@ -198,7 +198,7 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip>118.190.232.100</nacos.ip>
+                <nacos.ip>47.104.205.48</nacos.ip>
                 <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>

esua-epdc/epdc-auth/pom.xml

@@ -126,7 +126,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>10002</server.port>
+                <server.port>10902</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
@@ -139,7 +139,7 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip>118.190.232.100</nacos.ip>
+                <nacos.ip>47.104.205.48</nacos.ip>
                 <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
 
 

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

@@ -223,7 +223,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>10004</server.port>
+                <server.port>10904</server.port>
 
                 <spring.redis.index>7</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
@@ -238,7 +238,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip>118.190.232.100</nacos.ip>
+                <nacos.ip>47.104.205.48</nacos.ip>
                 <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
 
                 <!--公众号配置-->

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -362,7 +362,7 @@ public class ApiAppUserController {
      * @author LZN
      * @date 2022/4/28 15:05
      */
-    @PostMapping("/party/standardbearer/apply ")
+    @PostMapping("/party/standardbearer/apply")
     public Result StandarBearerApply(@LoginUser TokenDto userDetail) {
         return appUserService.StandarBearerApply(userDetail);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.elink.esua.epdc.async.WxMaSecCheckTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
@@ -14,11 +15,10 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
-import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
-import com.elink.esua.epdc.feign.IssueFeignClient;
+import com.elink.esua.epdc.feign.*;
-import com.elink.esua.epdc.feign.OssFeignClient;
-import com.elink.esua.epdc.feign.PointsFeignClient;
 import com.elink.esua.epdc.service.IssueService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import me.chanjar.weixin.mp.api.WxMpMaterialService;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -32,9 +32,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Base64;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 议题模块
+ *
  * @Author LC
  * @Date 2019/9/6 20:15
  */
@@ -59,6 +62,9 @@ public class IssueServiceImpl implements IssueService {
     @Autowired
     private PointsFeignClient pointFeignClient;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
 
     @Override
     public Result saveEvent(TokenDto userDetail, EpdcEventSubmitFormDTO formDto) {
@@ -72,7 +78,7 @@ public class IssueServiceImpl implements IssueService {
         // 查询当前时间前10分钟内的数据
         Result<IssueDetailResultDTO> r = issueFeignClient.getIssueMaxNew(userIdDto);
         IssueDetailResultDTO d = r.getData();
-        if(d != null && !StringUtils.isBlank(d.getId())){
+        if (d != null && !StringUtils.isBlank(d.getId())) {
             return new Result().error("十分钟之内不能多次发起议题");
         }
 
@@ -123,7 +129,29 @@ public class IssueServiceImpl implements IssueService {
             return new Result<List<IssueResultDTO>>().error("获取用户信息失败");
         }
         formDto.setDeptId(userDetail.getGridId());
-        return issueFeignClient.listIssues(formDto);
+        Result<List<IssueResultDTO>> listIssueRes = issueFeignClient.listIssues(formDto);
+        Optional.of(listIssueRes.getData()).ifPresent(
+                issueList -> {
+                    List<String> userIdList = issueList.stream().filter(item -> YesOrNoEnum.YES.value().equals(item.getPartyFlag())).map(IssueResultDTO::getUserId).distinct().collect(Collectors.toList());
+                    if (CollUtil.isNotEmpty(userIdList)) {
+                        EpdcUserMatchTagFormDTO form = new EpdcUserMatchTagFormDTO();
+                        form.setUserIdList(userIdList);
+                        form.setUserTagValue(UserTagEnum.PARTY_STANDARD_BEARER.value());
+                        Result<List<String>> filterByTagRes = userFeignClient.filterUserIdListByTag(form);
+                        List<String> filter = filterByTagRes.getData();
+                        if (filterByTagRes.success() && null != filter && CollUtil.isNotEmpty(filter)) {
+                            issueList.forEach(
+                                    item -> {
+                                        if (filter.contains(item.getUserId())) {
+                                            item.setStandardBearerFlag(YesOrNoEnum.YES.value());
+                                        }
+                                    }
+                            );
+                        }
+                    }
+                }
+        );
+        return listIssueRes;
     }
 
     @Override
@@ -138,9 +166,9 @@ public class IssueServiceImpl implements IssueService {
             wxMaSecCheckTask.checkImage(file);
             // 转base64
             in = new FileInputStream(file);
-            byte[] bytes=new byte[(int)file.length()];
+            byte[] bytes = new byte[(int) file.length()];
             in.read(bytes);
-            base64 = "data:image/png;base64,"+Base64.getEncoder().encodeToString(bytes);
+            base64 = "data:image/png;base64," + Base64.getEncoder().encodeToString(bytes);
             // 图片上传至OSS
             UploadFormDTO formDTO = new UploadFormDTO();
             formDTO.setBase64String(base64);
@@ -162,7 +190,7 @@ public class IssueServiceImpl implements IssueService {
     @Override
     public Result statement(StatementFormDTO formDto) {
         // 积分埋点 点赞
-        if("0".equals(formDto.getAttitude())){
+        if ("0".equals(formDto.getAttitude())) {
             PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
             pointLogFormDTO.setType(BehaviorEnum.POINTS_GIVE_RULES.getValue());
             pointLogFormDTO.setUserId(formDto.getUserId());

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java

@@ -22,6 +22,7 @@ public class IssueResultDTO implements Serializable {
      * 事件ID
      */
     private String eventId;
+    private String userId;
     /**
      * 议题内容
      */

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

@@ -197,7 +197,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>9066</server.port>
+                <server.port>10966</server.port>
 
                 <spring.redis.index>7</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
@@ -212,7 +212,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip>118.190.232.100</nacos.ip>
+                <nacos.ip>47.104.205.48</nacos.ip>
                 <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
 
                 <!--亿联小程序配置-->

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -184,6 +184,7 @@
     <resultMap id="newOrHotIssues" type="com.elink.esua.epdc.dto.issue.result.IssueResultDTO">
         <result property="id" column="ID"/>
         <result property="eventId" column="EVENT_ID"/>
+        <result property="userId" column="USER_ID"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
@@ -204,6 +205,7 @@
         SELECT
         issue.ID,
         issue.EVENT_ID,
+        issue.USER_ID,
         issue.ISSUE_CONTENT,
         issue.NICK_NAME,
         issue.USER_FACE,

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

@@ -171,7 +171,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>10014</server.port>
+                <server.port>10914</server.port>
 
                 <spring.redis.index>7</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
@@ -192,7 +192,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
-                <nacos.ip>118.190.232.100</nacos.ip>
+                <nacos.ip>47.104.205.48</nacos.ip>
                 <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
 
                 <!--RocketMQ-->