diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 4d4c5b04f2..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.30 + 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 bedc5ca532..2686dc8232 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.35 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/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(); 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..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 @@ -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(), @@ -145,7 +147,10 @@ public class LoginServiceImpl implements LoginService { } } catch (WxErrorException e) { e.printStackTrace(); - log.error(String.format("获取用户微信绑定的手机号接口异常")); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); + } catch(Exception e){ + e.printStackTrace(); + log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage())); } return phone; } 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/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"); 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-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..59824b4c30 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.25 ports: - "8109:8109" network_mode: host # 使用现有网络 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..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.19 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.23 ports: - "8108:8108" 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..78386a29db 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.25 data-report-server 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..01ed21f5e3 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 @@ -7,13 +7,13 @@ 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..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.17 + 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/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index 5f15aeadf3..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.14 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/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 2d417ce73d..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.17 + 0.3.19 com.epmet epmet-job 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); } } 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..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 @@ -23,21 +23,21 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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()); } } 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 7888be0829..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 @@ -23,16 +23,16 @@ public class PublicityTagUsedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagUsedDailyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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..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 @@ -23,16 +23,16 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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..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 @@ -23,16 +23,16 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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..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 @@ -23,16 +23,16 @@ public class PublicityTagViewedDailyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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..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 @@ -23,16 +23,16 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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..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 @@ -23,16 +23,16 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { @Override public void run(String params) { - logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - StatsFormDTO formDTO = null; + logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + StatsFormDTO formDTO = new StatsFormDTO(); 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 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..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.47 + 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 0accecf9f6..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.47 + 0.3.49 gov-issue com.epmet 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-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 03baf78da2..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.69 + 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 bab4db384b..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.69 + 0.3.71 com.epmet gov-org 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..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.32 + 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 61e29c166c..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.32 + 0.3.35 gov-project com.epmet 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/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/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()); } }); 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 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..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 @@ -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()); + } } } //创建话题图片审核 @@ -597,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()); @@ -1099,24 +1105,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.统一时间(群组服务 -> 议题服务) 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="话题已关闭："; }