From cc3838afb0d6f47703037e897881cea5c29ebbb8 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 29 Apr 2022 14:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83nacos=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-server/pom.xml | 4 +- esua-epdc/epdc-auth/pom.xml | 4 +- .../epdc-api/epdc-api-server/pom.xml | 4 +- .../epdc/controller/ApiAppUserController.java | 2 +- .../epdc/service/impl/IssueServiceImpl.java | 56 ++++++++++++++----- .../epdc/dto/issue/result/IssueResultDTO.java | 1 + .../epdc-events/epdc-events-server/pom.xml | 4 +- .../main/resources/mapper/issue/IssueDao.xml | 2 + .../epdc-user/epdc-user-server/pom.xml | 4 +- 9 files changed, 56 insertions(+), 25 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index b668f8c31..187cb24e4 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -186,7 +186,7 @@ test - 10021 + 10921 test test @@ -198,7 +198,7 @@ true 115.29.142.202:8848 - 118.190.232.100 + 47.104.205.48 305e0faa-d935-4fe1-b3a0-2634da67adb3 http://localhost:9411 diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index 29fbdc131..c13406cab 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -126,7 +126,7 @@ test - 10002 + 10902 test test @@ -139,7 +139,7 @@ true 115.29.142.202:8848 - 118.190.232.100 + 47.104.205.48 305e0faa-d935-4fe1-b3a0-2634da67adb3 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 92d7ae043..370bfb332 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -223,7 +223,7 @@ test test - 10004 + 10904 7 r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com @@ -238,7 +238,7 @@ true 115.29.142.202:8848 - 118.190.232.100 + 47.104.205.48 305e0faa-d935-4fe1-b3a0-2634da67adb3 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 01314a3f0..b5f6997bf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 2cd8432d9..2b2fe265c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/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.feign.IssueFeignClient; -import com.elink.esua.epdc.feign.OssFeignClient; -import com.elink.esua.epdc.feign.PointsFeignClient; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.feign.*; 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 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("十分钟之内不能多次发起议题"); } @@ -107,11 +113,11 @@ public class IssueServiceImpl implements IssueService { formDto.setUserId(userDetail.getUserId()); formDto.setNickName(userDetail.getNickname()); formDto.setUserFace(userDetail.getFaceImg()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - formDto.setIsPartyMember(YesOrNoEnum.YES.value()); - } else { - formDto.setIsPartyMember(YesOrNoEnum.NO.value()); - } + if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + formDto.setIsPartyMember(YesOrNoEnum.YES.value()); + } else { + formDto.setIsPartyMember(YesOrNoEnum.NO.value()); + } formDto.setMobile(userDetail.getMobile()); return issueFeignClient.submitEvent(formDto); @@ -123,7 +129,29 @@ public class IssueServiceImpl implements IssueService { return new Result>().error("获取用户信息失败"); } formDto.setDeptId(userDetail.getGridId()); - return issueFeignClient.listIssues(formDto); + Result> listIssueRes = issueFeignClient.listIssues(formDto); + Optional.of(listIssueRes.getData()).ifPresent( + issueList -> { + List 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> filterByTagRes = userFeignClient.filterUserIdListByTag(form); + List 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()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java index b075a5f81..4cb7801f8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java +++ b/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; /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index b42654585..89a37af2d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -197,7 +197,7 @@ test test - 9066 + 10966 7 r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com @@ -212,7 +212,7 @@ true 115.29.142.202:8848 - 118.190.232.100 + 47.104.205.48 305e0faa-d935-4fe1-b3a0-2634da67adb3 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 04d305856..889db08e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -184,6 +184,7 @@ + @@ -204,6 +205,7 @@ SELECT issue.ID, issue.EVENT_ID, + issue.USER_ID, issue.ISSUE_CONTENT, issue.NICK_NAME, issue.USER_FACE, diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index 14bdd10f9..60f721c00 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -171,7 +171,7 @@ test test - 10014 + 10914 7 r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com @@ -192,7 +192,7 @@ true 115.29.142.202:8848 - 118.190.232.100 + 47.104.205.48 305e0faa-d935-4fe1-b3a0-2634da67adb3