From 74d212d2f291b37200214dc754b7a0e11dba8613 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 16:17:53 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0stats=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index 35b6ea9eeb..f26759a84c 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.27 ports: - "8108:8108" network_mode: host # 使用现有网络 From 7d2df85747cb26f0904dc477fdcc7b6b58ffe61f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 16:41:37 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0stats=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index f26759a84c..f5c8c38ce8 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.27 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.28 ports: - "8108:8108" network_mode: host # 使用现有网络 From e845175c856f4757a6c3690146c1bbaee44b4d76 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 16:56:56 +0800 Subject: [PATCH 03/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0job=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-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index 5f15aeadf3..5e79c0725b 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.14 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.15 ports: - "8084:8084" network_mode: host # 使用现有网络 From 1b5a5cf8b869630cb0dcdad12c76468bc488062f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 18:49:24 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E9=83=A8=E7=BD=B2stats=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-test.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index f5c8c38ce8..f16459fc65 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.29 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index 5e79c0725b..e4f8cae342 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.16 ports: - "8084:8084" network_mode: host # 使用现有网络 From 0038c886ba460bb2d195728b9442f9567c5b79c9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 19:56:34 +0800 Subject: [PATCH 05/36] =?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-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index e4f8cae342..57fbe1521c 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.17 ports: - "8084:8084" network_mode: host # 使用现有网络 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 06/36] =?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 07/36] =?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 08/36] =?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 09/36] =?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 10/36] =?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 11/36] =?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 12/36] =?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 From d3ea8079f735bdbe94dcf2a0a362b3beec3bb8d1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Jul 2020 15:34:12 +0800 Subject: [PATCH 13/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 33d4dd713c..02a2e18a6e 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.47 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.48 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 0accecf9f6..329e9d2296 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.47 + 0.3.48 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 5c07879fe6..07780cc78e 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.33 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 61e29c166c..4f26f3dd26 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.32 + 0.3.33 gov-project com.epmet From 092fdcb08fe4bd6baae802b8f0ae74325bbcb0d4 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 15:43:31 +0800 Subject: [PATCH 14/36] =?UTF-8?q?=E5=90=84=E7=A7=8D=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IssueSatisfactionDetailServiceImpl.java | 26 ++++---- .../ProjectSatisfactionDetailServiceImpl.java | 28 ++++---- .../impl/ResiTopicCommentServiceImpl.java | 28 ++++---- .../service/impl/ResiTopicServiceImpl.java | 66 ++++++++++--------- 4 files changed, 79 insertions(+), 69 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java index 3d8405232b..0a3947a0af 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java @@ -157,18 +157,20 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - log.error(String.format(IssueConstant.REVIEW_ISSUE,comment)); - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + if (StringUtils.isNotBlank(comment)) { + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(comment); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + log.error(String.format(IssueConstant.REVIEW_ISSUE, comment)); + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } } } IssueSatisfactionDetailEntity entity = new IssueSatisfactionDetailEntity(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index fcefe8e5b4..55a6425703 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -189,19 +189,21 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - log.error(String.format(ProjectConstant.REVIEW_PROJECT,comment)); - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + if (StringUtils.isNotBlank(comment)) { + //项目满意度评价内容审核 + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(comment); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + log.error(String.format(ProjectConstant.REVIEW_PROJECT, comment)); + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } } } ProjectSatisfactionDetailEntity entity = new ProjectSatisfactionDetailEntity(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index 0f0108348f..ae74578dcd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -165,19 +165,21 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - log.error(String.format(TopicConstant.REVIEW_TOPIC,commentContent)); - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + if (StringUtils.isNotBlank(commentContent)) { + //评论话题内容审核 + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(commentContent); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + log.error(String.format(TopicConstant.REVIEW_TOPIC, commentContent)); + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } } } //1.判断当前用户是否被禁言 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index da1b435b8a..9b007b526a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -217,19 +217,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl attachmentList = resiTopicPublishFormDTO.getAttachmentList(); - //创建话题内容审核 - TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); - TextTaskDTO taskDTO = new TextTaskDTO(); - taskDTO.setContent(topicContent); - taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); - textScanParamDTO.getTasks().add(taskDTO); - Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - log.error(String.format(TopicConstant.CREATE_TOPIC,topicContent)); - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + if (StringUtils.isNotBlank(topicContent)) { + //创建话题内容审核 + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(topicContent); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + log.error(String.format(TopicConstant.CREATE_TOPIC, topicContent)); + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } } } //创建话题图片审核 @@ -1099,24 +1101,26 @@ public class ResiTopicServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - log.error(String.format(TopicConstant.SHIFT_ISSUE,issueTitle,suggestion)); - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + if (StringUtils.isNotBlank(issueTitle) || StringUtils.isNotBlank(suggestion)) { + TextScanParamDTO textScan = new TextScanParamDTO(); + //标题 + TextTaskDTO taskTitle = new TextTaskDTO(); + taskTitle.setContent(issueTitle); + taskTitle.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScan.getTasks().add(taskTitle); + //建议 + TextTaskDTO taskSuggestion = new TextTaskDTO(); + taskSuggestion.setDataId(UUID.randomUUID().toString().replace("-", "")); + taskSuggestion.setContent(suggestion); + textScan.getTasks().add(taskSuggestion); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + log.error(String.format(TopicConstant.SHIFT_ISSUE, issueTitle, suggestion)); + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } } } //1.统一时间(群组服务 -> 议题服务) From e77ca727fec5f9f25e041e10be2ce097adfe2280 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 15:49:19 +0800 Subject: [PATCH 15/36] =?UTF-8?q?issue=E3=80=81project=E3=80=81group?= =?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 --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 02a2e18a6e..b77abb12f7 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.48 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.49 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 329e9d2296..641f612b78 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.48 + 0.3.49 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 07780cc78e..49618bb054 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.33 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.34 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4f26f3dd26..c875f96cb2 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.33 + 0.3.34 gov-project com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index c1a06c861e..da59714c77 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.54 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.55 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index ea2c9bbbd5..ee5b14c6f8 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.54 + 0.3.55 com.epmet resi-group From 6aa0286d285a0d43304e1662b67c2c7122078246 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 15:58:09 +0800 Subject: [PATCH 16/36] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/utils/ModuleUtils.java | 4 ---- 1 file changed, 4 deletions(-) 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 7516f8c2cd..0e13174032 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,7 +2,6 @@ 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; @@ -38,9 +37,6 @@ 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(); } From 5d023250d53279af417188107e55aafd81796206 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 16:02:23 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0job=20report=20stats?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-test.yml | 2 +- .../data-statistical-server/deploy/docker-compose-test.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml index b6a7b91c30..e7737fdb6d 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.19 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.22 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index f16459fc65..db00d0fe81 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.32 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index 57fbe1521c..26ab09d090 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.17 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.19 ports: - "8084:8084" network_mode: host # 使用现有网络 From a64494b954509664ff2ed4feba92295441600f99 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 16:45:49 +0800 Subject: [PATCH 18/36] =?UTF-8?q?gov-org=20=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 03baf78da2..78274f2513 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.69 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.70 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bab4db384b..3f50796a77 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.69 + 0.3.70 com.epmet gov-org From f91cc62c72b00df351b505a4b118bac265c20d58 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 16:56:07 +0800 Subject: [PATCH 19/36] =?UTF-8?q?dingding=20=E6=B6=88=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96ip=E5=9C=B0=E5=9D=80=E4=B8=BAnull=E6=97=B6=20=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/filter/LogMsgSendFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 4bdce1f3e0..f3c70840d6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -39,7 +39,10 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("告警级别：" + event.getLevel()); stringBuilder.append("\n"); - stringBuilder.append("IP地址：" + IpUtils.getServerIp()); + String serverIp = IpUtils.getServerIp(); + if (StringUtils.isNotBlank(serverIp)) { + stringBuilder.append("IP地址：" + serverIp); + } stringBuilder.append("\n"); stringBuilder.append("故障时间：" + formatLongTime2Str(event.getTimeStamp())); stringBuilder.append("\n"); From 8c0419957972c580496e5a27c0604a105d67fad9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 17:06:04 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=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/impl/ProjectProcessServiceImpl.java | 2 +- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 35dd398187..a77a0e1b37 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -253,7 +253,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl{ if (ts.getAgencyId().equals(agency.getId())) { entity.setCustomerId(agency.getCustomerId()); - entity.setOrgIdPath(agency.getPids()+":"+agency.getId()); + entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId()); entity.setDepartmentName(agency.getOrganizationName()); } }); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 04b94c2676..28b2e71720 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -579,7 +579,7 @@ public class ProjectServiceImpl extends BaseServiceImpl { if (ts.getAgencyId().equals(agency.getId())) { entity.setCustomerId(agency.getCustomerId()); - entity.setOrgIdPath(agency.getPids() + ":" + agency.getId()); + entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId()); entity.setDepartmentName(agency.getOrganizationName()); } }); From 32710285a20975ab6b57c22745b6b13e6e8e1732 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Jul 2020 17:06:10 +0800 Subject: [PATCH 21/36] =?UTF-8?q?gov-org=E7=89=88=E6=9C=AC+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 78274f2513..9206f1eff0 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.70 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.71 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3f50796a77..cb2f82b289 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.70 + 0.3.71 com.epmet gov-org From 8a7bce95e1298268636bdf16249aea5e4829e29c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 17:17:26 +0800 Subject: [PATCH 22/36] =?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 --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 49618bb054..9507e5813b 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.34 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.35 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c875f96cb2..08bbcf4174 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.34 + 0.3.35 gov-project com.epmet From 9820c353e90842ecf7a001d850f4b1ba8460fc51 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 17:47:19 +0800 Subject: [PATCH 23/36] =?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 +- .../src/main/java/com/epmet/controller/LoginController.java | 1 - .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index c3c7bc3879..77aaf19751 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.31 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.32 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index f838c1ed6a..a168410482 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet epmet-cloud 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 46b9e6aedc..45c8950d9c 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -108,7 +108,6 @@ public class LoginController { **/ @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); 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 905061cf81..d9add0da70 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 @@ -12,6 +12,7 @@ import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; @@ -135,6 +136,7 @@ public class LoginServiceImpl implements LoginService { public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) { String phone=""; try { + ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class); WxMaService wxMaService = wxMaServiceUtils.resiWxMaService(); WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode()); WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(), @@ -146,6 +148,9 @@ public class LoginServiceImpl implements LoginService { } catch (WxErrorException e) { e.printStackTrace(); log.error(String.format("获取用户微信绑定的手机号接口异常")); + } catch(Exception e){ + e.printStackTrace(); + log.error(String.format("获取用户微信绑定的手机号接口异常")); } return phone; } From 05b2cbfe25d3703ff5f2d5a94e5ffee8fd1b6995 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 17:50:32 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsProjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index eab8e78871..563c5cac04 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; public class StatsProjectServiceImpl implements StatsProjectService { @Autowired - private DataStatisticalOpenFeignClient statsPublicityFeignClient; + private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; /** * @Description 数据统计-项目-机关日月统计 @@ -25,7 +25,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { public Result agencyProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); formDTO.setDate(params); - return statsPublicityFeignClient.agencyProjectStats(formDTO); + return dataStatisticalOpenFeignClient.agencyProjectStats(formDTO); } /** @@ -36,6 +36,6 @@ public class StatsProjectServiceImpl implements StatsProjectService { public Result gridProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); formDTO.setDate(params); - return statsPublicityFeignClient.gridProjectStats(formDTO); + return dataStatisticalOpenFeignClient.gridProjectStats(formDTO); } } From 9902b132b2157df4b06cae726364d397a8f6f5f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 18:21:14 +0800 Subject: [PATCH 25/36] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:getresi?= =?UTF-8?q?wxphone?= 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 +- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 77aaf19751..6f73ac7c45 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.32 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.33 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index a168410482..5497f910ac 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet epmet-cloud 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 d9add0da70..7376af2fd5 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 @@ -147,10 +147,10 @@ public class LoginServiceImpl implements LoginService { } } catch (WxErrorException e) { e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常")); + log.error(String.format("获取用户微信绑定的手机号接口异常",e)); } catch(Exception e){ e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常")); + log.error(String.format("获取用户微信绑定的手机号接口异常",e)); } return phone; } From 940a0b8e4dc52f19ab9c4911219113e8e079b94d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 18:30:08 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 5f78474374..108f2add31 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -9,11 +9,11 @@ agency_id AS "agencyId", project_total AS "projectTotal", DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName", - pending_total AS "pendingTotal", + IFNULL(pending_total,0) AS "pendingTotal", /*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/ - pending_ratio AS "pendingRatioInt", - closed_total AS "closedTotal", - closed_ratio AS "closedRatioInt" + IFNULL(pending_ratio,0) AS "pendingRatioInt", + IFNULL(closed_total,0) AS "closedTotal", + IFNULL(closed_ratio,0) AS "closedRatioInt" FROM fact_agency_project_daily WHERE From af5f1d0d638425be94435e31dcaf67b0b8cb5c41 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 18:30:36 +0800 Subject: [PATCH 27/36] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1:getresi?= =?UTF-8?q?wxphone?= 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 +- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 6f73ac7c45..e44f8aaed5 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.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.34 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 5497f910ac..c59ae27d7b 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.34 com.epmet epmet-cloud 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 7376af2fd5..695c187105 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 @@ -147,10 +147,10 @@ public class LoginServiceImpl implements LoginService { } } catch (WxErrorException e) { e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常",e)); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); } catch(Exception e){ e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常",e)); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); } return phone; } From 655db7332c05790c77d5236cad66756047ec39eb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Jul 2020 18:33:13 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 498f28a728..3d87107f55 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.22 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.23 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 2e9a82b4bd..b585d39d7a 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.22 + 0.3.23 data-report-server From c5ad7b82c5deea634dadb4ada1751c8c9a590498 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 18:37:15 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml index e7737fdb6d..4ee6c2d009 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.23 ports: - "8108:8108" network_mode: host # 使用现有网络 From ffbb7fc6ce626fc2ee6d6a779c0c135d0c738908 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 2 Jul 2020 18:54:46 +0800 Subject: [PATCH 30/36] =?UTF-8?q?auth=E7=89=88=E6=9C=AC=E5=8F=B7+1?= 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 +- .../main/java/com/epmet/service/impl/GovLoginServiceImpl.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index e44f8aaed5..fa73de73c5 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.34 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.35 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index c59ae27d7b..2686dc8232 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.34 + 0.3.35 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index a9a79cb949..092a327312 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -357,9 +357,11 @@ public class GovLoginServiceImpl implements GovLoginService { //根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码 if(!havePasswordFlag){ logger.error(String.format("当前手机号（%s）下所有账户都未设置密码，请先使用验证码登录激活账户",formDTO.getMobile())); + throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } //密码错误 if(!passwordRightFlag){ + logger.error(String.format("根据当前手机号（%s）密码未找到所属组织，密码错误",formDTO.getMobile())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); From e38b864f1b73b935e797568755c61983c682adc4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 3 Jul 2020 09:59:22 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=E5=92=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?0=E7=9A=84=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/project/ProjectDao.xml | 32 +++++++++---------- .../stats/FactAgencyProjectDailyEntity.java | 28 ++++++++-------- .../stats/FactAgencyProjectMonthlyEntity.java | 28 ++++++++-------- .../stats/FactGridProjectDailyEntity.java | 28 ++++++++-------- .../stats/FactGridProjectMonthlyEntity.java | 28 ++++++++-------- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 108f2add31..6a0a73c526 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -27,8 +27,8 @@ ( SELECT "处理中" AS "name", - pending_total AS "value", - pending_ratio AS "ratioInt" + IFNULL(pending_total,0) AS "value", + IFNULL(pending_ratio,0) AS "ratioInt" FROM fact_agency_project_daily WHERE @@ -42,8 +42,8 @@ ( SELECT "已结案" AS "name", - closed_total AS "value", - closed_ratio AS "ratioInt" + IFNULL(closed_total,0) AS "value", + IFNULL(closed_ratio,0) AS "ratioInt" FROM fact_agency_project_daily WHERE @@ -84,9 +84,9 @@ SELECT da.id AS "agencyId", da.agency_name AS "name", - fapd.pending_total AS "value", + IFNULL(fapd.pending_total,0) AS "value", "处理中" AS "type", - fapd.project_total + IFNULL(fapd.project_total,0) FROM fact_agency_project_daily fapd LEFT JOIN dim_agency da ON fapd.agency_id = da.id @@ -100,9 +100,9 @@ SELECT da.id AS "agencyId", da.agency_name AS "name", - fapd.closed_total AS "value", + IFNULL(fapd.closed_total,0) AS "value", "已结案" AS "type", - fapd.project_total + IFNULL(fapd.project_total,0) FROM fact_agency_project_daily fapd LEFT JOIN dim_agency da ON fapd.agency_id = da.id @@ -124,9 +124,9 @@ SELECT da.id AS "agencyId", dg.grid_name AS "name", - fgpd.pending_total AS "value", + IFNULL(fgpd.pending_total,0) AS "value", "处理中" AS "type", - fgpd.project_total + IFNULL(fgpd.project_total,0) FROM fact_grid_project_daily fgpd LEFT JOIN dim_agency da ON fgpd.agency_id = da.id @@ -143,9 +143,9 @@ SELECT da.id AS "agencyId", dg.grid_name AS "name", - fgpd.closed_total AS "value", + IFNULL(fgpd.closed_total,0) AS "value", "已结案" AS "type", - fgpd.project_total + IFNULL(fgpd.project_total,0) FROM fact_grid_project_daily fgpd LEFT JOIN dim_agency da ON fgpd.agency_id = da.id @@ -167,7 +167,7 @@ ( SELECT DATE_FORMAT(date_id, "%Y/%m/%d") AS "date", - pending_incr AS "value", + IFNULL(pending_incr,0) AS "value", "处理中" AS "type", date_id FROM @@ -183,7 +183,7 @@ ( SELECT DATE_FORMAT(date_id, "%Y/%m/%d") AS "date", - closed_incr AS "value", + IFNULL(closed_incr,0) AS "value", "已结案" AS "type", date_id FROM @@ -203,7 +203,7 @@ ( SELECT DATE_FORMAT(CONCAT(month_id,"00"), "%Y/%m") AS "date", - pending_incr AS "value", + IFNULL(pending_incr,0) AS "value", "处理中" AS "type", month_id FROM @@ -219,7 +219,7 @@ ( SELECT DATE_FORMAT(CONCAT(month_id,"00"), "%Y/%m") AS "date", - closed_incr AS "value", + IFNULL(closed_incr,0) AS "value", "已结案" AS "type", month_id FROM diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java index 9f609723f4..baff107cf3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java @@ -82,71 +82,71 @@ public class FactAgencyProjectDailyEntity extends BaseEpmetEntity { /** * 截止当日项目总数 【当前组织及下级项目总数】 */ - private Integer projectTotal; + private Integer projectTotal = 0; /** * 截止当日处理中项目数 【当前组织及下级所有未结案项目总数】 */ - private Integer pendingTotal; + private Integer pendingTotal = 0; /** * 截止当日处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal pendingRatio; + private BigDecimal pendingRatio = new BigDecimal("0"); /** * 截止当日已结案项目数 【当前组织及下级已结案项目总数】 */ - private Integer closedTotal; + private Integer closedTotal = 0; /** * 截止当日已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal closedRatio; + private BigDecimal closedRatio = new BigDecimal("0"); /** * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 */ - private Integer resolvedTotal; + private Integer resolvedTotal = 0; /** * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 */ - private BigDecimal resolvedRatio; + private BigDecimal resolvedRatio = new BigDecimal("0"); /** * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 */ - private Integer unresolvedTotal; + private Integer unresolvedTotal = 0; /** * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 */ - private BigDecimal unresolvedRatio; + private BigDecimal unresolvedRatio = new BigDecimal("0"); /** * 当日项目总数 【当前组织及下级项目总数】 */ - private Integer projectIncr; + private Integer projectIncr = 0; /** * 当日处理中项目数 【当前组织及下级前一日新增处理中项目数】 */ - private Integer pendingIncr; + private Integer pendingIncr = 0; /** * 当日已结案项目数 【当前组织及下级前一日新增结案项目数】 */ - private Integer closedIncr; + private Integer closedIncr = 0; /** * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 */ - private Integer resolvedIncr; + private Integer resolvedIncr = 0; /** * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 */ - private Integer unresolvedIncr; + private Integer unresolvedIncr = 0; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java index 8b147a3f18..7a9fc7c50a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java @@ -72,71 +72,71 @@ public class FactAgencyProjectMonthlyEntity extends BaseEpmetEntity { /** * 截止当月项目总数 【当前组织及下级项目总数】 */ - private Integer projectTotal; + private Integer projectTotal = 0; /** * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】 */ - private Integer pendingTotal; + private Integer pendingTotal = 0; /** * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal pendingRatio; + private BigDecimal pendingRatio = new BigDecimal("0"); /** * 截止当月已结案项目数 【当前组织及下级已结案项目总数】 */ - private Integer closedTotal; + private Integer closedTotal = 0; /** * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal closedRatio; + private BigDecimal closedRatio = new BigDecimal("0"); /** * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 */ - private Integer resolvedTotal; + private Integer resolvedTotal = 0; /** * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 */ - private BigDecimal resolvedRatio; + private BigDecimal resolvedRatio = new BigDecimal("0"); /** * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 */ - private Integer unresolvedTotal; + private Integer unresolvedTotal = 0; /** * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 */ - private BigDecimal unresolvedRatio; + private BigDecimal unresolvedRatio = new BigDecimal("0"); /** * 当月项目总数 【当前组织及下级前一月新增项目数】 */ - private Integer projectIncr; + private Integer projectIncr = 0; /** * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】 */ - private Integer pendingIncr; + private Integer pendingIncr = 0; /** * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】 */ - private Integer closedIncr; + private Integer closedIncr = 0; /** * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 */ - private Integer resolvedIncr; + private Integer resolvedIncr = 0; /** * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 */ - private Integer unresolvedIncr; + private Integer unresolvedIncr = 0; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java index 93c1f71499..e507f74500 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java @@ -82,71 +82,71 @@ public class FactGridProjectDailyEntity extends BaseEpmetEntity { /** * 截止当日网格下项目总数 【当前组织及下级项目总数】 */ - private Integer projectTotal; + private Integer projectTotal = 0; /** * 截止当日网格下处理中项目数 【当前组织及下级所有未结案项目总数】 */ - private Integer pendingTotal; + private Integer pendingTotal = 0; /** * 截止当日网格下处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal pendingRatio; + private BigDecimal pendingRatio = new BigDecimal("0"); /** * 截止当日网格下已结案项目数 【当前组织及下级已结案项目总数】 */ - private Integer closedTotal; + private Integer closedTotal = 0; /** * 截止当日网格下已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal closedRatio; + private BigDecimal closedRatio = new BigDecimal("0"); /** * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 */ - private Integer resolvedTotal; + private Integer resolvedTotal = 0; /** * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 */ - private BigDecimal resolvedRatio; + private BigDecimal resolvedRatio = new BigDecimal("0"); /** * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 */ - private Integer unresolvedTotal; + private Integer unresolvedTotal = 0; /** * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 */ - private BigDecimal unresolvedRatio; + private BigDecimal unresolvedRatio = new BigDecimal("0"); /** * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 */ - private Integer resolvedIncr; + private Integer resolvedIncr = 0; /** * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 */ - private Integer unresolvedIncr; + private Integer unresolvedIncr = 0; /** * 当日网格下项目总数 【该网格下项目总数】 */ - private Integer projectIncr; + private Integer projectIncr = 0; /** * 当日网格下处理中项目数 【该网格下未结案项目总数】 */ - private Integer pendingIncr; + private Integer pendingIncr = 0; /** * 当日网格下已结案项目数 【该网格下已结案项目总数】 */ - private Integer closedIncr; + private Integer closedIncr = 0; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java index dd79ecc9fa..1ed377a64f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java @@ -72,71 +72,71 @@ public class FactGridProjectMonthlyEntity extends BaseEpmetEntity { /** * 截止当月项目总数 【当前组织及下级项目总数】 */ - private Integer projectTotal; + private Integer projectTotal = 0; /** * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】 */ - private Integer pendingTotal; + private Integer pendingTotal = 0; /** * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal pendingRatio; + private BigDecimal pendingRatio = new BigDecimal("0"); /** * 截止当月已结案项目数 【当前组织及下级已结案项目总数】 */ - private Integer closedTotal; + private Integer closedTotal = 0; /** * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】 */ - private BigDecimal closedRatio; + private BigDecimal closedRatio = new BigDecimal("0"); /** * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】 */ - private Integer resolvedTotal; + private Integer resolvedTotal = 0; /** * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】 */ - private BigDecimal resolvedRatio; + private BigDecimal resolvedRatio = new BigDecimal("0"); /** * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】 */ - private Integer unresolvedTotal; + private Integer unresolvedTotal = 0; /** * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】 */ - private BigDecimal unresolvedRatio; + private BigDecimal unresolvedRatio = new BigDecimal("0"); /** * 当月项目总数 【当前组织及下级前一月新增项目数】 */ - private Integer projectIncr; + private Integer projectIncr = 0; /** * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】 */ - private Integer pendingIncr; + private Integer pendingIncr = 0; /** * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】 */ - private Integer closedIncr; + private Integer closedIncr = 0; /** * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】 */ - private Integer resolvedIncr; + private Integer resolvedIncr = 0; /** * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】 */ - private Integer unresolvedIncr; + private Integer unresolvedIncr = 0; } From fd114ed3ade3ae36b90c3558f9f7312cde36e64f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 3 Jul 2020 10:03:34 +0800 Subject: [PATCH 32/36] =?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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 3d87107f55..b9bd8a3081 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.23 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.24 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 b585d39d7a..6fd896409d 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.23 + 0.3.24 data-report-server 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 3cea9aa7f5..4be99dbdd1 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.32 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.33 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 35dc700f49..78d8b27df6 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.32 + 0.3.33 data-statistical com.epmet From 1e5e59e965012dd46d5cde0625e9f90e1d976ac3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 3 Jul 2020 10:25:45 +0800 Subject: [PATCH 33/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectDao.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 6a0a73c526..cd08762de4 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -86,7 +86,7 @@ da.agency_name AS "name", IFNULL(fapd.pending_total,0) AS "value", "处理中" AS "type", - IFNULL(fapd.project_total,0) + IFNULL(fapd.project_total,0) AS "projectTotal" FROM fact_agency_project_daily fapd LEFT JOIN dim_agency da ON fapd.agency_id = da.id @@ -102,7 +102,7 @@ da.agency_name AS "name", IFNULL(fapd.closed_total,0) AS "value", "已结案" AS "type", - IFNULL(fapd.project_total,0) + IFNULL(fapd.project_total,0) AS "projectTotal" FROM fact_agency_project_daily fapd LEFT JOIN dim_agency da ON fapd.agency_id = da.id @@ -113,7 +113,7 @@ ) ) a ORDER BY - a.project_total DESC + a.projectTotal DESC SELECT agency_id AS "agencyId", - project_total AS "projectTotal", + IFNULL(project_total,0) AS "projectTotal", DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName", IFNULL(pending_total,0) AS "pendingTotal", /*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/ From d05e718bce8c413afea1487b617285180745a0ec Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Jul 2020 10:46:47 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 6 +++++- .../main/java/com/epmet/modules/utils/ModuleConstant.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 9b007b526a..958b1b4424 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -599,7 +599,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl records = resiTopicOperationDao.selectList(queryWrapper); if(null != records && records.size() > NumConstant.ZERO){ - closeDetail.setCloseReason(records.get(0).getOperationReason()); + if(StringUtils.isNotBlank(records.get(0).getOperationReason())){ + closeDetail.setCloseReason(String.format("%s%s", + ModuleConstant.CLOSED_TOPIC_REASON_PREFIX, + records.get(0).getOperationReason())); + } closeDetail.setCloseDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND); ResiGroupMemberInfoRedisDTO closedBy = resiGroupMemberRedis.get(group.getId(),records.get(0).getCreatedBy()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index 2d1bcc545f..094c58bda7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -326,4 +326,6 @@ public interface ModuleConstant extends Constant { String FILED_TOPIC_ID = "TOPIC_ID"; String FIELD_OPERATION_TYPE = "OPERATION_TYPE"; + + String CLOSED_TOPIC_REASON_PREFIX="话题已关闭："; }