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

epmet-auth/pom.xml

@@ -187,6 +187,12 @@
                 <gov.wx.ma.secret>651f02d71ed3f123dfb584b8bf0f4d8b</gov.wx.ma.secret>
                 <!--<gov.wx.ma.appId>wx2679392c4cc2af22</gov.wx.ma.appId>
                 <gov.wx.ma.secret>e5e72147737cfeb2b0f3a43624cadb3f</gov.wx.ma.secret>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -225,6 +231,12 @@
                 <gov.wx.ma.secret>651f02d71ed3f123dfb584b8bf0f4d8b</gov.wx.ma.secret>
                 <!--<gov.wx.ma.appId>wx2679392c4cc2af22</gov.wx.ma.appId>
                 <gov.wx.ma.secret>e5e72147737cfeb2b0f3a43624cadb3f</gov.wx.ma.secret>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -258,6 +270,12 @@
                 <!--政府端小程序配置-->
                 <gov.wx.ma.appId>wx3d1372029eb816a3</gov.wx.ma.appId>
                 <gov.wx.ma.secret>651f02d71ed3f123dfb584b8bf0f4d8b</gov.wx.ma.secret>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
 
@@ -295,6 +313,12 @@
                 <!--政府端小程序配置-->
                 <gov.wx.ma.appId>wx3d1372029eb816a3</gov.wx.ma.appId>
                 <gov.wx.ma.secret>651f02d71ed3f123dfb584b8bf0f4d8b</gov.wx.ma.secret>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java

