tsl-data 2.0上线版本

doc/开发文档.md

@@ -1,17 +0,0 @@
-# 开发文档
-
-## 需要确认的问题
-
-1. 数据缺失时有无默认处理方式
-
-2. 客户端-战略考核（地市级别） 每日数据 当前是从CEM的高品质统计中的统计值
-
-## 任务编排
-
-1. 数据入库及数据同步
-   - HighQualityCount 数据入库 每日1次 建议1点45分以后执行
-   - HighQualityList 数据入库  每日1次 建议1点45分以后执行
-   - MobileComplaint 数据入库  每日1次 建议1点45分以后执行
-   - 工单流转数据同步
- 
-2. 

doc/任务注册和调度.http → doc/开发环境/任务注册和调度-开发环境.http

@@ -69,7 +69,7 @@ Content-Type: application/json
   "description": "清理临时表"
 }
 
-### 任务注册-清理临时表
+### 任务注册-从工单系统更新数据
 POST http://127.0.0.1:22222/common/scheduling/task/registered/add
 Content-Type: application/json
 

doc/开发环境/数据入库-开发环境.http

@@ -0,0 +1,5 @@
+### 入库 high_quality_count 数据
+POST http://127.0.0.1:22222/tsl_data/source/warehouse/high_quality_count
+Content-Type: application/json
+
+20231127

doc/部署环境/任务注册-部署环境.http

@@ -0,0 +1,47 @@
+### 任务注册-查询列表
+POST http://192.168.10.7:22222/common/scheduling/task/registered/list/all
+Content-Type: application/json
+
+### 任务注册-清理临时表
+POST http://192.168.10.7:22222/common/scheduling/task/registered/add
+Content-Type: application/json
+
+{
+  "beanName": "taskService",
+  "methodName": "tempTableCleanCronTask",
+  "withParameter": false,
+  "description": "清理临时表"
+}
+
+### 任务注册-从工单系统更新数据
+POST http://192.168.10.7:22222/common/scheduling/task/registered/add
+Content-Type: application/json
+
+{
+  "beanName": "taskService",
+  "methodName": "updateWorkFlowBasicDataTask",
+  "withParameter": false,
+  "description": "从工单系统更新数据"
+}
+
+### 任务注册- 入库-生成报表-截图 单次任务
+POST http://192.168.10.7:22222/common/scheduling/task/registered/add
+Content-Type: application/json
+
+{
+  "beanName": "taskService",
+  "methodName": "wareHouseTask",
+  "withParameter": true,
+  "description": "入库-生成报表-截图"
+}
+
+### 任务注册- 入库-生成报表-截图 定时任务
+POST http://192.168.10.7:22222/common/scheduling/task/registered/add
+Content-Type: application/json
+
+{
+  "beanName": "taskService",
+  "methodName": "dailyWarehouseTask",
+  "withParameter": false,
+  "description": "入库-生成报表-截图 定时任务"
+}

doc/部署环境/任务调度-部署环境.http

@@ -0,0 +1,56 @@
+### 任务调度==查询全部
+POST http://192.168.10.7:22222/common/scheduling/task/scheduled/list/all
+Content-Type: application/json
+
+### 任务调度==查询正在调度的任务
+POST http://192.168.10.7:22222/common/scheduling/task/scheduled/list/scheduled
+Content-Type: application/json
+
+### 任务调度-每天定时出报表
+POST http://192.168.10.7:22222/common/scheduling/task/scheduled/update
+Content-Type: application/json
+
+{
+  "id": 211895896529571840,
+  "registeredTask": {
+    "id": 211894517467582464
+  },
+  "status": "ON",
+  "scheduledType": "CRON",
+  "scheduledParameter": {
+    "cronExpression": "0 00 15 * * *"
+  },
+  "description": "每天定时出报表"
+}
+
+### 任务调度-每天定时清理临时表
+POST http://192.168.10.7:22222/common/scheduling/task/scheduled/add
+Content-Type: application/json
+
+{
+  "registeredTask": {
+    "id": 211895428466216960
+  },
+  "status": "ON",
+  "scheduledType": "CRON",
+  "scheduledParameter": {
+    "cronExpression": "0 20 1 * * *"
+  },
+  "description": "每天定时清理临时表"
+}
+
+### 任务调度-每小时从工单系统更新数据
+POST http://192.168.10.7:22222/common/scheduling/task/scheduled/add
+Content-Type: application/json
+
+{
+  "registeredTask": {
+    "id": 211894454016151552
+  },
+  "status": "ON",
+  "scheduledType": "CRON",
+  "scheduledParameter": {
+    "cronExpression": "0 5 * * * *"
+  },
+  "description": "每小时从工单系统更新数据"
+}

