Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

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 # 使用现有网络

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.30</version>
+    <version>0.3.35</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

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);

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();

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;
 	}

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<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+
+	}
+}

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");

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.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -14,9 +14,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
-import java.net.NetworkInterface;
+import java.util.regex.Pattern;
-import java.net.SocketException;
-import java.util.Enumeration;
 
 /**
  * IP工具类
@@ -26,6 +24,11 @@ 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;
@@ -57,28 +60,33 @@ public class IpUtils {
 	 * desc:获取本地Ip
 	 * @return
 	 */
-    public static String  getServerIp(){
+	public static String getServerIp() {
 		String SERVER_IP = "";
 		try {
-            Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces();
+			/**
-            InetAddress ip = null;
+			 * 遍历本地网卡的方式，在云平台虚拟机取不到真正的ip
-            while (netInterfaces.hasMoreElements()) {
+			 * @return
-                NetworkInterface ni = (NetworkInterface) netInterfaces
+			 */
-                        .nextElement();
+			InetAddress localAddress = InetAddress.getLocalHost();
-                ip = ni.getInetAddresses().nextElement();
+			if (isValidAddress(localAddress)) {
-                SERVER_IP = ip.getHostAddress();
+				return localAddress.getHostAddress();
-                if (!ip.isSiteLocalAddress() && !ip.isLoopbackAddress()
-                        && ip.getHostAddress().indexOf(":") == -1) {
-                    SERVER_IP = ip.getHostAddress();
-                    break;
-                }else{
-                    ip = null;
-                }
 			}
-        } catch (SocketException e) {
+			logger.warn("Could not get local host ip address");
+			return null;
+		} catch (Exception e) {
 			logger.error("IpUtils getServerIp exception ", e);
 		}
 
 		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());
+	}
 }

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 # 使用现有网络

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 # 使用现有网络

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">
 
-    <version>0.3.22</version>
+    <version>0.3.25</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -7,13 +7,13 @@
     <select id="selectProjectSummary" resultType="com.epmet.project.dto.result.ProjectSummaryResultDTO">
         SELECT
             agency_id AS "agencyId",
-            project_total AS "projectTotal",
+            IFNULL(project_total,0) 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",
+            IFNULL(pending_ratio,0) AS "pendingRatioInt",
-            closed_total AS "closedTotal",
+            IFNULL(closed_total,0) AS "closedTotal",
-            closed_ratio AS "closedRatioInt"
+            IFNULL(closed_ratio,0) AS "closedRatioInt"
         FROM
             fact_agency_project_daily
         WHERE
@@ -27,8 +27,8 @@
         (
             SELECT
                 "处理中" AS "name",
-                pending_total AS "value",
+                IFNULL(pending_total,0) AS "value",
-                pending_ratio AS "ratioInt"
+                IFNULL(pending_ratio,0) AS "ratioInt"
             FROM
                 fact_agency_project_daily
             WHERE
@@ -42,8 +42,8 @@
         (
             SELECT
                 "已结案" AS "name",
-                closed_total AS "value",
+                IFNULL(closed_total,0) AS "value",
-                closed_ratio AS "ratioInt"
+                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) AS "projectTotal"
                 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) 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>
 
     <select id="selectSubGrid" resultType="com.epmet.project.dto.result.ProjectSubGridResultDTO">
@@ -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) AS "projectTotal"
                     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) AS "projectTotal"
                     FROM
                         fact_grid_project_daily fgpd
                     LEFT JOIN dim_agency da ON fgpd.agency_id = da.id
@@ -159,7 +159,7 @@
                 )
             ) a
         ORDER BY
-            a.project_total DESC, a.type ASC
+            a.projectTotal DESC, a.type ASC
     </select>
 
     <select id="selectIncrTrendDaily" resultType="com.epmet.project.dto.result.ProjectIncrTrendResultDTO">
@@ -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

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.33
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

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.32
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.30</version>
+    <version>0.3.33</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

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<Boolean> tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagUsedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO));
 	}
 
@@ -70,6 +71,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "tagUsedQuarterlyStatsjob")
 	public Result<Boolean> tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagUsedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO));
 	}
 
@@ -81,6 +83,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "tagViewedDailyStatsjob")
 	public Result<Boolean> tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagViewedDailyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO));
 	}
 
@@ -92,6 +95,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "tagViewedMonthlyStatsjob")
 	public Result<Boolean> tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagViewedMonthlyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO));
 	}
 
@@ -103,6 +107,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "tagViewedQuarterlyStatsjob")
 	public Result<Boolean> tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagViewedQuarterlyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO));
 	}
 }

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<FactGroupAgencyDailyEnt
      * @param
      * @author zxc
      */
-    List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("monthId") String monthId);
+    List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("dateId") String dateId);
 
     /**
      * @Description  查询 月的小组增量

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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }

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<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId);
+        String dateId = dimIdBean.getDateId();
+        List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(dateId);
         List<AgencyGroupMonthlyResultDTO> monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId);
         if (monthGroupIncr.size() == NumConstant.ZERO){
             lastDayAgency.forEach(agency -> {

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<FactGroupAgency
      * @param
      * @author zxc
      */
-    List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId);
+    List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId);
 
     /**
      * @Description  查询 月的小组增量

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<FactGroupAg
      * @param
      * @author zxc
      */