@@ -26,7 +26,6 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.SetOperations;
-import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -39,7 +38,8 @@ import java.util.Set;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@Component
+//@Component 2020-11-17目前小程序升级都是从 公众号升级 所有这种方式 暂时用不到了
+@Deprecated
 public class CustomerAppWxServiceUtil implements ApplicationRunner {
 	private static Logger logger = LogManager.getLogger(CustomerAppWxServiceUtil.class);
 

epmet-auth/src/main/resources/bootstrap.yml

@@ -113,7 +113,7 @@ wx:
 #        secret: @oper.wx.ma.secret@
 #        token: #微信小程序消息服务器配置的token
 #        aesKey: #微信小程序消息服务器配置的EncodingAESKey
-#        msgDataFormat: JSON
+    #        msgDataFormat: JSON
     appId:
       # 党群e事通-居民端小程序配置appId
       resi: @resi.wx.ma.appId@
@@ -121,3 +121,8 @@ wx:
       gov: @gov.wx.ma.appId@
       # 党群e事通-运营端小程序配置的appId
       #oper: @oper.wx.ma.appId@
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

epmet-auth/src/main/resources/logback-spring.xml

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/auth"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -43,7 +43,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
@@ -60,8 +59,14 @@ import java.util.Set;
  */
 @Slf4j
 public class HttpClientManager {
-	private static int connectionTimeout = 3000;// 连接超时时间,毫秒
-	private static int soTimeout = 10000;// 读取数据超时时间，毫秒
+	// 连接超时时间,毫秒
+	private static int connectionTimeout = 5000;
+	// 读取数据超时时间，毫秒
+	private static int soTimeout = 20000;
+	private static String HEADER_CONTENT_TYPE = "Content-Type";
+	private static String HEADER_APPLICATION_JSON = "application/json;charset=utf-8";
+	private static String UTF8 = "utf-8";
+	private static String HEADER_APPLICATION_FORM_URL_ENCODED = "application/x-www-form-urlencoded;charset=utf-8";
 	/**
 	 * HttpClient对象
 	 */
@@ -116,13 +121,14 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/x-www-form-urlencoded charset=utf-8");
+
+			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_FORM_URL_ENCODED);
 
 			List<NameValuePair> list = new ArrayList<NameValuePair>();
 			for (String key : paramsMap.keySet()) {
 				list.add(new BasicNameValuePair(key, String.valueOf(paramsMap.get(key))));
 			}
-			UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(list, "utf-8");
+			UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(list, UTF8);
 			httppost.setEntity(urlEncodedFormEntity);
 
 			return execute(httppost, false);
@@ -146,9 +152,9 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (StringUtils.isNotEmpty(jsonStrParam)) {
-				StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+				StringEntity se = new StringEntity(jsonStrParam, UTF8);
 				httppost.setEntity(se);
 			}
 			return execute(httppost, false);
@@ -164,14 +170,14 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (null != headerMap){
 				headerMap.forEach((k,v) -> {
 					httppost.addHeader(k,v);
 				});
 			}
 			if (StringUtils.isNotEmpty(jsonStrParam)) {
-				StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+				StringEntity se = new StringEntity(jsonStrParam, UTF8);
 				httppost.setEntity(se);
 			}
 			return execute(httppost, false);
@@ -221,9 +227,9 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/json");
+			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (StringUtils.isNotEmpty(jsonStrParam)) {
-				StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+				StringEntity se = new StringEntity(jsonStrParam, UTF8);
 				httppost.setEntity(se);
 			}
 			return execute(httppost, true);
@@ -249,9 +255,9 @@ public class HttpClientManager {
 		try {
 			String stringToSign = timestamp + "\n" + secret;
 			Mac mac = Mac.getInstance("HmacSHA256");
-			mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
-			byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
-			String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+			mac.init(new SecretKeySpec(secret.getBytes(UTF8), "HmacSHA256"));
+			byte[] signData = mac.doFinal(stringToSign.getBytes(UTF8));
+			String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), UTF8);
 			DingTalkTextMsg msg = new DingTalkTextMsg();
 			msg.setContent(content);
 			url = url.concat("&timestamp=" + timestamp + "&sign=" + sign);
@@ -275,9 +281,9 @@ public class HttpClientManager {
 		try {
 			String stringToSign = timestamp + "\n" + secret;
 			Mac mac = Mac.getInstance("HmacSHA256");
-			mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
-			byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
-			String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+			mac.init(new SecretKeySpec(secret.getBytes(UTF8), "HmacSHA256"));
+			byte[] signData = mac.doFinal(stringToSign.getBytes(UTF8));
+			String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), UTF8);
 			log.info("sign为："+sign);
 			url = url.concat("&timestamp=" + timestamp + "&sign=" + sign);
 			log.info("发送url："+url);
@@ -383,9 +389,9 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/json");
+			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (StringUtils.isNotEmpty(json)) {
-				StringEntity se = new StringEntity(json, "utf-8");
+				StringEntity se = new StringEntity(json, UTF8);
 				httppost.setEntity(se);
 			}
 			return executeToByte(httppost);

epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

@@ -131,6 +131,12 @@ public class InternalAuthProcessor extends AuthProcessor {
      * @return
      */
     private boolean needAuth(String requestUri) {
+        for (String url : cpProperty.getInternalAuthUrlsWhiteList()) {
+            if (antPathMatcher.match(url, requestUri)) {
+                return false;
+            }
+        }
+
         for (String url : cpProperty.getInternalAuthUrls()) {
             if (antPathMatcher.match(url, requestUri)) {
                 return true;

epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java

@@ -22,6 +22,11 @@ public class CpProperty {
      */
     private List<String> internalAuthUrls;
 
+    /**
+     * 内部认证url白名单
+     */
+    private List<String> internalAuthUrlsWhiteList;
+
     /**
      * 对外部应用开放的url列表
      */

epmet-gateway/src/main/resources/bootstrap.yml

@@ -439,6 +439,10 @@ epmet:
     - /resi/home/**
     - /data/report/**
 
+  # 内部认证url白名单(在白名单中的，就不会再校验登录了)
+  internalAuthUrlsWhiteList:
+    - /epmetuser/customerstaff/customerlist
+
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
     - /data/report/**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java

@@ -17,4 +17,8 @@ public class ProjectLatestOperationResultDTO implements Serializable {
     private String projectId;
 
     private String operationName;
+
+    private Integer costTime;
+
+    private String title;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -1,23 +1,33 @@
 package com.epmet.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.concurrent.*;
+
 /**
  * @Author zxc
  * @DateTime 2020/9/24 9:42 上午
  */
+@Slf4j
 @RestController
 @RequestMapping("screenextract")
 public class ScreenExtractDailyController {
-
+    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("ScreenExtractDailyController-pool-%d").build();
+    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
+            10L, TimeUnit.MINUTES,
+            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
     @Autowired
     private ScreenExtractService screenExtractService;
 
@@ -29,7 +39,15 @@ public class ScreenExtractDailyController {
      */
     @PostMapping("extractdailyall")
     public Result screenExtractDaily(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        screenExtractService.extractDailyAll(extractOriginFormDTO);
+        threadPool.submit(() -> {
+            log.info("screenExtractDaily start,param:{}", JSON.toJSONString(extractOriginFormDTO));
+            try {
+                screenExtractService.extractDailyAll(extractOriginFormDTO);
+                log.info("screenExtractDaily end");
+            } catch (Exception e) {
+                log.error("screenExtractDaily exception", e);
+            }
+        });
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java

@@ -61,6 +61,15 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      **/
     int selectIfExist(@Param("customerId") String customerId);
 
+    /**
+     * @Description 根据用户Id查询所有组原始数据
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.extract.FactOriginGroupMainDailyDTO>
+     * @author wangc
+     * @date 2020.11.17 09:56
+    */
+    List<FactOriginGroupMainDailyDTO> selectAllGroupByCustomerId(@Param("customerId") String customerId);
+
     /**
      * @param customerId
      * @return
@@ -79,6 +88,16 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      **/
     void deleteBatchMemberByCustomerId(@Param("customerId") String customerId, @Param("dimId") String dimId, @Param("dateType") String dateType);
 
+    /**
+     * @Description 删除指定组Id的成员
+     * @param customerId
+     * @param groups
+     * @return void
+     * @author wangc
+     * @date 2020.11.16 11:15
+    */
+    void deleteMemberByGroupList(@Param("customerId") String customerId,@Param("groups") List<String> groups);
+
     /**
      * @param customerId
      * @return

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@@ -180,12 +180,12 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	/**
 	 * @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目
 	 * @param customerId
-	 * @param list
+
 	 * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
 	 * @author wangc
 	 * @date 2020.09.28 10:19
 	*/
-	List<ScreenDifficultyDataEntity> selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("list")List<String> list);
+	List<ScreenDifficultyDataEntity> selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("thresholdValue") Integer thresholdValue);
     
 	/**
 	 * @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenDifficultyDataDao.java

@@ -91,4 +91,13 @@ public interface ScreenDifficultyDataDao extends BaseDao<ScreenDifficultyDataEnt
     int insertBatch(@Param("list") List<ScreenDifficultyDataEntity> list);
 
     int insertBatchImg(@Param("list") List<ScreenDifficultyImgDataEntity> list);
+
+    /**
+     * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+     * @author wangc
+     * @date 2020.11.17 09:33
+     */
+    List<ScreenDifficultyDataEntity> selectAllDifficultyByCustomerId(@Param("customerId")String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@@ -103,14 +103,5 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      */
     String selectParameterValueByKey(@Param("customerId") String customerId);
 
-    /**
-     * @Description 得到超过阈值滞留的项目Id集合
-     * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
-     * @param customerId
-     * @param exclude
-     * @return java.util.List<java.lang.String>
-     * @author wangc
-     * @date 2020.11.06 14:14
-     */
-    List<String> selectOvertimeProjectIds(@Param("customerId") String customerId,@Param("exclude") List<String> exclude,@Param("value") Integer value);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java

@@ -153,15 +153,4 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @date 2020.09.28 14:45
     */
     List<ProjectLatestOperationResultDTO> selectLatestOperation(@Param("list") List<String> list,@Param("customerId") String customerId);
-
-    /**
-     * @Description 查找项目标题
-     * @param list
-     * @return java.util.List<com.epmet.dto.project.result.ProjectLatestOperationResultDTO>
-     * @author wangc
-     * @date 2020.09.28 14:45
-     */
-    List<ProjectLatestOperationResultDTO> selectProjectTitle(@Param("list") List<String> list,@Param("customerId") String customerId);
-
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java

@@ -64,7 +64,7 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * @author wangc
      * @date 2020.09.23 16:30
     **/
-    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList);
+    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList, List<String> missing);
 
     /**
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@@ -248,12 +248,12 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
     /**
      * @Description 查询难点赌点基础信息
      * @param customerId
-     * @param list
+
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
      * @author wangc
      * @date 2020.09.28 10:23
     */
-    List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId , List<String> list);
+    List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId ,Integer thresholdValue);
 
     /**
      * @Description 得到评价周期内新立项的id

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java

@@ -84,7 +84,7 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList) {
+    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList,List<String> missing) {
         if (isFirst) {
             //isFirst
             baseDao.deleteBatchMemberByCustomerId(customerId,null,null);
@@ -95,8 +95,13 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
         }
         //删除要插入的组主表数据
         baseDao.deleteBatchByGroupId(customerId,originGroupData.stream().map(FactOriginGroupMainDailyDTO :: getId).distinct().collect(Collectors.toList()));
+
         baseDao.insertBatchMain(originGroupData);
         baseDao.insertBatchMembers(memberList);
+        if(!CollectionUtils.isEmpty(missing)){
+            baseDao.deleteBatchByGroupId(customerId,missing);
+            baseDao.deleteMemberByGroupList(customerId,missing);
+        }
         return true;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -237,15 +237,15 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     /**
      * @Description 查询难点赌点基础信息
      * @param customerId
-     * @param list
+
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
      * @author wangc
      * @date 2020.09.28 10:23
      */
     @Override
-    public List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId, List<String> list) {
-        if(CollectionUtils.isEmpty(list)) return null;
-        return baseDao.selectDifficultyBaseInfo(customerId,list);
+    public List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId, Integer thresholdValue) {
+
+        return baseDao.selectDifficultyBaseInfo(customerId,thresholdValue);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java

@@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -69,7 +66,7 @@ public class GroupExtractServiceImpl implements GroupExtractService {
     /**
      * @param param
      * @return
-     * @Description 业务抽取 - 小组祥光
+     * @Description 业务抽取 - 小组
      * @author wangc
      * @date 2020.09.18 21:07
      **/
@@ -95,8 +92,27 @@ public class GroupExtractServiceImpl implements GroupExtractService {
         if (!CollectionUtils.isEmpty(gridList)) {
             Map<String, GridAttributesResultDTO> gridMap =
                     gridList.stream().collect(Collectors.toMap(GridAttributesResultDTO::getGridId, Function.identity(), (key1, key2) -> key2));
-            if (!CollectionUtils.isEmpty(originGroupData)) {
-                originGroupData.forEach(group -> {
+
+                //剔除本次要更新数据中的垃圾数据
+                for(Iterator<FactOriginGroupMainDailyDTO> iter = originGroupData.iterator();
+                    iter.hasNext();){
+                    FactOriginGroupMainDailyDTO pointer = iter.next();
+                    if(null == gridMap.get(pointer.getGridId()))iter.remove();
+
+                }
+            //记录全量中的垃圾数
+            List<String> missingGroups = new LinkedList<>();
+            List<FactOriginGroupMainDailyDTO> population = factOriginGroupMainDailyDao.selectAllGroupByCustomerId(param.getCustomerId());
+            if(!CollectionUtils.isEmpty(population)){
+                for(Iterator<FactOriginGroupMainDailyDTO> iter = population.iterator();
+                    iter.hasNext();){
+                    FactOriginGroupMainDailyDTO pointer = iter.next();
+                    if(null == gridMap.get(pointer.getGridId())){
+                        missingGroups.add(pointer.getId());
+                    }
+                }
+            }
+            originGroupData.forEach(group -> {
                     GridAttributesResultDTO attr = gridMap.get(group.getGridId());
                     if (null != attr) {
                         group.setAgencyId(attr.getAgencyId());
@@ -141,14 +157,15 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                     }
 
                 });
-            }
+
 
             factOriginGroupMainDailyService.insertExtractedData(
                     count <= NumConstant.ZERO ? true : false,
                     param.getCustomerId(),
                     param.getDateId(),
                     originGroupData,
-                    memberList
+                    memberList,
+                    missingGroups
             );
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -16,7 +16,6 @@ import com.epmet.dto.issue.IssueDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
-import com.epmet.dto.project.ProjectOrgRelationDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
@@ -42,8 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collector;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -123,6 +124,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		}
 		//获取项目信息
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString);
+		factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 		if (!CollectionUtils.isEmpty(projectList)) {
 			//提取议题ID
 			List<String> issueIds = projectList.stream().map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -193,7 +195,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}));
 			//插入数据
 			if (!list.isEmpty()) {
-				factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 				factOriginProjectMainDailyService.insertBatch(list);
 			}
 		}
@@ -368,8 +369,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 							path =path.substring(NumConstant.ZERO,path.length() - NumConstant.ONE);
 						}
 						entity.setPids(path);
-					}else{
-						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}",process.getAgencyId(),process.getPids());
+					} else {
+						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids());
 						entity.setPid(NumConstant.ZERO_STR);
 						entity.setPids("");
 					}
