From ec4d59de0a7e5baa6be4f1bc021b8b80740a408e Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 08:55:08 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StatsGroupController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java index 18ccdfe3ab..18e52be77a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.service.StatsGroupService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,8 +31,9 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupgriddaily") - public void groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){ + public Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){ statsGroupService.groupGridDaily(formDTO); + return new Result(); } /** @@ -40,8 +42,9 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupagencydaily") - public void groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){ + public Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){ statsGroupService.groupAgencyDaily(formDTO); + return new Result(); } /** @@ -50,8 +53,9 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupagencymonthly") - public void groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){ + public Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){ statsGroupService.groupAgencyMonthly(formDTO); + return new Result(); } } From c607167bd759bfbaa00c9e1534ccd4eb2df5782a Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 09:17:52 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 14 +++++++------- .../epmet/controller/StatsPublicityController.java | 5 +++++ .../service/impl/StatsPublicityServiceImpl.java | 4 ++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 9953e2d3c1..1f1c1b10fe 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -29,7 +29,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob") - Result articleSummaryDailyStatsjob(StatsFormDTO formDTO); + Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 @@ -39,7 +39,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob") - Result tagUsedDailyStatsjob(StatsFormDTO formDTO); + Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -48,7 +48,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob") - Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO); + Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -57,7 +57,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob") - Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO); + Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 【日】 统计阅读最多的标签 包含 机关 网格 @@ -66,7 +66,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob") - Result tagViewedDailyStatsjob(StatsFormDTO formDTO); + Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 【月】 统计阅读最多的标签 包含 机关 网格 @@ -75,7 +75,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob") - Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO); + Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 @@ -85,7 +85,7 @@ public interface DataStatisticalOpenFeignClient { * @param date */ @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob") - Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO); + Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); /** * @Description 统计 “网格小组”， dim：【网格-日】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java index eb01c07d69..d979c9d3eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java @@ -1,8 +1,10 @@ package com.epmet.controller; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StatsFormDTO; import com.epmet.service.StatsPublicityService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -14,6 +16,7 @@ import java.util.concurrent.ExecutorService; /** * desc:宣传能力controller */ +@Slf4j @RequestMapping("statspublicity") @RestController public class StatsPublicityController { @@ -32,6 +35,7 @@ public class StatsPublicityController { */ @PostMapping(value = "articleSummaryDailyStatsjob") public Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("articleSummaryDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO)); } @@ -43,6 +47,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedDailyStatsjob") public Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO)); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 3c38d751f3..9a22e7a74f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -114,8 +114,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("articleSummaryDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId()); } else { + log.info("articleSummaryDailyStatsjob excute all customer,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -162,11 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { //统计 try { + log.debug("tagUsedDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsTagUsedDaily(statsDate, dimIdBean, formDTO.getCustomerId()); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e); } } else { + log.debug("tagUsedDailyStatsjob excute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; From 7ff5552a65f60d96319a986b1ac1d024ae2ece2f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 09:20:06 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsPublicityServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 9a22e7a74f..23b75b1cbf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -114,10 +114,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { - log.info("articleSummaryDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); + log.info("articleSummaryDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId()); } else { - log.info("articleSummaryDailyStatsjob excute all customer,dateId:{}", dimIdBean.getDateId()); + log.info("articleSummaryDailyStatsjob execute all customer,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -164,13 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { //统计 try { - log.debug("tagUsedDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); + log.info("tagUsedDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsTagUsedDaily(statsDate, dimIdBean, formDTO.getCustomerId()); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e); } } else { - log.debug("tagUsedDailyStatsjob excute all customerId,dateId:{}", dimIdBean.getDateId()); + log.info("tagUsedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; From 4b90e8ff91a6f4c1affa8970f53c244db7b7bae3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 09:22:09 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index eaf79bb7f7..90d2d5c978 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.30 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1eb56141a2..8e16529a14 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.29 + 0.3.30 data-statistical com.epmet From ea873911fb9b1a61a9ee8cb97cf324fbe1e1703c Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 13:26:25 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=BB=9F=E8=AE=A1-?= =?UTF-8?q?=E6=9C=88=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index b4d298fcc4..0bc3aacd65 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -347,7 +347,7 @@ public class TopicServiceImpl implements TopicService { gridDistinct.put(k,false); }); - List topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId()); + List topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId()); Map> GridGroupMapBetweenTimeRange = topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId)); List groupListBetweenTimeRange = new LinkedList<>(); @@ -357,7 +357,7 @@ public class TopicServiceImpl implements TopicService { groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue()); } List operationsBetweenTimeRange = - topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDate); + topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDateCheck); Map> topicOperationMapBetweenTimeRange = operationsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiTopicOperationResultDTO::getTopicId)); @@ -1127,7 +1127,7 @@ public class TopicServiceImpl implements TopicService { gridDistinct.put(k,false); }); - List topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId()); + List topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId()); //key : gridId Map> GridGroupMapBetweenTimeRange = topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId)); From 3125108308b6ed8a78244e294ead093ed66c4073 Mon Sep 17 00:00:00 2001 From: jiangyuying Date: Thu, 2 Jul 2020 13:50:27 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=83=BD=E5=8A=9B--?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publicity/impl/PublicityServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java index 234e4afeee..b01f9339bc 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java @@ -56,7 +56,20 @@ public class PublicityServiceImpl implements PublicityService { @Override public FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) { String agencyId = this.getLoginUserDetails(tokenDto); - return publicityDao.summaryInfo(agencyId); + FactPublishedAgencyDailyDTO factPublishedAgencyDailyDTO = publicityDao.summaryInfo(agencyId); + if (null == factPublishedAgencyDailyDTO) { + factPublishedAgencyDailyDTO = new FactPublishedAgencyDailyDTO(); + Date dateFact = DateUtils.addDateDays(new Date(), -1); + String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD); + String yearId = strDate.substring(0, 4); + String monthId = strDate.substring(5, 6); + String dayId = strDate.substring(7, 8); + factPublishedAgencyDailyDTO.setPublishedTotal(0); + factPublishedAgencyDailyDTO.setPublishingTotal(0); + factPublishedAgencyDailyDTO.setDateName(yearId + "." + monthId + "." + dayId); + } + + return factPublishedAgencyDailyDTO; } From 331e7ccb812b69d636993b55200130df71d5729b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 13:57:58 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=95=B0=E6=8D=AE=E7=BB=99=E5=88=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/constant/ProjectConstant.java | 2 ++ .../project/impl/ProjectServiceImpl.java | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java index a23dfa1a62..27d195e832 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java @@ -8,6 +8,8 @@ public interface ProjectConstant { String DAY = "day"; String MONTH = "month"; + String PENDING = "处理中"; + String CLOSED = "已结案"; /** * 根据Token获取组织信息失败 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 26302753eb..072516c6dc 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.project.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dao.project.ProjectDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; @@ -20,6 +21,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -54,6 +56,15 @@ public class ProjectServiceImpl implements ProjectService { //将小数转成百分比 resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue())); resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue())); + } else { + resultDTO.setAgencyId(agencyId); + Date date = DateUtils.getBeforeDay(new Date()); + resultDTO.setDateName(DateUtils.format(date, "yyyy.MM.dd")); + resultDTO.setProjectTotal(NumConstant.ZERO); + resultDTO.setPendingTotal(NumConstant.ZERO); + resultDTO.setPendingRatio("0%"); + resultDTO.setClosedTotal(NumConstant.ZERO); + resultDTO.setClosedRatio("0%"); } return resultDTO; } @@ -78,6 +89,17 @@ public class ProjectServiceImpl implements ProjectService { //先四舍五入保留四位小数再把小数转成百分比 sum.setRatio(percent.format(sum.getRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue())); }); + } else { + ProjectSummaryInfoResultDTO pending = new ProjectSummaryInfoResultDTO(); + pending.setName(ProjectConstant.PENDING); + pending.setValue(NumConstant.ZERO); + pending.setRatio("0%"); + resultList.add(pending); + ProjectSummaryInfoResultDTO closed = new ProjectSummaryInfoResultDTO(); + closed.setName(ProjectConstant.CLOSED); + closed.setValue(NumConstant.ZERO); + closed.setRatio("0%"); + resultList.add(closed); } return resultList; } From e43cb0e334daec6f38d9fd83fdccabea0ddc92d5 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 14:04:47 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E3=80=81=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=96=B0=E8=87=B3....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/group/constant/GroupConstant.java | 4 ++++ .../group/dto/result/GroupSummaryInfoResultDTO.java | 9 +++++---- .../java/com/epmet/topic/constant/TopicConstant.java | 7 +++++++ .../com/epmet/service/group/impl/GroupServiceImpl.java | 9 ++++++++- .../com/epmet/service/topic/impl/TopicServiceImpl.java | 2 ++ 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java index cfc64da174..85323027b5 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java @@ -9,4 +9,8 @@ public interface GroupConstant { String MONTH = "month"; String DATE = "day"; + String RAIL = "-"; + + String NULL_CHAR_STRING = ""; + } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java index a3e72d6f3a..d424014202 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.group.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -16,22 +17,22 @@ public class GroupSummaryInfoResultDTO implements Serializable { /** * 网格总数量 */ - private Integer gridTotalCount; + private Integer gridTotalCount = NumConstant.ZERO; /** * 小组总数量 */ - private Integer groupTotalCount; + private Integer groupTotalCount = NumConstant.ZERO; /** * 小组平均人数 */ - private Integer groupPeopleAvg; + private Integer groupPeopleAvg = NumConstant.ZERO; /** * 小组人数中位数 */ - private Integer groupPeopleMedian; + private Integer groupPeopleMedian = NumConstant.ZERO; /** * 数据更新至 时间 diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java index 46259526ce..94d4b37e7d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java @@ -25,6 +25,13 @@ public interface TopicConstant { String SHIFTED = "已转议题"; + /** + * 话题分析的type month,day + */ String MONTH = "month"; String DATE = "day"; + + String RAIL = "-"; + + String NULL_CHAR_STRING = ""; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java index 21fdfac41b..57214b658a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -39,7 +40,13 @@ public class GroupServiceImpl implements GroupService { @Override public GroupSummaryInfoResultDTO summaryInfo(TokenDto tokenDto) { String agencyId = this.getLoginUserDetails(tokenDto); - return groupDao.summaryInfo(agencyId); + GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId); + if (null==result){ + GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO(); + resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING)); + return resultDTO; + } + return result; } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 339737305e..0ab00e729b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.dao.topic.TopicDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.group.constant.GroupConstant; import com.epmet.service.topic.TopicService; import com.epmet.topic.constant.TopicConstant; import com.epmet.topic.dto.form.TopicIncrTrendFormDTO; @@ -41,6 +42,7 @@ public class TopicServiceImpl implements TopicService { @Override public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) { TopicSummaryResultDTO result = new TopicSummaryResultDTO(); + result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING)); String agencyId = this.getLoginUserDetails(tokenDto); List topicStatus = topicDao.getTopicStatus(agencyId); result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString()); From 767f3f6db8c7e0beec3949149984fdd35215dc31 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 14:17:18 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index 7e9e2a4a26..c272e01135 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.20 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 9562911a6c..612bd928dd 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.19 + 0.3.20 data-report-server From ce2d62645a7bee50fad85d84ec7744dba77afd63 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 14:27:18 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E3=80=81=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=96=B0=E8=87=B3....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/group/constant/GroupConstant.java | 2 +- .../src/main/java/com/epmet/topic/constant/TopicConstant.java | 2 +- .../java/com/epmet/service/group/impl/GroupServiceImpl.java | 2 +- .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 3 +-- .../src/main/resources/mapper/group/GroupDao.xml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java index 85323027b5..d9d5f5a98c 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java @@ -11,6 +11,6 @@ public interface GroupConstant { String RAIL = "-"; - String NULL_CHAR_STRING = ""; + String DOT = "."; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java index 94d4b37e7d..6383b5cfe7 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java @@ -33,5 +33,5 @@ public interface TopicConstant { String RAIL = "-"; - String NULL_CHAR_STRING = ""; + String DOT = "."; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java index 57214b658a..d1be53ee85 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java @@ -43,7 +43,7 @@ public class GroupServiceImpl implements GroupService { GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId); if (null==result){ GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO(); - resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING)); + resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.DOT)); return resultDTO; } return result; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 0ab00e729b..298dcae7a3 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -42,10 +42,9 @@ public class TopicServiceImpl implements TopicService { @Override public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) { TopicSummaryResultDTO result = new TopicSummaryResultDTO(); - result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING)); + result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.DOT)); String agencyId = this.getLoginUserDetails(tokenDto); List topicStatus = topicDao.getTopicStatus(agencyId); - result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString()); if (topicStatus.size() != NumConstant.ZERO){ topicStatus.forEach(topic -> { if (topic.getTopicStatus().equals(TopicConstant.DISCUSSING)){ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml index e374c96d45..b3b1faecd7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml @@ -10,7 +10,7 @@ group_total_count AS groupTotalCount, group_member_avg_count AS groupPeopleAvg, group_median AS groupPeopleMedian, - DATE_FORMAT( date_id, '%Y-%m-%d' ) AS deadline + DATE_FORMAT( date_id, '%Y.%m.%d' ) AS deadline FROM fact_group_agency_daily WHERE del_flag = '0' AND agency_id = #{agencyId} From c0bc55b614e527cfc5c839317aef6fd033a72e1f Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 14:30:49 +0800 Subject: [PATCH 11/21] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index c272e01135..c5dde40dd9 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.21 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 612bd928dd..43edc3094f 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.20 + 0.3.21 data-report-server From 2e36c981b230a0ee64893fa1732c515602f754e0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 14:36:51 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/project/impl/ProjectServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 072516c6dc..6e5366827f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -57,6 +57,7 @@ public class ProjectServiceImpl implements ProjectService { resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue())); resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue())); } else { + resultDTO = new ProjectSummaryResultDTO(); resultDTO.setAgencyId(agencyId); Date date = DateUtils.getBeforeDay(new Date()); resultDTO.setDateName(DateUtils.format(date, "yyyy.MM.dd")); From ffd12b81b2ee9a7d1498638f28a271cc8e1dd1c3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 14:41:13 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index c5dde40dd9..498f28a728 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.21 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 43edc3094f..2e9a82b4bd 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.21 + 0.3.22 data-report-server From cc33909ffc222d18b01408f6262041f61c9cc7ca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 14:47:28 +0800 Subject: [PATCH 14/21] =?UTF-8?q?auth:=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?getresiwxphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LoginController.java | 19 ++++++++++ .../epmet/dto/form/ResiWxPhoneFormDTO.java | 35 +++++++++++++++++++ .../java/com/epmet/service/LoginService.java | 9 +++++ .../epmet/service/impl/LoginServiceImpl.java | 21 +++++++++++ 4 files changed, 84 insertions(+) create mode 100644 epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java index 54b415344b..46b9e6aedc 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -8,9 +8,11 @@ import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.LoginByPassWordFormDTO; import com.epmet.dto.form.LoginByWxCodeFormDTO; +import com.epmet.dto.form.ResiWxPhoneFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.CaptchaService; import com.epmet.service.LoginService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -96,4 +98,21 @@ public class LoginController { public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) { return loginService.logoutByToken(tokenDto); } + + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 获取用户微信绑定的手机号 + * @Date 2020/7/2 14:33 + **/ + @PostMapping("getresiwxphone") + public Result getResiWxPhone(@RequestBody ResiWxPhoneFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class); + String phone = loginService.getResiWxPhone(formDTO); + if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) { + return new Result().ok(phone); + } + return new Result().ok(""); + } } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java new file mode 100644 index 0000000000..f0148b3c14 --- /dev/null +++ b/epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/2 14:28 + */ +@Data +public class ResiWxPhoneFormDTO implements Serializable { + private static final long serialVersionUID = 4381236451736209332L; + public interface AddUserInternalGroup {} + /** + * 微信code + */ + @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class}) + private String wxCode; + + /** + * 用户信息 + */ + @NotBlank(message = "encryptedData不能为空",groups = {AddUserInternalGroup.class}) + private String encryptedData; + + /** + * 加密算法的初始向量 + */ + @NotBlank(message = "iv不能为空",groups = {AddUserInternalGroup.class}) + private String iv; +} diff --git a/epmet-auth/src/main/java/com/epmet/service/LoginService.java b/epmet-auth/src/main/java/com/epmet/service/LoginService.java index 37ab5f8f74..248e7c4d97 100644 --- a/epmet-auth/src/main/java/com/epmet/service/LoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/LoginService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.LoginByPassWordFormDTO; import com.epmet.dto.form.LoginByWxCodeFormDTO; +import com.epmet.dto.form.ResiWxPhoneFormDTO; import com.epmet.dto.result.UserTokenResultDTO; /** @@ -50,4 +51,12 @@ public interface LoginService { **/ WxMaJscode2SessionResult getWxMaUser(String app, String wxCode); + /** + * @return java.lang.String + * @param formDTO + * @author yinzuomei + * @description 获取用户微信绑定的手机号 + * @Date 2020/7/2 14:33 + **/ + String getResiWxPhone(ResiWxPhoneFormDTO formDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index b162acd39a..905061cf81 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.service.impl; +import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -129,6 +131,25 @@ public class LoginServiceImpl implements LoginService { return wxMaJscode2SessionResult; } + @Override + public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) { + String phone=""; + try { + WxMaService wxMaService = wxMaServiceUtils.resiWxMaService(); + WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode()); + WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(), + formDTO.getEncryptedData(), + formDTO.getIv()); + if (null != phoneNoInfo) { + phone= phoneNoInfo.getPurePhoneNumber(); + } + } catch (WxErrorException e) { + e.printStackTrace(); + log.error(String.format("获取用户微信绑定的手机号接口异常")); + } + return phone; + } + /** * 根据openId查询用户id * From 4de517f39baa06bb13551925f52e1304a10b732c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 14:49:15 +0800 Subject: [PATCH 15/21] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3getresiwxphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 4d4c5b04f2..c3c7bc3879 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.31 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index bedc5ca532..f838c1ed6a 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-cloud From 52de7f17805e4e4cf54581e0e4fac6c92afb03b7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:03:36 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=E7=9C=8B=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=EF=BC=8C=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/aspect/ServletExceptionHandler.java | 31 +++++ .../epmet/commons/tools/utils/IpUtils.java | 120 ++++++++++-------- .../commons/tools/utils/ModuleUtils.java | 4 + .../controller/StatsPublicityController.java | 5 + .../src/main/resources/logback-spring.xml | 2 +- ...PublicityArticleSummaryDailyStatsTask.java | 6 +- .../task/PublicityTagUsedDailyStatsTask.java | 6 +- .../PublicityTagUsedMonthlyStatsTask.java | 6 +- ...ityTagUsedQuarterlyAndYearlyStatsTask.java | 6 +- .../PublicityTagViewedDailyStatsTask.java | 6 +- .../PublicityTagViewedMonthlyStatsTask.java | 6 +- ...gViewedQuarterlyAndYearlyhlyStatsTask.java | 6 +- .../epmet/task/StatsGroupAgencyDailyTask.java | 6 +- .../task/StatsGroupAgencyMonthlyTask.java | 6 +- .../epmet/task/StatsGroupGridDailyTask.java | 6 +- .../java/com/epmet/task/StatsIssueTask.java | 8 +- .../epmet/task/StatsProjectAgencyTask.java | 6 +- .../com/epmet/task/StatsProjectGridTask.java | 6 +- .../java/com/epmet/task/StatsTopicTask.java | 6 +- .../java/com/epmet/task/StatsUserTask.java | 6 +- .../epmet/task/SyncVotingCacheAndDbTask.java | 6 +- .../main/java/com/epmet/task/TestTask.java | 6 +- .../src/main/resources/logback-spring.xml | 5 +- 23 files changed, 159 insertions(+), 112 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java new file mode 100644 index 0000000000..c30add7d5c --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ServletExceptionHandler.java @@ -0,0 +1,31 @@ +package com.epmet.commons.tools.aspect;/** + * @author jianjun liu + * @email liujianjun@yunzongnet.com + * @date 2020-07-02 14:08 + **/ + +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import javax.servlet.ServletException; + +/** + * desc： + * + * @author lyn + * @date 2020/7/2 14:08 + */ +@Slf4j +@ControllerAdvice +public class ServletExceptionHandler { + + @ExceptionHandler(ServletException.class) + public Result globalException(ServletException e) { + log.error("globalException", e); + return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java index bde12725d9..9ed1317906 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -14,9 +14,7 @@ import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; +import java.util.regex.Pattern; /** * IP工具类 @@ -26,59 +24,69 @@ import java.util.Enumeration; */ public class IpUtils { private static Logger logger = LoggerFactory.getLogger(IpUtils.class); + public static final String LOCALHOST = "127.0.0.1"; + + public static final String ANYHOST = "0.0.0.0"; + + private static final Pattern IP_PATTERN = Pattern.compile("\\d{1,3}(\\.\\d{1,3}){3,5}$"); + + public static String getIpAddr(HttpServletRequest request) { + String ip = null; + try { + ip = request.getHeader("x-forwarded-for"); + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + } catch (Exception e) { + logger.error("IpUtils ERROR ", e); + } - public static String getIpAddr(HttpServletRequest request) { - String ip = null; - try { - ip = request.getHeader("x-forwarded-for"); - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_CLIENT_IP"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - } - if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - } catch (Exception e) { - logger.error("IpUtils ERROR ", e); - } + return ip; + } - return ip; - } + /** + * desc:获取本地Ip + * @return + */ + public static String getServerIp() { + String SERVER_IP = ""; + try { + /** + * 遍历本地网卡的方式，在云平台虚拟机取不到真正的ip + * @return + */ + InetAddress localAddress = InetAddress.getLocalHost(); + if (isValidAddress(localAddress)) { + return localAddress.getHostAddress(); + } + logger.warn("Could not get local host ip address"); + return null; + } catch (Exception e) { + logger.error("IpUtils getServerIp exception ", e); + } - /** - * desc:获取本地Ip - * @return - */ - public static String getServerIp(){ - String SERVER_IP = ""; - try { - Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces(); - InetAddress ip = null; - while (netInterfaces.hasMoreElements()) { - NetworkInterface ni = (NetworkInterface) netInterfaces - .nextElement(); - ip = ni.getInetAddresses().nextElement(); - SERVER_IP = ip.getHostAddress(); - if (!ip.isSiteLocalAddress() && !ip.isLoopbackAddress() - && ip.getHostAddress().indexOf(":") == -1) { - SERVER_IP = ip.getHostAddress(); - break; - }else{ - ip = null; - } - } - } catch (SocketException e) { - logger.error("IpUtils getServerIp exception ", e); - } + return SERVER_IP; + } - return SERVER_IP; - } + private static boolean isValidAddress(InetAddress address) { + if (address == null || address.isLoopbackAddress()) + return false; + String name = address.getHostAddress(); + return (name != null + && !ANYHOST.equals(name) + && !LOCALHOST.equals(name) + && IP_PATTERN.matcher(name).matches()); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java index 0e13174032..7516f8c2cd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.DingTalkTextMsg; import com.epmet.commons.tools.exception.RenException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.CharEncoding; @@ -37,6 +38,9 @@ public class ModuleUtils { String errorMessage = "Failure to connect " + serverName; String errorLog = errorMessage + "::[method]->{}::[params]->{}"; log.error(errorLog, methodName, JSON.toJSONString(params)); + DingdingMsgSender msgSender = new DingdingMsgSender(); + DingTalkTextMsg dingTalkTextMsg = new DingTalkTextMsg(); + msgSender.sendMsgAsync(dingTalkTextMsg); return new Result().error(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java index d979c9d3eb..c544d2d3b2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java @@ -59,6 +59,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedMonthlyStatsjob") public Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO)); } @@ -70,6 +71,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedQuarterlyStatsjob") public Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO)); } @@ -81,6 +83,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedDailyStatsjob") public Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO)); } @@ -92,6 +95,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedMonthlyStatsjob") public Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO)); } @@ -103,6 +107,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagViewedQuarterlyStatsjob") public Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagViewedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO)); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml index fb3deaefb1..39e86ff5ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml @@ -125,7 +125,7 @@ 15 - + ERROR ACCEPT diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java index 1b2f7a37e8..c54d33e9fc 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityArticleSummaryDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java index 7888be0829..5a24815c26 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedDailyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index 09857791e3..19d437e0f9 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java index 40b570a036..cfa9b2dc0e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); + logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功"); + logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java index 83376f511c..14450ac329 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedDailyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedDailyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedDailyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java index a42e1d02ee..09056774a1 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java index 837f7066f2..3b7ed865bb 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java @@ -23,16 +23,16 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); StatsFormDTO formDTO = null; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(formDTO); if (result.success()) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); + logger.info("publicityTagViewedMonthlyStatsTask定时任务执行成功"); } else { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityTagViewedMonthlyStatsTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java index 57bd68bfc8..f5ff55f74e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java @@ -23,12 +23,12 @@ public class StatsGroupAgencyDailyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupAgencyDaily(params); if (result.success()){ - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupAgencyDailyTask定时任务执行成功"); }else { - logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java index 3841ed339e..503f8937fb 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java @@ -23,12 +23,12 @@ public class StatsGroupAgencyMonthlyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupAgencyMonthly(params); if (result.success()){ - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupAgencyMonthlyTask定时任务执行成功"); }else { - logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupAgencyMonthlyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java index f666e4340c..7d9ad946a5 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java @@ -24,12 +24,12 @@ public class StatsGroupGridDailyTask implements ITask { @Override public void run(String params) { - logger.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); + logger.info("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); Result result = statsGroupService.groupGridDaily(params); if (result.success()){ - logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); + logger.info("StatsGroupGridDailyTask定时任务执行成功"); }else { - logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java index 742974bb50..a69eebd61a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java @@ -3,10 +3,8 @@ package com.epmet.task; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsIssueService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; /** * @author zhaoqifeng @@ -21,12 +19,12 @@ public class StatsIssueTask implements ITask { @Override public void run(String params) { - log.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); + log.info("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); Result result = statsIssueService.agencyGridIssueStats(params); if (result.success()){ - log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); + log.info("StatsGroupGridDailyTask定时任务执行成功"); }else { - log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsGroupGridDailyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java index f257476159..652a429082 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java @@ -21,12 +21,12 @@ public class StatsProjectAgencyTask implements ITask { @Override public void run(String params) { - log.debug("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params); + log.info("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params); Result result = statsProjectService.agencyProjectStats(params); if (result.success()){ - log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行成功"); + log.info("StatsProjectAgencyTask定时任务执行成功"); }else { - log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsProjectAgencyTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java index 8d858bdde0..f8c66fd0e6 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java @@ -24,12 +24,12 @@ public class StatsProjectGridTask implements ITask { @Override public void run(String params) { - log.debug("StatsProjectGridTask定时任务正在执行，参数为：{}", params); + log.info("StatsProjectGridTask定时任务正在执行，参数为：{}", params); Result result = statsProjectService.gridProjectStats(params); if (result.success()){ - log.debug("StatsProjectGridTask定时任务正在执行定时任务执行成功"); + log.info("StatsProjectGridTask定时任务执行成功"); }else { - log.debug("StatsProjectGridTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + log.error("StatsProjectGridTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java index 6570e33b24..1f454d0f79 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsTopicTask.java @@ -23,12 +23,12 @@ public class StatsTopicTask implements ITask { @Override public void run(String params) { - logger.debug("StatsTopicTask定时任务正在执行，参数为：{}", params); + logger.info("StatsTopicTask定时任务正在执行，参数为：{}", params); Result result = statsTopicService.execTopicStatistical(params); if (result.success()){ - logger.debug("StatsTopicTask定时任务正在执行定时任务执行成功"); + logger.info("StatsTopicTask定时任务执行成功"); }else { - logger.debug("StatsTopicTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsTopicTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java index 9fda8cfc88..d8d5fffe80 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserTask.java @@ -23,12 +23,12 @@ public class StatsUserTask implements ITask { @Override public void run(String params) { - logger.debug("StatsUserTask定时任务正在执行，参数为：{}", params); + logger.info("StatsUserTask定时任务正在执行，参数为：{}", params); Result result = statsUserService.execUserStatistical(params); if (result.success()){ - logger.debug("StatsUserTask定时任务正在执行定时任务执行成功"); + logger.info("StatsUserTask定时任务执行成功"); }else { - logger.debug("StatsUserTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("StatsUserTask定时任务执行失败:" + result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java index 9eed75bb68..6aa67834da 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/SyncVotingCacheAndDbTask.java @@ -22,12 +22,12 @@ public class SyncVotingCacheAndDbTask implements ITask { @Override public void run(String params) { - logger.debug("syncVotingCacheAndDbTask定时任务正在执行，参数为：{}", params); + logger.info("syncVotingCacheAndDbTask定时任务正在执行，参数为：{}", params); Result result = syncVotingCacheAndDbService.syncVotingCacheAndDb(); if(result.success()){ - logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行成功"); + logger.info("syncVotingCacheAndDbTask定时任务执行成功"); }else{ - logger.debug("syncVotingCacheAndDbTask定时任务正在执行定时任务执行失败:"+result.getMsg()); + logger.debug("syncVotingCacheAndDbTask定时任务执行失败:"+result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java index dad7a9c129..d04984b1db 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TestTask.java @@ -30,12 +30,12 @@ public class TestTask implements ITask{ private TestTaskService testTaskService; @Override public void run(String params){ - logger.debug("TestTask定时任务正在执行，参数为：{}", params); + logger.info("TestTask定时任务正在执行，参数为：{}", params); Result result=testTaskService.testTask(params); if(result.success()){ - logger.debug("TestTask定时任务执行成功"); + logger.info("TestTask定时任务执行成功"); }else{ - logger.debug("TestTask定时任务执行失败:"+result.getMsg()); + logger.error("TestTask定时任务执行失败:"+result.getMsg()); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml index 623abe55c8..ba7a073bbe 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml @@ -125,11 +125,12 @@ 15 - - + ERROR ACCEPT DENY + https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c + SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19 From e74f88787d85b5ce2ff0e4153a424a263e09ae02 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:06:56 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=20stats=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=20=E6=8E=92=E6=9F=A5job=E6=89=A7=E8=A1=8C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 90d2d5c978..630318c6e1 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.31 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8e16529a14..7631b36537 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.30 + 0.3.31 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 0c0bc1396e..ddc47548a0 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.17 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.18 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 2d417ce73d..9be7e57dc0 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.17 + 0.3.18 com.epmet epmet-job From b0e1067eae607cd20a0969b6acea6143e9479a36 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 15:07:44 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java | 2 +- .../java/com/epmet/service/impl/StatsGroupServiceImpl.java | 3 ++- .../com/epmet/service/stats/FactGroupAgencyDailyService.java | 2 +- .../service/stats/impl/FactGroupAgencyDailyServiceImpl.java | 4 ++-- .../main/resources/mapper/stats/FactGroupAgencyDailyDao.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java index 4a41fe25a9..faf90b5926 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java @@ -48,7 +48,7 @@ public interface FactGroupAgencyDailyDao extends BaseDao getLastDayAgency(@Param("monthId") String monthId); + List getLastDayAgency(@Param("dateId") String dateId); /** * @Description 查询 月的小组增量 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 091ea2fbb5..f5966d5fc7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -114,7 +114,8 @@ public class StatsGroupServiceImpl implements StatsGroupService { public void groupAgencyMonthly(GroupStatsFormDTO formDTO) { DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO); String monthId = dimIdBean.getMonthId(); - List lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId); + String dateId = dimIdBean.getDateId(); + List lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(dateId); List monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId); if (monthGroupIncr.size() == NumConstant.ZERO){ lastDayAgency.forEach(agency -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java index 913525715a..a52009fb46 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java @@ -108,7 +108,7 @@ public interface FactGroupAgencyDailyService extends BaseService getLastDayAgency(String monthId); + List getLastDayAgency(String dateId); /** * @Description 查询 月的小组增量 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java index 6dd5a0705b..30262fc6f7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java @@ -122,8 +122,8 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl getLastDayAgency(String monthId){ - return baseDao.getLastDayAgency(monthId); + public List getLastDayAgency(String dateId){ + return baseDao.getLastDayAgency(dateId); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml index ced5e75721..07f7b5a739 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml @@ -91,7 +91,7 @@ fact_group_agency_daily WHERE del_flag = '0' - AND date_id = (SELECT MAX(date_id) FROM fact_group_agency_daily WHERE del_flag = '0') + AND date_id = #{dateId} From b343899764447e4c965deb73d3d48178e60f3d14 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 15:13:03 +0800 Subject: [PATCH 19/21] =?UTF-8?q?data-statistical=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 630318c6e1..3cea9aa7f5 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.31 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.32 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 7631b36537..35dc700f49 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.31 + 0.3.32 data-statistical com.epmet From ebe66289a616f46cbccafb9e1b2ee605d50cf5e1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:19:47 +0800 Subject: [PATCH 20/21] =?UTF-8?q?job=E5=8F=82=E6=95=B0=E7=A9=BA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/task/PublicityArticleSummaryDailyStatsTask.java | 6 +++--- .../java/com/epmet/task/PublicityTagUsedDailyStatsTask.java | 2 +- .../com/epmet/task/PublicityTagUsedMonthlyStatsTask.java | 2 +- .../task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java | 2 +- .../com/epmet/task/PublicityTagViewedDailyStatsTask.java | 2 +- .../com/epmet/task/PublicityTagViewedMonthlyStatsTask.java | 2 +- .../PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java index c54d33e9fc..e92287bfe6 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } @@ -32,12 +32,12 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { if (result.success()) { logger.info("publicityArticleSummaryDailyStatsTask定时任务执行成功"); } else { - logger.error("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + logger.error("publicityArticleSummaryDailyStatsTask定时任务执行失败:" + result.getMsg()); } } public static void main(String[] args) { - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); String params = "{'date':'\"2020-06-20','customerId':'123'}"; if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java index 5a24815c26..0b5440cee0 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagUsedDailyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagUsedDailyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index 19d437e0f9..a09f97c854 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java index cfa9b2dc0e..e6ce88d6a5 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java index 14450ac329..75ed0d52ec 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagViewedDailyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java index 09056774a1..ed3badd326 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java index 3b7ed865bb..482a95a468 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java @@ -24,7 +24,7 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { @Override public void run(String params) { logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + StatsFormDTO formDTO = new StatsFormDTO(); if (StringUtils.isNotBlank(params)){ formDTO = JSON.parseObject(params,StatsFormDTO.class); } From 79e292f094764ae7751a3828dd14be95998c8ec8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:24:14 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index ddc47548a0..d708a35ccd 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.19 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 9be7e57dc0..96844937f4 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.18 + 0.3.19 com.epmet epmet-job