doc/接口测试.http → doc/部署环境/数据入库-部署环境.http

@@ -1,18 +1,8 @@
-### 实验
-POST http://127.0.0.1:22222/tsl_data/close
-Content-Type: application/json
-
-### 列出已调度的任务
-POST http://127.0.0.1:22222/tsl_data/scheduling/task/list
-Content-Type: application/json
-
-###
-
 ### 入库 mobile_complaint 数据
-POST http://192.168.10.7:22222/tsl_data/warehouse/mobile_complaint
+POST http://192.168.10.7:22222/tsl_data/source/warehouse/mobile_complaint
 Content-Type: application/json
 
-20231126
+20231128
 
 ### 删除 mobile_complaint 数据
 POST http://192.168.10.7:22222/tsl_data/delete/mobile_complaint
@@ -21,10 +11,10 @@ Content-Type: application/json
 20231028
 
 ### 入库 high_quality_count 数据
-POST http://192.168.10.7:22222/tsl_data/warehouse/high_quality_count
+POST http://192.168.10.7:22222/tsl_data/source/warehouse/high_quality_count
 Content-Type: application/json
 
-20231126
+20231128
 
 ### 删除 high_quality_count 数据
 POST http://192.168.10.7:22222/tsl_data/delete/high_quality_count
@@ -33,10 +23,10 @@ Content-Type: application/json
 20231105
 
 ### 入库 high_quality_list 数据
-POST http://192.168.10.7:22222/tsl_data/warehouse/high_quality_list
+POST http://192.168.10.7:22222/tsl_data/source/warehouse/high_quality_list
 Content-Type: application/json
 
-20231126
+20231128
 
 ### 删除 high_quality_list 数据
 POST http://192.168.10.7:22222/tsl_data/delete/high_quality_list

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>tsl-data</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0</version>
 
     <packaging>jar</packaging>
 

src/main/java/com/nokia/tsl_data/controller/DemoController.java

@@ -1,18 +0,0 @@
-package com.nokia.tsl_data.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@RestController
-@RequestMapping("/demo")
-public class DemoController {
-
-    private final Map<String, Runnable> map = new ConcurrentHashMap<>();
-
-
-}

src/main/java/com/nokia/tsl_data/service/TaskService.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 /**
@@ -50,7 +51,8 @@ public class TaskService {
      * 每日定时任务
      */
     public void dailyWarehouseTask() {
-        String day = InstantUtil.ofPattern("yyyyMMdd").format(Instant.now());
+        // 这里的时间要向前一天
+        String day = InstantUtil.ofPattern("yyyyMMdd").format(Instant.now().plus(-1L, ChronoUnit.DAYS));
         // 调度一次 taskService.wareHouseTask(day)
         ScheduledTask task = new ScheduledTask()
                 .setRegisteredTask(schedulingService.findRegisteredTaskByBeanNameAndMethodName(

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

@@ -1,5 +1,6 @@
 package com.nokia.tsl_data;
 
+import com.nokia.common.basic.InstantUtil;
 import com.nokia.common.scheduling.service.DemoService;
 import com.nokia.tsl_data.service.TslReportService;
 import com.nokia.tsl_data.service.UserCountService;
@@ -11,6 +12,8 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 
 @SpringBootTest
 class TslDataApplicationTest {
@@ -60,6 +63,6 @@ class TslDataApplicationTest {
 
     @Test
     void test3() {
-        demoService.test1();
+        System.out.println(InstantUtil.ofPattern("yyyyMMdd").format(Instant.now().plus(-1L, ChronoUnit.DAYS)));
     }
 }