-    public List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId){
+    public List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId){
-        return baseDao.getLastDayAgency(monthId);
+        return baseDao.getLastDayAgency(dateId);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml

@@ -125,7 +125,7 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
         <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>

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}
     </select>
 
     <!-- 查询 月的小组增量 -->

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 # 使用现有网络

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 # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.17</version>
+    <version>0.3.19</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

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);
     }
 }

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);
+		logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		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);

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;
+		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());
 		}
 	}
 }

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;
+		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());
 		}
 	}
 }

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;
+		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());
 		}
 	}
 }

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;
+		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());
 		}
 	}
 }

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;
+		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());
 		}
 	}
 }

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;
+		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());
 		}
 	}
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
 		}
 	}
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
         }
     }
 }

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());
 		}
 	}
 }

epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml

@@ -125,11 +125,12 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</webHook>
+            <secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</secret>
         </filter>
     </appender>
 

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 # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.47</version>
+    <version>0.3.49</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java

@@ -157,20 +157,22 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
     public void evaluate(EvaluateFormDTO formDTO) {
         String comment = formDTO.getComment();
         //议题评论内容审核
+        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<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()){
+            if (!textSyncScanResult.success()) {
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                log.error(String.format(IssueConstant.REVIEW_ISSUE,comment));
+                    log.error(String.format(IssueConstant.REVIEW_ISSUE, comment));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         IssueSatisfactionDetailEntity entity = new IssueSatisfactionDetailEntity();
         BeanUtils.copyProperties(formDTO,entity);
         InitEvaluationFormDTO initEvaluation = new InitEvaluationFormDTO();

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 # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.69</version>
+    <version>0.3.71</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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 # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.32</version>
+    <version>0.3.35</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

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<ProjectProcessDao
             agencyDeptGrid.getAgencyList().forEach(agency->{
                 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());
                 }
             });

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java

@@ -189,6 +189,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
     @Transactional(rollbackFor = Exception.class)
     public void projectEvaluate(ProjectEvaluateFormDTO formDTO) {
         String comment = formDTO.getComment();
+        if (StringUtils.isNotBlank(comment)) {
             //项目满意度评价内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -196,14 +197,15 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
             taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
             textScanParamDTO.getTasks().add(taskDTO);
             Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()){
+            if (!textSyncScanResult.success()) {
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                log.error(String.format(ProjectConstant.REVIEW_PROJECT,comment));
+                    log.error(String.format(ProjectConstant.REVIEW_PROJECT, comment));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         ProjectSatisfactionDetailEntity entity = new ProjectSatisfactionDetailEntity();
         BeanUtils.copyProperties(formDTO,entity);
         //校验是否评价

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<ProjectDao, ProjectEntit
 			agencyDeptGrid.getAgencyList().forEach(agency -> {
 				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());
 				}
 			});

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 # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.54</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -165,6 +165,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
     @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
         String commentContent = resiCommentFormDTO.getCommentContent();
+        if (StringUtils.isNotBlank(commentContent)) {
             //评论话题内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -172,14 +173,15 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
             textScanParamDTO.getTasks().add(taskDTO);
             Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()){
+            if (!textSyncScanResult.success()) {
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                log.error(String.format(TopicConstant.REVIEW_TOPIC,commentContent));
+                    log.error(String.format(TopicConstant.REVIEW_TOPIC, commentContent));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
         if(null == topic){

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -217,6 +217,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO) {
         String topicContent = resiTopicPublishFormDTO.getTopicContent();
         List<String> attachmentList = resiTopicPublishFormDTO.getAttachmentList();
+        if (StringUtils.isNotBlank(topicContent)) {
             //创建话题内容审核
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
@@ -224,14 +225,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
             textScanParamDTO.getTasks().add(taskDTO);
             Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()){
+            if (!textSyncScanResult.success()) {
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                log.error(String.format(TopicConstant.CREATE_TOPIC,topicContent));
+                    log.error(String.format(TopicConstant.CREATE_TOPIC, topicContent));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //创建话题图片审核
         if (attachmentList.size() != NumConstant.ZERO){
             ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
@@ -597,7 +599,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             List<ResiTopicOperationEntity> 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,6 +1105,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //话题转议题审核：标题、建议
         String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
         String suggestion = topicTurnIssueFromDTO.getSuggestion();
+        if (StringUtils.isNotBlank(issueTitle) || StringUtils.isNotBlank(suggestion)) {
             TextScanParamDTO textScan = new TextScanParamDTO();
             //标题
             TextTaskDTO taskTitle = new TextTaskDTO();
@@ -1111,14 +1118,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             taskSuggestion.setContent(suggestion);
             textScan.getTasks().add(taskSuggestion);
             Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan);
-        if (!textSyncScanResult.success()){
+            if (!textSyncScanResult.success()) {
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                log.error(String.format(TopicConstant.SHIFT_ISSUE,issueTitle,suggestion));
+                    log.error(String.format(TopicConstant.SHIFT_ISSUE, issueTitle, suggestion));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
+        }
         //1.统一时间(群组服务 -> 议题服务)
         Date now = new Date();
         //2.调用gov-org获取数据权限

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="话题已关闭：";
 }