From 648f3a2ec9b7786fd48662148f7cf60a5d85caf6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 7 May 2021 14:34:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E6=B6=89=E5=8F=8A=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=B5=8B=E5=80=BC=E5=AE=A2=E6=88=B7ID?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/CodeServiceImpl.java | 3 ++- .../java/com/epmet/dto/result/AdviceDetailResultDTO.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index dd50e78cd4..a45dc77644 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -504,7 +504,8 @@ public class CodeServiceImpl implements CodeService { wxMaNewsReq.setMediaId(mediaId); WxResult wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq); MultipartFile file = new MockMultipartFile("file", "QRCode.jpg", "image/jpeg", wxAuditResult.getData()); - Result uploadResult = ossFeignClient.uploadQrCode(file); + //2021.5.7 sun 开发、测试运营端获取审核失败原因都是直接访问生产third服务，没有token 需要业务层传递客户Id + Result uploadResult = ossFeignClient.uploadQrCodeV2(file, dto.getCustomerId()); urlList.add(uploadResult.getData().getUrl()); if (StringUtils.isBlank(screenShotUrl)) { screenShotUrl = uploadResult.getData().getUrl(); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java index 2f8bbbc262..46248b7b70 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java @@ -20,6 +20,11 @@ public class AdviceDetailResultDTO implements Serializable { */ private String adviceId; + /** + * 客户ID + */ + private String customerId; + /** * 客户名 */ From 276622a5e4bccb227d8de77fd171cebf7ff8a615 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 May 2021 15:15:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8ENPE=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PublicPartExtractServiceImpl.java | 1 - .../impl/ScreenUserJoinServiceImpl.java | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java index 92bb8def5d..3b2baa00dd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java @@ -196,7 +196,6 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { Map userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o)); Set agencyIdSet = new HashSet<>(); if (!CollectionUtils.isEmpty(issueTotal)) { - log.error("抽取【公众参与-人均议题】，获取注册用户数为空,customerId:{}", formDTO.getCustomerId()); issueTotal.forEach(issue -> { String agencyId = issue.getAgencyId(); agencyIdSet.add(agencyId); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java index c6ca536993..8b58a474b5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java @@ -85,12 +85,19 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl Date: Fri, 7 May 2021 17:12:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E8=BF=94=E5=9B=9E=20?= =?UTF-8?q?=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/ScreenUserJoinDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml index 88ea0c6d44..5af47f5590 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml @@ -21,6 +21,8 @@ DEL_FLAG = '0' AND MONTH_ID = #{monthId} AND ORG_ID = #{agencyId} + order by CREATED_TIME DESC + LIMIT 1 @@ -74,4 +76,4 @@ AND ORG_ID = #{agencyId} AND MONTH_ID = ]]> #{monthId}*/ - \ No newline at end of file +