修复了1个bug，增加了文件发送成功的提醒

dingtalk_auto/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>dingtalk_auto</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
 
     <packaging>jar</packaging>
 

dingtalk_auto/src/main/java/com/nokia/dingtalk_auto/service/TslTaskService.java

@@ -2,9 +2,11 @@ package com.nokia.dingtalk_auto.service;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import javax.annotation.Resource;
 
@@ -76,17 +78,68 @@ public class TslTaskService {
     }
 
     public void sendDingTalkMsg(String day) throws DingTalkApiException {
+        DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
         String localPath = localDir + "/" + day;
         File[] files = new File(localPath).listFiles();
+        StringBuffer stringBuffer = new StringBuffer();
+        // 分开发送，保证发送文件的顺序
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-1-投诉率.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-2-重复投诉率.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-3-超时工单.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-4-处理时长.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-5-满意率.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
         for (File file : files) {
-            if (file.getName().toLowerCase().endsWith(".png")) {
+            if (file.getName().toLowerCase().endsWith("-6-解决率.png")) {
                 String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
                 tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
-            } else if (file.getName().toLowerCase().equals("投诉清单各地市投诉率" + day + ".xlsx")) {
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().endsWith("-7-响应率.png")) {
+                String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "image");
+                tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
+            }
+        }
+        for (File file : files) {
+            if (file.getName().toLowerCase().equals("投诉清单各地市投诉率" + day + ".xlsx")) {
                 String mediaId = tslTaskDingTalkUtil.upload(file.getAbsolutePath(), "file");
                 tslTaskDingTalkUtil.sendFileMsgWithRobot(mediaId, file.getName());
+                stringBuffer.append(dateFormat.format(new Date())).append(file.getName()).append("发送成功==");
             }
         }
+        remindDingTalkUtil.sendTextMsgWithRobot(stringBuffer.toString());
     }
 
     /**

dingtalk_auto/src/test/java/com/nokia/dingtalk_auto/DingTalkAutoTest.java

@@ -0,0 +1,22 @@
+package com.nokia.dingtalk_auto;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.common.dingtalk.DingTalkUtil;
+import com.nokia.common.dingtalk.exception.DingTalkApiException;
+
+@SpringBootTest
+public class DingTalkAutoTest {
+
+    @Autowired
+    private DingTalkUtil tslTaskDingTalkUtil;
+
+    @Test
+    void test() throws DingTalkApiException {
+        String mediaId = tslTaskDingTalkUtil.upload("D:/src/20230505-7-响应率.png", "image");
+        tslTaskDingTalkUtil.sendImageMsgWithRobot(mediaId);
+    }
+
+}

dingtalk_auto/src/test/java/com/nokia/dingtalk_auto/service/task/TslTaskServiceTest.java

@@ -1,20 +0,0 @@
-package com.nokia.dingtalk_auto.service.task;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import com.nokia.common.dingtalk.exception.DingTalkApiException;
-import com.nokia.dingtalk_auto.service.TslTaskService;
-
-@SpringBootTest
-public class TslTaskServiceTest {
-    @Autowired
-    private TslTaskService tslTaskService;
-
-    @Test
-    void test() throws Exception, DingTalkApiException {
-        tslTaskService.runTask("20230502");
-        // tslTaskService.download("20230502");
-    }
-
-}

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

@@ -2,7 +2,7 @@
 
 nohup java -jar tsl_data-1.1-exec.jar >output.log 2>&1 &
 
-nohup java -jar dingtalk_auto-1.0-exec.jar >output.log 2>&1 &
+nohup java -jar dingtalk_auto-1.1-exec.jar >output.log 2>&1 &
 
 ## 数据手动入库
 

tsl_data/src/test/java/com/nokia/tsl_data/TslDataApplicationTest.java

@@ -1,10 +1,14 @@
 package com.nokia.tsl_data;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import com.nokia.tsl_data.dao.TslDao;
 import com.nokia.tsl_data.service.TslTaskService;
 
 @SpringBootTest
@@ -18,4 +22,13 @@ public class TslDataApplicationTest {
         taskService.reportGenerateTask("20230502");
         taskService.screenShotTask("20230502");
     }
+
+    @Autowired
+    private TslDao tslDao;
+
+    @Test
+    void test1() {
+        List<Map<String, Object>> selectUserCountForMonth = tslDao.selectUserCountForMonth("202305");
+        System.out.println(selectUserCountForMonth);
+    }
 }