@@ -378,8 +379,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			return entity;
 		}).collect(Collectors.toList()));
 
+		factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 		if (!logList.isEmpty()) {
-			factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 			factOriginProjectLogDailyService.insertBatch(logList);
 		}
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -112,14 +112,18 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             return;
         }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
-        issueTotal.forEach(issue -> {
+        for (FactIssueGridMonthlyEntity issue : issueTotal) {
             String gridId = issue.getGridId();
             ScreenUserJoinEntity entity = insertMap.get(gridId);
+            if (entity == null) {
+                log.warn("gridId:{} is not exist in dimGrid,monthId:{},gridId:{}", formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+                continue;
+            }
             entity.setJoinTotal(issue.getIssueIncr());
             GridUserCountResultDTO user = userCountMap.get(gridId);
             if (user == null) {
                 log.warn("gridId:{} is not exist in issue,customerId:{},monthId:{},gridId:{}", JSON.toJSONString(issue), formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
-                return;
+                continue;
             }
             //百人人均议题：统计周期内总的议题数/（注册用户数/100）
             log.debug("issue:{}", JSON.toJSONString(issue));
@@ -129,7 +133,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                         .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP);
                 entity.setAvgIssue(avgIssueCount);
             }
-        });
+        }
 
 
         //获取该月 表决的人数
