采集调度器新表

collector-scheduling-management/pom.xml

@@ -18,7 +18,17 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.30</version>
+        </dependency>
 
+        <dependency>
+            <groupId>cn.smallbun.screw</groupId>
+            <artifactId>screw-core</artifactId>
+            <version>1.0.3</version>
+        </dependency>
     </dependencies>
 
     <build>

collector-scheduling-management/src/main/java/com/docus/server/DeConfig.java

@@ -0,0 +1,17 @@
+package com.docus.server;
+
+import com.docus.infrastructure.WebConfig;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+
+@Configuration
+public class DeConfig extends WebConfig {
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        super.addResourceHandlers(registry);
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+
+}

collector-scheduling-management/src/main/java/com/docus/server/SwaggerConfig.java

@@ -0,0 +1,13 @@
+package com.docus.server;
+
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@Configuration
+public class SwaggerConfig {
+
+
+
+
+}

collector-scheduling-management/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
       datasource:
         #公司病案的文件服务数据库
         master:
-          url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+          url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: docus
           password: docus702
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy

collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java

@@ -0,0 +1,79 @@
+package com.docus.server;
+
+import cn.smallbun.screw.core.Configuration;
+import cn.smallbun.screw.core.engine.EngineConfig;
+import cn.smallbun.screw.core.engine.EngineFileType;
+import cn.smallbun.screw.core.engine.EngineTemplateType;
+import cn.smallbun.screw.core.execute.DocumentationExecute;
+import cn.smallbun.screw.core.process.ProcessConfig;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+
+@SpringBootTest
+class ScrewTests {
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Test
+    void test() {
+
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver");
+        hikariConfig.setJdbcUrl("jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai");
+        hikariConfig.setUsername("docus");
+        hikariConfig.setPassword("docus702");
+        //设置可以获取tables remarks信息
+        hikariConfig.addDataSourceProperty("useInformationSchema", "true");
+        hikariConfig.setMinimumIdle(2);
+        hikariConfig.setMaximumPoolSize(5);
+        DataSource dataSource = new HikariDataSource(hikariConfig);
+
+        //生成文件配置
+        EngineConfig engineConfig = EngineConfig
+            .builder()
+            //文件生成路径
+            .fileOutputDir("h:\\file")
+            //打开目录
+            .openOutputDir(false)
+            //文件类型
+            .fileType(EngineFileType.WORD)
+            //生成模板实现
+            .produceType(EngineTemplateType.freemarker)
+            .build();
+        //配置想要生成的表
+        ProcessConfig processConfig = ProcessConfig
+            .builder()
+            //根据名称指定表生成
+            .designatedTableName(new ArrayList<>())
+            //根据表前缀生成
+            .designatedTablePrefix(new ArrayList<>())
+            //根据表后缀生成
+            .designatedTableSuffix(new ArrayList<>())
+            //忽略表名
+            .ignoreTableName(new ArrayList<>())
+            //忽略表前缀
+            .ignoreTablePrefix(new ArrayList<>())
+            //忽略表后缀
+            .ignoreTableSuffix(new ArrayList<>())
+            .build();
+        //生成文档配置
+        Configuration configuration = Configuration.builder()
+            .version("1.0.0")
+            .description("描述")
+            .dataSource(dataSource)
+            .engineConfig(engineConfig)
+            .produceConfig(processConfig)
+            .build();
+
+        //生成
+        new DocumentationExecute(configuration).execute();
+    }
+}

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器管理（终端）任务管理接口", tags = "采集器管理（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorApi")
-@RequestMapping("/taskCollector")
+@RequestMapping("/sch/taskCollector")
 public interface TaskCollectorApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器版本列表管理（终端）任务管理接口", tags = "采集器版本列表管理（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionApi")
-@RequestMapping("/taskCollectorVersion")
+@RequestMapping("/sch/taskCollectorVersion")
 public interface TaskCollectorVersionApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionFileApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器版本列表更新包管理（终端）任务管理接口", tags = "采集器版本列表更新包管理（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionFileApi")
-@RequestMapping("/taskCollectorVersionFile")
+@RequestMapping("/sch/taskCollectorVersionFile")
 public interface TaskCollectorVersionFileApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionLogApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器版本更新日志管理（终端）任务管理接口", tags = "采集器版本更新日志管理（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionLogApi")
-@RequestMapping("/taskCollectorVersionLog")
+@RequestMapping("/sch/taskCollectorVersionLog")
 public interface TaskCollectorVersionLogApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskOperationLogApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器版本更新日志管理（终端）任务管理接口", tags = "采集器版本更新日志管理（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskOperationLogApi")
-@RequestMapping("/taskOperationLog")
+@RequestMapping("/sch/taskOperationLog")
 public interface TaskOperationLogApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskSystemParamsApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器（终端）系统参数表任务管理接口", tags = "采集器（终端）系统参数表任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskSystemParamsApi")
-@RequestMapping("/taskSystemParams")
+@RequestMapping("/sch/taskSystemParams")
 public interface TaskSystemParamsApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "执行管理器（采集器终端）任务管理接口", tags = "执行管理器（采集器终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorApi")
-@RequestMapping("/taskTerminator")
+@RequestMapping("/sch/taskTerminator")
 public interface TaskTerminatorApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集记录表（终端）任务管理接口", tags = "采集记录表（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorCollectApi")
-@RequestMapping("/taskTerminatorCollect")
+@RequestMapping("/sch/taskTerminatorCollect")
 public interface TaskTerminatorCollectApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectRetryLogApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集记录表重试表（终端）任务管理接口", tags = "采集记录表重试表（终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorCollectRetryLogApi")
-@RequestMapping("/taskTerminatorCollectRetryLog")
+@RequestMapping("/sch/taskTerminatorCollectRetryLog")
 public interface TaskTerminatorCollectRetryLogApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "采集器异常日志（采集器终端）任务管理接口", tags = "采集器异常日志（采集器终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorErrorLogApi")
-@RequestMapping("/taskTerminatorErrorLog")
+@RequestMapping("/sch/taskTerminatorErrorLog")
 public interface TaskTerminatorErrorLogApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorVirtualLogApi.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Api(value = "虚拟机使用情况（采集器终端）任务管理接口", tags = "虚拟机使用情况（采集器终端）任务管理接口")
 @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorVirtualLogApi")
-@RequestMapping("/taskTerminatorVirtualLog")
+@RequestMapping("/sch/taskTerminatorVirtualLog")
 public interface TaskTerminatorVirtualLogApi {
 
     /**

docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskOperationLog.java

@@ -15,7 +15,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 采集器版本更新日志管理（终端）
+ * 采集调度器操作日志表
  * </p>
  *
  * @author AutoGenerator