瀏覽代碼

tsl_data v1.2 自动任务添加了数据源检查与等待机制

lifuquan 2 年之前
父節點
當前提交
1e0d8ac542

二進制
doc/开发文档/样本数据/输入/数据表头说明.xlsx


+ 4 - 0
doc/开发文档/部署环境接口测试.md

@@ -4,6 +4,10 @@ nohup java -jar tsl_data-1.2-exec.jar >output.log 2>&1 &
 
 nohup java -jar dingtalk_auto-1.1-exec.jar >output.log 2>&1 &
 
+数据源提醒机器人<https://oapi.dingtalk.com/robot/send?access_token=c517badfc292fd487d0581cdd77f5757f239a4a2116db9ad62fe5bacc49023dc>
+
+关键字: `经查:`
+
 ## 数据手动入库
 
 ```http

+ 10 - 2
tsl_data/src/main/java/com/nokia/common/message/pushmessage/PushMessageUtil.java

@@ -17,6 +17,10 @@ import lombok.Builder;
 
 /**
  * 使用RestTemplate调用能力商店钉钉消息推送服务API接口
+ * 
+ * 此接口实际调用webhook接口的机器人实现
+ * 
+ * markdown方式使用<font color='red'>内容</font>方式修改字体颜色,在pc端钉钉可生效,在安卓端钉钉上不生效。
  */
 @Builder
 public class PushMessageUtil {
@@ -32,8 +36,10 @@ public class PushMessageUtil {
     private String moduleId;
     // 业务编码
     private String busiCode;
-    // 钉钉群机器人accessToken
+    // 钉钉群机器人accessToken,通过添加webhook的机器人可以查询到,也可使用已添加的机器人
     private String accessToken;
+    // 钉钉机器人前缀
+    private String prefix;
     private RestTemplate restTemplate;
     @Builder.Default
     private DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
@@ -81,6 +87,7 @@ public class PushMessageUtil {
         map.put("DATA", data);
         Map<String, Object> text = new HashMap<>();
         data.put("TEXT", text);
+        messge = messge.startsWith(prefix) ? messge : prefix + messge;
         text.put("CONTENT", messge);
         if (atList != null) {
             data.put("AT_LIST", atList);
@@ -146,7 +153,8 @@ public class PushMessageUtil {
         map.put("DATA", data);
         Map<String, Object> markdown = new HashMap<>();
         data.put("MARK_DOWN", markdown);
-        title = title == null || "".equals(title) ? "markdown消息" : title;
+        title = title == null || "".equals(title) ? prefix : title;
+        title = title.startsWith(prefix) ? title : prefix + title;
         markdown.put("TITLE", title);
         markdown.put("TEXT", messge);
         if (atList != null) {

+ 7 - 3
tsl_data/src/main/java/com/nokia/tsl_data/config/PushMessageUtilConfig.java

@@ -21,9 +21,11 @@ public class PushMessageUtilConfig {
     private String moduleId = "20000156";
     // 业务编码
     private String busiCode = "30000111";
-    // 钉钉群机器人accessToken
-    // https://oapi.dingtalk.com/robot/send?access_token=b2f1424d6119affaacab614b184f043fcd2c73db2651bb86eff29992d66820bf
-    private String accessToken = "b2f1424d6119affaacab614b184f043fcd2c73db2651bb86eff29992d66820bf";
+
+    // 数据源提醒机器人<https://oapi.dingtalk.com/robot/send?access_token=c517badfc292fd487d0581cdd77f5757f239a4a2116db9ad62fe5bacc49023dc>
+    // 关键字: `经查:`
+    private String accessToken = "c517badfc292fd487d0581cdd77f5757f239a4a2116db9ad62fe5bacc49023dc";
+    private String prefix = "经查:";
 
     @Bean
     public PushMessageUtil pushMessageUtil(RestTemplate restTemplate) {
@@ -35,7 +37,9 @@ public class PushMessageUtilConfig {
                 .moduleId(moduleId)
                 .busiCode(busiCode)
                 .accessToken(accessToken)
+                .prefix(prefix)
                 .restTemplate(restTemplate)
                 .build();
     }
+
 }

+ 2 - 2
tsl_data/src/main/java/com/nokia/tsl_data/service/TslWaraHouseService.java

@@ -60,10 +60,10 @@ public class TslWaraHouseService {
         File file2 = new File(filePath2);
         StringBuffer stringBuffer = new StringBuffer();
         if (!file1.exists()) {
-            stringBuffer.append("河北_CEM移网质量投诉明细_HE_D_MOBILE_COMP 表账期 ").append(day).append(" 缺失。");
+            stringBuffer.append("河北_CEM移网质量投诉明细_HE_D_MOBILE_COMP 表账期 ").append(day).append(" 数据未及时到达。");
         }
         if (!file2.exists()) {
-            stringBuffer.append("河北_CEM高品质2日统计_HE_D_HIGH_QUALITY 表账期 ").append(day).append(" 缺失。");
+            stringBuffer.append("河北_CEM高品质2日统计_HE_D_HIGH_QUALITY 表账期 ").append(day).append(" 数据未及时到达。");
         }
         if (stringBuffer.length() == 0) {
             stringBuffer.append("账期").append(day).append("数据源正常。");