@@ -153,6 +157,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) {
             String gridId = entry.getKey();
             ScreenUserJoinEntity entity = insertMap.get(gridId);
+            if (entity == null) {
+                log.warn("gridId:{} is not exist in dimGrid,monthId:{},gridId:{}", formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+                continue;
+            }
             List<IssueVoteUserCountResultDTO> issueList = entry.getValue();
             BigDecimal bigDecimal = new BigDecimal(0);
             BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -243,7 +243,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             param.setDateId(monthId);
             screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
         }catch(Exception e){
-            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}",JSON.toJSONString(formDTO));
+            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
         }
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -1,9 +1,11 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -21,16 +23,13 @@ import com.epmet.service.project.ProjectService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -79,8 +78,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
 
         //2.查询出客户下网格的相关信息
         List<GridInfoDTO> gridList = customerGridService.queryGridInfoList(param.getCustomerId());
-        Map<String,GridInfoDTO> gridMap = new HashMap<>();
-        gridList.forEach(grid -> {gridMap.put(grid.getGridId(),grid);});
+        Map<String,GridInfoDTO> gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
 
         //3.查询出客户下用户的累计积分(累计值，没有时间概念，否则需要查询积分明细计算出评价周期末的得分)
         Map<String,Integer> pointMap = userPointService.getUserPointMap(param.getCustomerId());
@@ -91,16 +89,19 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
         }else{
             String dateType = DateUtils.identifyTimeDimension(dateId);
-            if(StringUtils.isEmpty(dateType) || !org.apache.commons.lang3.StringUtils.equalsAny(dateType,"date","month")){
+            if (StringUtils.isEmpty(dateType) || !StringUtils.equalsAny(dateType, "date", "month")) {
                 dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
-            }else if(org.apache.commons.lang3.StringUtils.equals(dateType,"date")){
-                dateId = dateId.substring(NumConstant.ZERO,dateId.length() - NumConstant.TWO);
+            } else if (StringUtils.equals(dateType, "date")) {
+                dateId = dateId.substring(NumConstant.ZERO, dateId.length() - NumConstant.TWO);
             }
         }
         final String finalDateId = dateId;
 
         Map<String, BigDecimal> scoreMap = cpcIndexCalculateService.getCpcScore(param.getCustomerId(),dateId);
 
+        //剔除垃圾数据
+        registeredUsers.removeIf(user -> null == gridMap.get(user.getGridId()));
+
         //5.整合数据
         if(!CollectionUtils.isEmpty(registeredUsers)){
             registeredUsers.forEach(user -> {
@@ -120,12 +121,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
 
                 user.setDataEndTime(finalDateId);
             });
-
         }
-
-        //6.存入数据库
-        //不按照时间删除，每次插入之前将该客户下的所有历史数据清空
-        screenPartyUserRankDataService.dataClean(registeredUsers,param.getCustomerId());
+        screenPartyUserRankDataService.dataClean(registeredUsers, param.getCustomerId());
     }
 
     /**
@@ -137,42 +134,51 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
      **/
     @Override
     public void difficultyDataHub(ScreenCentralZoneDataFormDTO param) {
-
-        //查询难点赌点中有无已结案的项目，若有则保留
-        List<String> existed = screenDifficultyDataService.selectExistedInfo(param.getCustomerId());
-
         //查询数据
-        List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId(),existed));
+        List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId()));
         if(CollectionUtils.isEmpty(difficulties)) return;
+
+        //2.查询出客户下网格的相关信息
+        List<GridInfoDTO> gridList = customerGridService.queryGridInfoList(param.getCustomerId());
+        Map<String,GridInfoDTO> gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
+
+        //剔除垃圾数据(本次需要更新的数据集)
+        //for(Iterator<ScreenDifficultyDataEntity> iter = difficulties.iterator(); iter.hasNext();){
+        //    ScreenDifficultyDataEntity pointer = iter.next();
+        //    if(null == gridMap.get(pointer.getOrgId())){
+        //        iter.remove();
+        //    }
+        //}
+       difficulties.removeIf( diff -> null == gridMap.get(diff.getOrgId()));
+
         List<String> projectIds = difficulties.stream().map(ScreenDifficultyDataEntity :: getEventId).distinct().collect(Collectors.toList());
         //最近一次操作
-        Map<String,String> latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
-        //标题
-        Map<String,String> titleMap = projectProcessService.getProjectTitle(projectIds,param.getCustomerId());
-        boolean isOperationNull = CollectionUtils.isEmpty(latestOperationMap) ? true : false;
-        boolean isTitleNull = CollectionUtils.isEmpty(titleMap) ? true : false;
+        Map<String, ProjectLatestOperationResultDTO> latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
         //图片
         List<ProjectSourceMapFormDTO> projectSourceMap = factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
 
         Map<String,List<ScreenDifficultyImgDataEntity>> imgMap =
                 topicService.getTopicImgs(projectSourceMap);
-        boolean isImgNull = CollectionUtils.isEmpty(imgMap) ? true : false;
+
         Map<String,String> contentMap = topicService.getTopicContent(projectSourceMap);
-        boolean isContentNull = CollectionUtils.isEmpty(contentMap) ? true : false;
+
         difficulties.forEach( diff -> {
-            if(!isImgNull) {
+            if(!CollectionUtils.isEmpty(imgMap)) {
                 List<ScreenDifficultyImgDataEntity> figureList = imgMap.get(diff.getEventId());
                 diff.setEventImgUrl(CollectionUtils.isEmpty(figureList) ? "" : figureList.get(NumConstant.ZERO).getEventImgUrl());
             }
-            if(!isContentNull) {
+            if(!CollectionUtils.isEmpty(contentMap)) {
                 diff.setEventContent(contentMap.get(diff.getEventId()));
             }
-            if(!isOperationNull){
-                diff.setLatestOperateDesc(latestOperationMap.get(diff.getEventId()));
-            }
-            if(!isTitleNull){
-                diff.setEventTitle(titleMap.get(diff.getEventId()));
+            if(! CollectionUtils.isEmpty(latestOperationMap)){
+                ProjectLatestOperationResultDTO oper = latestOperationMap.get(diff.getEventId());
+                if(null != oper){
+                    diff.setLatestOperateDesc(oper.getOperationName());
+                    diff.setEventTitle(oper.getTitle());
+                    diff.setEventCostTime(oper.getCostTime());
+                }
             }
+
             diff.setDataEndTime(DateUtils.getBeforeNDay(NumConstant.ONE));
         });
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java

@@ -51,4 +51,12 @@ public interface ScreenDifficultyDataService extends BaseService<ScreenDifficult
     */
     void dataClean(String customerId,List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs);
 
+    /**
+     * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+     * @author wangc
+     * @date 2020.11.17 09:31
+     */
+    List<ScreenDifficultyDataEntity> getAllDifficultyByCustomerId(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java

@@ -40,5 +40,4 @@ public interface ScreenPartyUserRankDataService extends BaseService<ScreenPartyU
      * @date 2020.09.27 09:44
     **/
     void dataClean(List<ScreenPartyUserRankDataEntity> dataList,String customerId);
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java

@@ -54,15 +54,30 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dataClean(String customerId, List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs) {
+        List<ScreenDifficultyDataEntity> orient = baseDao.selectAllDifficultyByCustomerId(customerId);
+        if(!CollectionUtils.isEmpty(orient)){
+            baseDao.deleteBatchDifficultyImg(orient.stream().map(ScreenDifficultyDataEntity::getEventId).distinct().collect(Collectors.toList()));
+        }
+        baseDao.deleteBatchDifficulty(customerId,null);
+
         if (!CollectionUtils.isEmpty(difficulties)) {
-            baseDao.deleteBatchDifficulty(customerId, difficulties.stream().map(ScreenDifficultyDataEntity::getEventId).distinct().collect(Collectors.toList()));
             baseDao.insertBatch(difficulties);
         }
         if (!CollectionUtils.isEmpty(imgs)) {
-            baseDao.deleteBatchDifficultyImg(imgs.stream().map(ScreenDifficultyImgDataEntity::getEventId).distinct().collect(Collectors.toList()));
             baseDao.insertBatchImg(imgs);
         }
-
         baseDao.updateTime(customerId, DateUtils.getBeforeNDay(NumConstant.ONE));
     }
+
+    /**
+     * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+     * @author wangc
+     * @date 2020.11.17 09:31
+     */
+    @Override
+    public List<ScreenDifficultyDataEntity> getAllDifficultyByCustomerId(String customerId) {
+        return baseDao.selectAllDifficultyByCustomerId(customerId);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -120,20 +120,9 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 获得项目最新操作
      * @param list
      * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
+     * @return
      * @author wangc
      * @date 2020.09.28 14:44
     */
-    Map<String,String> getLatestOperation(List<String> list, String customerId);
-
-    /**
-     * @Description 获取项目标题
-     * @param list
-     * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
-     * @author wangc
-     * @date 2020.10.27 14:34
-    */
-    Map<String,String> getProjectTitle(List<String>list ,String customerId);
-
+    Map<String,ProjectLatestOperationResultDTO> getLatestOperation(List<String> list, String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -104,10 +104,9 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @Description 得到超过阈值滞留的项目Id集合
      * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
      * @param customerId
-     * @param exclude
      * @return java.util.List<java.lang.String>
      * @author wangc
      * @date 2020.11.06 14:14
      */
-    List<String> getOvertimeProjectByParameter(String customerId,List<String> exclude);
+    Integer getOvertimeProjectByParameter(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -117,36 +117,17 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      * @Description 获得项目最新操作
      * @param list
      * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
+     * @return
      * @author wangc
      * @date 2020.09.28 14:44
      */
     @Override
-    public Map<String, String> getLatestOperation(List<String> list, String customerId) {
+    public Map<String, ProjectLatestOperationResultDTO> getLatestOperation(List<String> list, String customerId) {
         List<ProjectLatestOperationResultDTO> operations = baseDao.selectLatestOperation(list,customerId);
         if(CollectionUtils.isEmpty(operations)){
             return Collections.EMPTY_MAP;
         }else{
-            return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
+            return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,o->o,(a,n)-> a));
         }
     }
-
-    /**
-     * @Description 获取项目标题
-     * @param list
-     * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
-     * @author wangc
-     * @date 2020.10.27 14:34
-     */
-    @Override
-    public Map<String, String> getProjectTitle(List<String> list, String customerId) {
-        List<ProjectLatestOperationResultDTO> titles = baseDao.selectProjectTitle(list,customerId);
-        if(CollectionUtils.isEmpty(titles)){
-            return Collections.EMPTY_MAP;
-        }else{
-            return titles.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
-        }
-    }
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -86,16 +86,15 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @Description 得到超过阈值滞留的项目Id集合
 	 * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
 	 * @param customerId
-	 * @param exclude
 	 * @return java.util.List<java.lang.String>
 	 * @author wangc
 	 * @date 2020.11.06 14:14
 	 */
 	@Override
-	public List<String> getOvertimeProjectByParameter(String customerId, List<String> exclude) {
+	public Integer getOvertimeProjectByParameter(String customerId) {
 		String parameter = baseDao.selectParameterValueByKey(customerId);
 		if(StringUtils.isBlank(parameter)) parameter = baseDao.selectParameterValueByKey("default");
-		return baseDao.selectOvertimeProjectIds(customerId, exclude, StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter));
+		return StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter);
 	}
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml

@@ -38,6 +38,18 @@
         CUSTOMER_ID = #{customerId}
     </select>
 
+    <!-- 根据用户Id查询所有组原始数据 -->
+    <select id="selectAllGroupByCustomerId" resultType="com.epmet.dto.extract.FactOriginGroupMainDailyDTO">
+        SELECT
+            id,grid_id
+        FROM
+            fact_origin_group_main_daily
+        WHERE
+            del_flag = '0'
+        AND
+            customer_id = #{customerId}
+    </select>
+
     <delete id="deleteBatchByCustomerId" >
         DELETE FROM
         fact_origin_group_main_daily
@@ -64,6 +76,17 @@
         </if>
     </delete>
 
+    <!-- 删除指定组Id的成员 -->
+    <delete id="deleteMemberByGroupList">
+        DELETE FROM
+        fact_origin_group_member_daily
+        WHERE
+        CUSTOMER_ID = #{customerId}
+        <foreach collection="groups" item="groupId" open="AND (" separator=" OR "  close=" )" >
+            GROUP_ID = #{groupId}
+        </foreach>
+    </delete>
+
     <delete id="deleteBatchByGroupId" parameterType="java.util.List">
         DELETE FROM
         fact_origin_group_main_daily
@@ -74,6 +97,16 @@
         </foreach>
         </where>
     </delete>
+    
+    <delete id="deleteSpecifiedDateData">
+        DELETE FROM
+        fact_origin_group_main_daily
+        <where>
+        CUSTOMER_ID = #{customerId}
+        AND
+        DATE_ID =
+        </where>
+    </delete>
 
     <update id="updatePartyFlag" parameterType="java.util.List">
         UPDATE fact_origin_group_main_daily

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -331,7 +331,7 @@
         ( project.PROJECT_STATUS = 'pending', '处理中', '已结案' ) AS eventStatusDesc,
         IFNULL(relation.reOrg,0) AS eventReOrg,
         IFNULL(handleCount.HandledCount,0) AS eventHandledCount,
-        IFNULL(costTime.costTime,0) AS eventCostTime ,
+
         gridInfo.allParentIds
         FROM
         fact_origin_project_main_daily project
@@ -382,34 +382,36 @@
         GROUP BY
         PROJECT_ID
         ) handleCount ON project.ID = handleCount.PROJECT_ID
-        LEFT JOIN (
-        SELECT
-        main.ID AS PROJECT_ID,
-        TIMESTAMPDIFF(
-        MINUTE,
-        str_to_date( main.DATE_ID, '%Y%m%d' ),
-        IF
-        ( main.IS_RESOLVED = 'resolved', time.HANDLED_DATE, NOW( ) )
-        ) AS costTime
-        FROM
-        fact_origin_project_main_daily main
-        LEFT JOIN fact_origin_project_org_period_daily time ON main.ID = time.PROJECT_ID
-        AND time.DEL_FLAG = '0'
-        AND time.OPERATION = 'close'
-        WHERE
-        main.DEL_FLAG = '0'
-        AND main.CUSTOMER_ID = #{customerId}
-        GROUP BY
-        main.ID
-        ) costTime ON project.ID = costTime.PROJECT_ID
         WHERE
         project.DEL_FLAG = '0'
         AND project.CUSTOMER_ID = #{customerId}
-        <if test="null != list and list.size() != 0">
-            <foreach collection="list" item="projectId" open="AND " separator=" OR " >
-                project.ID = #{projectId}
-            </foreach>
-        </if>
+        AND project.ID IN (
+
+
+        SELECT DISTINCT
+            period.project_id
+        FROM
+            fact_origin_project_org_period_daily period
+        LEFT JOIN
+        (
+
+        SELECT
+
+        project.ID AS projectId,
+        IF(project.project_status = 'closed',period.handled_date,NOW()) AS finishDate
+
+        FROM fact_origin_project_main_daily project LEFT JOIN fact_origin_project_org_period_daily period
+        ON project.ID = period.project_id AND period.del_flag = '0' AND period.customer_id = #{customerId}
+         AND period.operation = 'close'
+        WHERE project.customer_id = #{customerId} AND project.del_flag = '0'
+        ) projectFinishDate ON projectFinishDate.projectId = period.project_id
+
+        WHERE
+            period.del_flag = '0'
+            AND period.customer_id = #{customerId}
+            AND TIMESTAMPDIFF( DAY, period.informed_date, projectFinishDate.finishDate) > #{thresholdValue}
+            )
+
     </select>
 
 <!-- 查询当天新立的项目，是为了增量新增难点赌点的图片库 -->

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml

@@ -219,4 +219,14 @@
         </foreach>
     </insert>
 
+    <select id="selectAllDifficultyByCustomerId" resultType="com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity">
+        SELECT
+            org_id,
+            event_id
+        FROM
+            screen_difficulty_data
+        WHERE
+            del_flag = '0'
+            AND customer_id = #{customerId}
+    </select>
 </mapper>

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

@@ -106,45 +106,4 @@
           and PARAMETER_KEY ='detention_days'
     </select>
 
-
-    <select id="selectOvertimeProjectIds" resultType="string">
-        SELECT
-        DISTINCT
-            project.ID
-        FROM
-            project project
-        WHERE
-            project.del_flag = '0'
-            AND project.customer_id = #{customerId}
-            <if test="null != exclude and exclude.size() > 0">
-                <foreach collection="exclude" item="id" open="AND ( " separator=" OR " close=" ) ">
-                    project.ID <![CDATA[ <> ]]> #{id}
-                </foreach>
-            </if>
-            AND EXISTS (
-        SELECT
-            stff.ID
-        FROM
-            project_staff stff
-            LEFT JOIN project_org_relation period ON stff.ID = period.PROJECT_STAFF_ID
-            AND period.DEL_FLAG = '0'
-        WHERE
-            stff.DEL_FLAG = '0'
-          	AND stff.CUSTOMER_ID = #{customerId}
-	        AND project.ID = stff.PROJECT_ID
-            AND ABS(
-            TIMESTAMPDIFF(
-            DAY,
-            period.INFORMED_DATE,
-        IF
-            (
-            period.HANDLED_DATE IS NULL,
-        IF
-            ( project.`STATUS` = 'closed', project.UPDATED_TIME, NOW( ) ),
-            period.HANDLED_DATE
-            )
-            )
-            ) > #{value}
-            )
-    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -268,9 +268,11 @@
     <select id="selectLatestOperation" resultType="com.epmet.dto.project.result.ProjectLatestOperationResultDTO">
         SELECT
             process.PROJECT_ID,
-            process.OPERATION_NAME
+            process.OPERATION_NAME,
+            project.TITLE,
+        CASE WHEN project.status = 'pending'	THEN TIMESTAMPDIFF(MINUTE,project.created_time,NOW())  ELSE TIMESTAMPDIFF(MINUTE,project.created_time,project.UPDATED_TIME)   END AS costTime
             FROM
-            project_process process
+            project_process process LEFT JOIN project ON process.PROJECT_ID = project.ID AND project.DEL_FLAG = '0'
             WHERE
             process.DEL_FLAG = '0'
             AND process.CUSTOMER_ID = #{customerId}
@@ -307,20 +309,4 @@
         </if>
     </select>
 
-    <!-- 查找项目标题 -->
-    <select id="selectProjectTitle" resultType="com.epmet.dto.project.result.ProjectLatestOperationResultDTO">
-        SELECT
-        ID AS projectId,
-        TITLE AS operationName
-        FROM
-        project
-        WHERE
-        DEL_FLAG = '0'
-        AND CUSTOMER_ID = #{customerId}
-        <if test="null != list and list.size() > 0">
-            <foreach collection="list" item="projectId" open="AND (" separator=" OR " close=" )">
-                ID = #{projectId}
-            </foreach>
-        </if>
-    </select>
 </mapper>

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -130,6 +130,13 @@
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
                 <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
                 <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -169,6 +176,13 @@
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
                 <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
                 <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -206,6 +220,13 @@
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
                 <elink.mq.appId>20200804181646184507453a2e9aab76edc550405f80920af</elink.mq.appId>
                 <elink.mq.token>96d788191a10ff57a125157183413004</elink.mq.token>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -240,6 +261,13 @@
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
                 <elink.mq.appId>202008141820598348026098a1b5dd0bc63a1e2418e275d1b</elink.mq.appId>
                 <elink.mq.token>7ce17f65826539ff3e8616dccd4b70fc</elink.mq.token>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -125,4 +125,9 @@ elink:
     appId: @elink.mq.appId@ #项目接入亿联云的应用Id
     token: @elink.mq.token@ #项目接入亿联云的应用token 相当于secret
     host: @elink.mq.host@ #亿联云消息网关服务地址
-    sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
+    sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/common-service"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -197,6 +197,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -229,6 +236,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -261,6 +275,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
 
@@ -294,6 +315,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -97,4 +97,9 @@ ribbon:
 
 pagehelper:
   helper-dialect: mysql
-  reasonable: false
+  reasonable: false
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/ext"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -98,10 +98,14 @@ feign:
   client:
     config:
       default:
-        loggerLevel: BASIC
+        loggerLevel: FULL
   httpclient:
     enabled: true
 
+logging:
+  level:
+    com.epmet: debug
+
 hystrix:
   command:
     default:

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

@@ -171,6 +171,13 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -209,6 +216,12 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -247,6 +260,12 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -282,6 +301,12 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -126,4 +126,9 @@ thread:
     corePoolSize: @thread.pool.core-pool-size@
     maxPoolSize: @thread.pool.max-pool-size@
     queueCapacity: @thread.pool.queue-capacity@
-    keepAlive: @thread.pool.keep-alive@
+    keepAlive: @thread.pool.keep-alive@
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/message"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -149,6 +149,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -181,6 +188,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -213,6 +226,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -242,6 +261,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -128,4 +128,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/oss"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -208,6 +208,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -240,6 +247,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -272,6 +285,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
 
@@ -305,6 +324,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -133,4 +133,9 @@ third:
       - https://epmet-ext7.elinkservice.cn
       - https://epmet-ext8.elinkservice.cn
       - https://epmet-ext9.elinkservice.cn
-      - https://epmet-ext10.elinkservice.cn
+      - https://epmet-ext10.elinkservice.cn
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/third"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -118,6 +118,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -144,6 +150,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -170,6 +182,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -196,6 +214,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@@ -74,4 +74,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-grid"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -73,6 +74,7 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     /**
      * 议题创建时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
 
     /**

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

@@ -146,7 +146,7 @@
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
-                <!--测试钉钉 机器人地址-->
+                <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
             </properties>
@@ -183,7 +183,7 @@
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
 
-                <!--测试钉钉 机器人地址-->
+                <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
             </properties>
@@ -253,6 +253,13 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -114,4 +114,10 @@ openapi:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
+

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-issue"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -136,6 +136,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -160,6 +166,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -184,6 +196,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -205,6 +223,13 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml

@@ -94,3 +94,8 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -150,6 +150,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -182,6 +188,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -215,6 +227,12 @@
 
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -244,6 +262,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -130,4 +130,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-org"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -157,6 +157,13 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -190,6 +197,12 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -223,6 +236,12 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -253,6 +272,13 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -114,4 +114,9 @@ openapi:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-project"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -132,6 +132,12 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -165,6 +171,12 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -198,6 +210,12 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -228,6 +246,13 @@
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -114,4 +114,9 @@ openapi:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gov-voice"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-module/oper-access/oper-access-server/pom.xml

@@ -119,6 +119,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -151,6 +157,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -183,6 +195,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -212,6 +230,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -117,4 +117,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/oper-access"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -140,6 +140,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -172,6 +178,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -204,6 +216,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -236,6 +254,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 //@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class,url="localhost:8089")
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
 public interface OperCustomizeFeignClient {
 
     /**

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -123,4 +123,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/oper-crm"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -123,6 +123,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -155,6 +161,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -187,6 +199,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -216,6 +234,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -117,4 +117,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/oper-customize"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -148,6 +148,13 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -181,6 +188,13 @@
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -213,6 +227,13 @@
                 <nacos.ip/>
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -242,6 +263,13 @@
                 <nacos.ip/>
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

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

@@ -18,7 +18,6 @@
 package com.epmet.modules.topic.service.impl;
 
 
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -76,9 +75,9 @@ import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
-import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
@@ -1311,48 +1310,49 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             issueInfo.setOrgIdPath(dataFilterResult.getData().getOrgIdPath());
             issueInfo.setOrgName(dataFilterResult.getData().getOrgName());
             //3.获取小组名称、话题作者、议题发起人
-            ResiGroupMemberInfoRedisDTO topicAuthor =  resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId());
+            ResiGroupMemberInfoRedisDTO topicAuthor = resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId());
             issueInfo.setTopicAuthor(null == topicAuthor ? ModuleConstant.EMPTY_STR : topicAuthor.getUserShowName());
-            ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(),topicTurnIssueFromDTO.getUserId());
+            ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(), topicTurnIssueFromDTO.getUserId());
             issueInfo.setIssueAuthor(null == issueAuthor ? ModuleConstant.EMPTY_STR : issueAuthor.getUserShowName());
             ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(group.getGroupId());
             issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName());
             issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
             //4.调用gov-issue新增议题
             Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
+            if (issueResult == null || !issueResult.success() || StringUtils.isBlank(issueResult.getData())) {
+                throw new RenException(ModuleConstant.CREATE_ISSUE_ERROR);
+            }
             //5.修改话题shiftIssue字段
-            if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
-                ResiTopicEntity topic2Upd = new ResiTopicEntity();
-                topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
-                topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
-                topic2Upd.setShiftIssue(Boolean.TRUE);
-                topic2Upd.setIssueId(issueResult.getData());
-                topic2Upd.setUpdatedTime(now);
-                int topicResult = baseDao.updateOne(topic2Upd);
-                //6.新增话题操作记录
-                if(topicResult == NumConstant.ONE) {
-                    ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
-                    operation.setCreatedTime(now);
-                    operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
-                    operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
-                    operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
-                    int operationResult = resiTopicOperationDao.insertOneByParams(operation);
-                    if(operationResult != NumConstant.ONE){
-                        logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
-                    }
-                }
-                //7.更新组统计信息 议题数量+1
-                resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
-                if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
-                    groupCache.getGroupStatisticalInfo().setTotalIssues(
-                            null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
-                                    : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
-                    );
-                    resiGroupRedis.set(groupCache);
-                }
-                logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
 
+            ResiTopicEntity topic2Upd = new ResiTopicEntity();
+            topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
+            topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
+            topic2Upd.setShiftIssue(Boolean.TRUE);
+            topic2Upd.setIssueId(issueResult.getData());
+            topic2Upd.setUpdatedTime(now);
+            int topicResult = baseDao.updateOne(topic2Upd);
+            //6.新增话题操作记录
+            if (topicResult == NumConstant.ONE) {
+                ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
+                operation.setCreatedTime(now);
+                operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
+                operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+                operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+                int operationResult = resiTopicOperationDao.insertOneByParams(operation);
+                if (operationResult != NumConstant.ONE) {
+                    logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
+                }
+            }
+            //7.更新组统计信息 议题数量+1
+            resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
+            if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
+                groupCache.getGroupStatisticalInfo().setTotalIssues(
+                        null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
+                                : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
+                );
+                resiGroupRedis.set(groupCache);
             }
+            logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
         }
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -327,5 +327,7 @@ public interface ModuleConstant extends Constant {
 
 	String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
 
-	String CLOSED_TOPIC_REASON_PREFIX="话题已关闭：";
+	String CLOSED_TOPIC_REASON_PREFIX = "话题已关闭：";
+
+	String CREATE_ISSUE_ERROR = "创建议题失败";
 }

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -125,4 +125,9 @@ openapi:
       url: @openapi.scan.server.url@
     method:
       imgSyncScan: /imgSyncScan
-      textSyncScan: /textSyncScan
+      textSyncScan: /textSyncScan
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/resi-group"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -140,6 +140,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -172,6 +178,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -204,6 +216,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -233,6 +251,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@@ -118,4 +118,9 @@ ribbon:
 #pageHelper分页插件
 pagehelper:
   helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/resi-guide"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -98,6 +98,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -124,6 +130,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -150,6 +162,12 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -173,6 +191,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@@ -70,3 +70,8 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/resi-hall"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -116,6 +116,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -140,6 +146,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -164,6 +176,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -185,6 +203,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml

@@ -69,3 +69,8 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/resi-home"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -145,6 +145,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -168,6 +174,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -191,6 +203,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -211,6 +229,12 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml

@@ -97,3 +97,8 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

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

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/resi-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -125,11 +127,14 @@
             <!--日志文档保留天数-->
             <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

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

@@ -146,6 +146,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -178,6 +185,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -210,6 +224,13 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+                <!--测试钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+                </dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -239,6 +260,14 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+
+
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>
+                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+                </dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+                </dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>