集成flyway

km-admin/pom.xml

@@ -36,11 +36,21 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-
+        <!-- flyway 数据库脚本管理 -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <version>9.16.3</version>
+        </dependency>
         <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver18</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.mengweijin</groupId>
+            <artifactId>db-migration-dm</artifactId>
+            <version>1.1.4</version>
+        </dependency>
 
         <dependency>
             <groupId>com.km</groupId>
@@ -64,6 +74,11 @@
             <groupId>com.km</groupId>
             <artifactId>km-generator</artifactId>
         </dependency>
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.km</groupId>
+            <artifactId>km-db</artifactId>
+        </dependency>
 
         <!--  spring-boot-admin 监控客户端  -->
         <dependency>

km-admin/src/main/java/com/km/web/controller/common/CommonController.java

@@ -7,6 +7,9 @@ import com.km.common.core.utils.StringUtils;
 import com.km.common.core.utils.file.FileUploadUtils;
 import com.km.common.core.utils.file.FileUtils;
 import com.km.system.config.ServerConfig;
+import com.km.system.domain.vo.SysOssUploadVo;
+import com.km.system.domain.vo.SysOssVo;
+import com.km.system.service.ISysOssService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
@@ -37,6 +40,12 @@ public class CommonController {
     @Autowired
     private ServerConfig serverConfig;
 
+    private final ISysOssService sysOssService;
+
+    public CommonController(ISysOssService sysOssService) {
+        this.sysOssService = sysOssService;
+    }
+
     /**
      * 通用下载请求
      *
@@ -67,19 +76,29 @@ public class CommonController {
      * 通用上传请求（单个）
      */
     @PostMapping("/upload")
-    public CommonResult<Map<String, Object>> uploadFile(MultipartFile file) throws Exception {
+    public CommonResult<SysOssUploadVo> uploadFile(MultipartFile file) throws Exception {
         try {
+
             // 上传文件路径
             String filePath = KmConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
+            String  originalFilename = file.getOriginalFilename();
             Map<String, Object> map = new HashMap<>();
             map.put("url", url);
             map.put("fileName", fileName);
             map.put("newFileName", FileUtils.getName(fileName));
-            map.put("originalFilename", file.getOriginalFilename());
-            return CommonResult.success(map);
+            map.put("originalFilename", originalFilename);
+            assert originalFilename != null;
+            String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
+            // 信息保存在文件管理
+            SysOssVo oss = sysOssService.saveResultEntity(file.getOriginalFilename(),suffix, url,fileName);
+            SysOssUploadVo uploadVo = new SysOssUploadVo();
+            uploadVo.setUrl(oss.getUrl());
+            uploadVo.setFileName(oss.getOriginalName());
+            uploadVo.setOssId(oss.getOssId().toString());
+            return CommonResult.success(uploadVo);
         } catch (Exception e) {
             return CommonResult.fail(e.getMessage());
         }

km-admin/src/main/resources/application-dev.yml

@@ -17,6 +17,15 @@ spring:
       maxLifetime: 1800000
       # 多久检查一次连接的活性
       keepaliveTime: 30000
+  flyway:
+    enabled: true
+    baseline-on-migrate: true
+    clean-on-validation-error: false
+    sql-migration-prefix: V
+    placeholder-replacement: false
+    sql-migration-suffixes: .sql
+    locations: classpath:db/dm
+    create-schemas: false
 mybatis-flex:
   # sql审计
   audit_enable: true

km-admin/src/main/resources/application.yml

@@ -236,6 +236,8 @@ springdoc:
       packages-to-scan: com.km.system
     - group: 4.代码生成模块
       packages-to-scan: com.km.generator
+    - group: 5.数据库管理
+      packages-to-scan: com.km.db
 
 # 防止XSS攻击
 xss:
@@ -244,7 +246,7 @@ xss:
   # 排除链接（多个用逗号分隔）
   excludes: /system/notice
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/demo/*
+  urlPatterns: /system/*,/monitor/*,/tool/*,/db/*
 
 # 分布式锁 lock4j 全局配置
 lock4j:

km-common/km-common-core/src/main/java/com/km/common/core/utils/file/FileUploadUtils.java

@@ -169,9 +169,9 @@ public class FileUploadUtils {
     /**
      * 判断MIME类型是否是允许的MIME类型
      *
-     * @param extension
-     * @param allowedExtension
-     * @return
+     * @param extension extension
+     * @param allowedExtension allowedExtension
+     * @return res
      */
     public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
         for (String str : allowedExtension) {

km-common/km-common-core/src/main/java/com/km/common/core/utils/file/FileUtils.java

@@ -248,7 +248,6 @@ public class FileUtils extends FileUtil {
         if (fileName == null) {
             return null;
         }
-        String baseName = FilenameUtils.getBaseName(fileName);
-        return baseName;
+        return FilenameUtils.getBaseName(fileName);
     }
 }

km-common/km-common-web/src/main/java/com/km/common/web/config/ResourcesConfig.java

@@ -1,5 +1,7 @@
 package com.km.common.web.config;
 
+import com.km.common.core.config.KmConfig;
+import com.km.common.core.constant.Constants;
 import com.km.common.web.interceptor.FlexWebInvokeTimeInterceptor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -26,8 +28,11 @@ public class ResourcesConfig implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
+            .addResourceLocations("file:" + KmConfig.getProfile() + "/");
     }
 
+
     /**
      * 跨域配置
      */

km-extra/km-monitor/pom.xml

@@ -16,21 +16,8 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <!--            &lt;!&ndash; 移除掉默认支持的 Tomcat &ndash;&gt;-->
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.springframework.boot</groupId>-->
-            <!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
         </dependency>
 
-        <!--        &lt;!&ndash; undertow &ndash;&gt;-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-undertow</artifactId>-->
-        <!--        </dependency>-->
-
         <!-- spring security 安全认证 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

km-extra/km-powerjob-server/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin.version}</version>
+<!--            <version>${spring-boot-admin.version}</version>-->
         </dependency>
 
         <dependency>
@@ -53,6 +53,18 @@
             <version>4.0.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+        </dependency>
+
+        <!-- 必须，对应hibernate的达梦数据库方言 -->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmDialect-for-hibernate5.6</artifactId>
+            <version>8.1.2.192</version>
+        </dependency>
+
     </dependencies>
 
     <build>

km-extra/km-powerjob-server/src/main/java/com/km/powerjob/PowerJobServerApplication.java

@@ -13,13 +13,12 @@ import tech.powerjob.server.common.utils.PropertyUtils;
  */
 @Slf4j
 @EnableScheduling
-@SpringBootApplication(scanBasePackages = "tech.powerjob.server")
+@SpringBootApplication(scanBasePackages = "")
 public class PowerJobServerApplication {
 
     public static void main(String[] args) {
         PropertyUtils.init();
         SpringApplication.run(tech.powerjob.server.PowerJobServerApplication.class, args);
-        log.info("文档地址: https://www.yuque.com/powerjob/guidence/problem");
     }
 
 }

km-extra/km-powerjob-server/src/main/resources/application-dev.properties

@@ -4,14 +4,15 @@ oms.env=dev
 #spring.datasource.core.driver-class-name=org.postgresql.Driver
 #spring.datasource.core.jdbc-url=jdbc:postgresql://localhost:5432/km?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 #spring.datasource.core.username=postgres
-#spring.datasource.core.password=postgres@369
+#spring.datasource.core.password=P3x0LG8jzyHRX59l
 ## DM数据库连接参数
-spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect
+spring.datasource.remote.hibernate.properties.hibernate.dialect=org.hibernate.dialect.DmDialect
 spring.datasource.core.driver-class-name=dm.jdbc.driver.DmDriver
 spring.datasource.core.jdbc-url=jdbc:dm://127.0.0.1:5236?schema=km&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
 spring.datasource.core.username=SYSDBA
 spring.datasource.core.password=SYSDBA123
 ## MySQL数据库连接参数
+#spring.datasource.remote.hibernate.properties.hibernate.dialect=tech.powerjob.server.persistence.config.dialect.PowerJobPGDialect
 #spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/km?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 #spring.datasource.core.username=root

km-modules/km-generator/pom.xml

@@ -24,12 +24,6 @@
             <artifactId>velocity-engine-core</artifactId>
         </dependency>
 
-        <!-- collections工具类 -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-
         <!-- 通用工具-->
         <dependency>
             <groupId>com.km</groupId>

km-modules/km-generator/src/main/java/com/km/generator/controller/GenController.java

@@ -134,22 +134,12 @@ public class GenController extends BaseController {
         return CommonResult.success(dataMap);
     }
 
-    /**
-     * 生成代码（下载方式）
-     */
-    @SaCheckPermission("tool:gen:code")
-    @GetMapping("/download/{tableId}")
-    public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException {
-        byte[] data = genTableService.downloadCode(tableId);
-        genCode(response, data);
-    }
-
     /**
      * 生成代码（自定义路径）
      */
     @SaCheckPermission("tool:gen:code")
-    @GetMapping("/genCode/{tableId}")
-    public CommonResult<Void> genCode(@PathVariable("tableId") Long tableId) {
+    @GetMapping("/genCode")
+    public CommonResult<Void> genCode(Long tableId) {
         genTableService.generatorCode(tableId);
         return CommonResult.success();
     }

km-modules/km-generator/src/main/java/com/km/generator/service/GenTableServiceImpl.java

@@ -340,7 +340,7 @@ public class GenTableServiceImpl extends BaseServiceImpl<GenTableMapper, GenTabl
 
     private Result getResult(Long tableId) {
         // 校验是否存在
-        GenTable table = genTableMapper.selectOneById(tableId);
+        GenTable table = genTableMapper.selectOneWithRelationsById(tableId);
         if (ObjectUtil.isEmpty(table)) {
             throw new ServiceException("表定义不存在");
         }
@@ -509,7 +509,7 @@ public class GenTableServiceImpl extends BaseServiceImpl<GenTableMapper, GenTabl
             }
         }
         if (StringUtils.isNull(table.getPkColumn())) {
-            table.setPkColumn(table.getColumns().get(0));
+            table.setPkColumn(table.getColumns().getFirst());
         }
         if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
             for (GenTableColumn column : table.getSubTable().getColumns()) {
@@ -519,7 +519,7 @@ public class GenTableServiceImpl extends BaseServiceImpl<GenTableMapper, GenTabl
                 }
             }
             if (StringUtils.isNull(table.getSubTable().getPkColumn())) {
-                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+                table.getSubTable().setPkColumn(table.getSubTable().getColumns().getFirst());
             }
         }
     }
@@ -559,15 +559,15 @@ public class GenTableServiceImpl extends BaseServiceImpl<GenTableMapper, GenTabl
     }
 
     /**
-     * 设置生成的sys_menu6条记录的主键值
+     * 设置生成的sys_menu 7条记录的主键值
      * 日期时间格式YYYYMMDDHHMMSS转化为数值，然后+01
      *
-     * @param table
+     * @param table table
      */
     private void setMenuIds(GenTable table) {
         String nowStr = DateUtils.dateTimeNow();
         List<Long> menuIds = new ArrayList<>();
-        for (int i = 0; i < 6; i++) {
+        for (int i = 0; i < 7; i++) {
             menuIds.add(Long.valueOf(nowStr + "0" + i));
         }
         table.setMenuIds(menuIds);

km-modules/km-generator/src/main/java/com/km/generator/util/VelocityUtils.java

@@ -133,10 +133,12 @@ public class VelocityUtils {
         List<String> templates = new ArrayList<>();
         templates.add("vm/java/domain.java.vm");
         templates.add("vm/java/vo.java.vm");
+        templates.add("vm/java/vo-import.java.vm");
         templates.add("vm/java/bo.java.vm");
         templates.add("vm/java/mapper.java.vm");
         templates.add("vm/java/service.java.vm");
         templates.add("vm/java/serviceImpl.java.vm");
+        templates.add("vm/java/listener.java.vm");
         templates.add("vm/java/controller.java.vm");
         templates.add("vm/xml/mapper.xml.vm");
         if (DataBaseHelper.isPostgreSql()) {
@@ -146,7 +148,8 @@ public class VelocityUtils {
         } else {
             templates.add("vm/sql/mysql/sql.vm");
         }
-        templates.add("vm/js/api.ts.vm");
+        templates.add("vm/api/api.ts.vm");
+        templates.add("vm/api/api.ts.types.vm");
         if (GenConstants.TPL_CRUD.equals(tplCategory)) {
             templates.add("vm/vue/index.vue.vm");
         } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
@@ -177,13 +180,15 @@ public class VelocityUtils {
 
         String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
+        String apiTypesPath = "interface" + "/" + moduleName;
+        String apiModulesPath = "modules" + "/" + moduleName;
         String vuePath = "vue";
-
         switch (template) {
             case "vm/java/domain.java.vm" -> fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
             case "vm/java/sub-domain.java.vm" ->
                 fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
             case "vm/java/vo.java.vm" -> fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className);
+            case "vm/java/vo-import.java.vm" -> fileName = StringUtils.format("{}/domain/vo/{}ImportVo.java", javaPath, className);
             case "vm/java/bo.java.vm" -> fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
             case "vm/java/mapper.java.vm" ->
                 fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
@@ -195,16 +200,19 @@ public class VelocityUtils {
                 fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
             case "vm/java/controller.java.vm" ->
                 fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
+            case "vm/java/listener.java.vm" ->
+                fileName = StringUtils.format("{}/listener/{}ImportListener.java", javaPath, className);
             case "vm/xml/mapper.xml.vm" -> fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
             case "vm/xml/sub-mapper.xml.vm" ->
                 fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, genTable.getSubTable().getClassName());
             case "vm/sql/postgresql/sql.vm" -> fileName = businessName + "Menu(postgresql).sql";
+            case "vm/sql/dm8/sql.vm" -> fileName = businessName + "Menu(dm8).sql";
             case "vm/sql/mysql/sql.vm" -> fileName = businessName + "Menu(mysql).sql";
-            case "vm/js/api.ts.vm" ->
-                fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
-            case "vm/vue/index.vue.vm" ->
-                fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-            case "vm/vue/index-tree.vue.vm" ->
+            case "vm/api/api.ts.vm" ->
+                fileName = StringUtils.format("{}/api/{}/{}.ts", vuePath, apiModulesPath, businessName);
+            case "vm/api/api.ts.types.vm" ->
+                fileName = StringUtils.format("{}/api/{}/{}.ts", vuePath, apiTypesPath, businessName);
+            case "vm/vue/index.vue.vm", "vm/vue/index-tree.vue.vm" ->
                 fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
             default -> fileName = "default.xml";
         }

km-modules/km-generator/src/main/resources/vm/java/bo.java.vm

@@ -12,7 +12,9 @@ import jakarta.validation.constraints.*;
 import ${import};
 #end
 #if($table.crud || $table.sub)
+import com.km.common.orm.core.domain.BaseEntity;
 #elseif($table.tree)
+import com.km.common.orm.core.domain.TreeEntity;
 #end
 
 /**

km-modules/km-generator/src/main/resources/vm/java/controller.java.vm

@@ -19,7 +19,7 @@ import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.service.I${ClassName}Service;
 
 #if($table.crud || $table.sub)
-import com.km.common.orm.core.page.TableDataInfo;
+import com.km.common.core.core.page.PageResult;
 #elseif($table.tree)
 #end
 
@@ -43,8 +43,8 @@ public class ${ClassName}Controller extends BaseController {
     @SaCheckPermission("${permissionPrefix}:list")
     @GetMapping("/list")
     #if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo ${className}Bo) {
-        return ${className}Service.selectPage(${className}Bo);
+    public CommonResult<PageResult<${ClassName}Vo>> list(${ClassName}Bo ${className}Bo) {
+        return CommonResult.success(${className}Service.selectPage(${className}Bo));
     }
     #elseif($table.tree)
     public CommonResult<List<${ClassName}Vo>> list(${ClassName}Bo ${className}Bo) {
@@ -70,7 +70,7 @@ public class ${ClassName}Controller extends BaseController {
     @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public CommonResult<${ClassName}Vo> getInfo(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return CommonResult.ok(${className}Service.selectById(${pkColumn.javaField}));
+        return CommonResult.success(${className}Service.selectById(${pkColumn.javaField}));
     }
 
     /**

km-modules/km-generator/src/main/resources/vm/java/domain.java.vm

@@ -27,7 +27,9 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 #if($table.crud || $table.sub)
+import com.km.common.orm.core.domain.BaseEntity;
 #elseif($table.tree)
+import com.km.common.orm.core.domain.TreeEntity;
 #end
 
 /**

km-modules/km-generator/src/main/resources/vm/java/service.java.vm

@@ -7,7 +7,7 @@ import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import com.km.common.orm.core.service.IBaseService;
 #if($table.crud || $table.sub)
-import com.km.common.orm.core.page.TableDataInfo;
+import com.km.common.core.core.page.PageResult;
 #end
 
 /**
@@ -40,7 +40,7 @@ public interface I${ClassName}Service extends IBaseService<${ClassName}> {
      * @param ${className}Bo ${functionName}Bo
      * @return 分页${functionName}集合
      */
-    TableDataInfo<${ClassName}Vo> selectPage(${ClassName}Bo ${className}Bo);
+    PageResult<${ClassName}Vo> selectPage(${ClassName}Bo ${className}Bo);
     #end
 
     /**

km-modules/km-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -9,7 +9,7 @@ import com.mybatisflex.core.query.QueryWrapper;
 import com.km.common.core.utils.MapstructUtils;
 import com.km.common.core.utils.StringUtils;
 import com.km.common.orm.core.page.PageQuery;
-import com.km.common.orm.core.page.TableDataInfo;
+import com.km.common.core.core.page.PageResult;
 import com.km.common.orm.core.service.impl.BaseServiceImpl;
     #foreach ($column in $columns)
         #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
@@ -31,7 +31,7 @@ import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.service.I${ClassName}Service;
-import static ${packageName}.domain.table.${ClassName}TableDef .${CapitalUnderScoreClassName};
+import static ${packageName}.domain.table.${ClassName}TableDef.${CapitalUnderScoreClassName};
 
 /**
  * ${functionName}Service业务层处理
@@ -90,11 +90,9 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
     public ${ClassName}Vo selectById(${pkColumn.javaType} ${pkColumn.javaField}) {
         #set($CapitalPkColumn=${pkColumn.columnName.toUpperCase()})
         #if($table.sub)
-            return ${className}Mapper.selectOneWithRelationsByQueryAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}
-            Vo.class);
+            return ${className}Mapper.selectOneWithRelationsByQueryAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}Vo.class);
         #else
-            return this.getOneAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}
-            Vo.class);
+            return this.getOneAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}Vo.class);
         #end
 
     }
@@ -123,14 +121,14 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
      * @return 分页${functionName}集合
      */
     @Override
-    public TableDataInfo<${ClassName}Vo> selectPage(${ClassName}Bo ${className}Bo) {
+    public PageResult<${ClassName}Vo> selectPage(${ClassName}Bo ${className}Bo) {
         QueryWrapper queryWrapper = buildQueryWrapper(${className}Bo);
         #if($table.sub)
             Page<${ClassName}Vo> page = ${className}Mapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, ${ClassName}Vo.class);
         #else
             Page<${ClassName}Vo> page = this.pageAs(PageQuery.build(), queryWrapper, ${ClassName}Vo.class);
         #end
-        return TableDataInfo.build(page);
+        return PageResult.build(page);
     }
     #end
 

km-modules/km-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -10,7 +10,9 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 #if($table.crud || $table.sub)
+import com.km.common.orm.core.domain.BaseEntity;
 #elseif($table.tree)
+import com.km.common.orm.core.domain.TreeEntity;
 #end
 
 /**

km-modules/km-generator/src/main/resources/vm/java/vo.java.vm

@@ -18,7 +18,9 @@ import ${packageName}.domain.${subClassName};
 import java.io.Serial;
 import java.io.Serializable;
 #if($table.crud || $table.sub)
+import com.km.common.orm.core.domain.BaseEntity;
 #elseif($table.tree)
+import com.km.common.orm.core.domain.TreeEntity;
 #end
 
 /**

km-modules/km-generator/src/main/resources/vm/js/api.ts.vm

@@ -1,70 +0,0 @@
-import http from '@/api'
-
-/**
- * @name 查询${functionName}列表
- * @param query 参数
- * @returns 返回列表
- */
-export const list${BusinessName}Api = (query: any) => {
-    return http.get<any>('/${moduleName}/${businessName}/list', query, { loading: true })
-}
-
-/**
- * @name 查询${functionName}详细
- * @param ${pkColumn.javaField} ${pkColumn.javaField}
- * @returns returns
- */
-export const get${BusinessName}Api = (${pkColumn.javaField}: any) => {
-    return http.get<any>(`/${moduleName}/${businessName}/${${pkColumn.javaField}}`)
-}
-
-/**
- * @name 新增${functionName}
- * @param data data
- * @returns returns
- */
-export const add${BusinessName}Api = (data: any) => {
-    return http.post<any>('/${moduleName}/${businessName}', data, { loading: false })
-}
-
-/**
- * @name 修改${functionName}
- * @param data data
- * @returns returns
- */
-export const update${BusinessName}Api = (data: any) => {
-    return http.put<any>('/${moduleName}/${businessName}', data, { loading: false })
-}
-
-/**
- * @name 删除${functionName}
- * @param ${pkColumn.javaField} ${pkColumn.javaField}
- * @returns returns
- */
-export const del${BusinessName}Api = (${pkColumn.javaField}: any) => {
-    return http.delete<any>(`/${moduleName}/${businessName}/${${pkColumn.javaField}}`)
-}
-
-/**
- * @name 下载模板
- * @returns returns
- */
-export const importTemplateApi = () => {
-    return http.downloadPost('/${moduleName}/${businessName}/importTemplate', {})
-}
-
-/**
- * @name 导入数据
- * @returns returns
- */
-export const import${BusinessName}DataApi = (data: any) => {
-    return http.post('/${moduleName}/${businessName}/importData', data)
-}
-
-/**
- * @name 导出数据
- * @returns returns
- */
-export const export${BusinessName}Api = (data: any) => {
-    return http.downloadPost('/${moduleName}/${businessName}/export', data)
-}

km-modules/km-generator/src/main/resources/vm/vue/index.vue.vm

@@ -3,19 +3,19 @@
         <ProTable ref="proTable" :columns="columns" row-key="${pkColumn.javaField}" :request-api="list${BusinessName}Api" >
             <!-- 表格 header 按钮 -->
             <template #tableHeader="scope">
-                <el-button type="primary" v-auth="['${moduleName}:${businessName}:add']" :icon="CirclePlus" @click="openDialog(1, '${functionName}新增')">
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:add']" icon="CirclePlus" @click="openDialog(1, '${functionName}新增')">
                     新增
                 </el-button>
-                <el-button type="primary" v-auth="['${moduleName}:${businessName}:import']" :icon="Upload" plain @click="batchAdd">
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:import']" icon="Upload" plain @click="batchAdd">
                     导入
                 </el-button>
-                <el-button type="primary" v-auth="['${moduleName}:${businessName}:export']" :icon="Download" plain @click="downloadFile">
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:export']" icon="Download" plain @click="downloadFile">
                     导出
                 </el-button>
                 <el-button
                     type="danger"
                     v-auth="['${moduleName}:${businessName}:remove']"
-                    :icon="Delete"
+                    icon="Delete"
                     plain
                     :disabled="!scope.isSelected"
                     @click="batchDelete(scope.selectedListIds)"
@@ -28,7 +28,7 @@
                 <el-button
                     type="primary"
                     link
-                    :icon="View"
+                    icon="View"
                     v-auth="['${moduleName}:${businessName}:query']"
                     @click="openDialog(3, '${functionName}查看', scope.row)"
                 >
@@ -37,13 +37,13 @@
                 <el-button
                     type="primary"
                     link
-                    :icon="EditPen"
+                    icon="EditPen"
                     v-auth="['${moduleName}:${businessName}:edit']"
                     @click="openDialog(2, '${functionName}编辑', scope.row)"
                 >
                     编辑
                 </el-button>
-                <el-button type="primary" link :icon="Delete" v-auth="['${moduleName}:${businessName}:remove']" @click="delete${BusinessName}(scope.row)">
+                <el-button type="primary" link icon="Delete" v-auth="['${moduleName}:${businessName}:remove']" @click="delete${BusinessName}(scope.row)">
                     删除
                 </el-button>
             </template>
@@ -62,7 +62,6 @@
     import ImportExcel from '@/components/ImportExcel/index.vue'
     import FormDialog from '@/components/FormDialog/index.vue'
     import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-    import { Delete, EditPen, Download, Upload, View, CirclePlus } from '@element-plus/icons-vue'
     import {
         list${BusinessName}Api,
         del${BusinessName}Api,
@@ -82,7 +81,7 @@
 
     // 删除${functionName}信息
     const delete${BusinessName} = async (params: any) => {
-        await useHandleData(del${BusinessName}Api, params.${pkColumn.javaField}, `删除【params.${pkColumn.javaField}】${functionName}`)
+        await useHandleData(del${BusinessName}Api, params.${pkColumn.javaField}, '删除【' + params.${pkColumn.javaField} + '】${functionName}')
         proTable.value?.getTableList()
     }
 

km-modules/km-system/src/main/java/com/km/system/service/ISysOssService.java

@@ -33,5 +33,5 @@ public interface ISysOssService extends IBaseService<SysOss> {
     void download(Long ossId, HttpServletResponse response) throws IOException;
 
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
+    SysOssVo saveResultEntity(String originalFileName, String suffix, String url, String fileName);
 }

km-modules/km-system/src/main/java/com/km/system/service/impl/SysOssServiceImpl.java

@@ -1,9 +1,13 @@
 package com.km.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.km.common.core.config.KmConfig;
 import com.km.common.core.constant.CacheNames;
+import com.km.common.core.constant.Constants;
 import com.km.common.core.core.page.PageResult;
 import com.km.common.core.exception.ServiceException;
 import com.km.common.core.service.OssService;
@@ -45,7 +49,6 @@ import static com.km.system.domain.table.SysOssTableDef.SYS_OSS;
  * 文件上传 服务层实现
  *
  * @author km
- * @author km
  * @date 2023-11-30
  */
 @RequiredArgsConstructor
@@ -60,7 +63,7 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
     }
 
     private QueryWrapper buildQueryWrapper(SysOssBo bo) {
-        QueryWrapper queryWrapper = super.buildBaseQueryWrapper()
+        return super.buildBaseQueryWrapper()
             .where(SYS_OSS.FILE_NAME.like(bo.getFileName()))
             .and(SYS_OSS.ORIGINAL_NAME.like(bo.getOriginalName()))
             .and(SYS_OSS.FILE_SUFFIX.eq(bo.getFileSuffix()))
@@ -68,7 +71,6 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
             .and(SYS_OSS.CREATE_TIME.between(bo.getParams().get("beginCreateTime"), bo.getParams().get("endCreateTime")))
             .and(SYS_OSS.SERVICE.eq(bo.getService()))
             .orderBy(SYS_OSS.OSS_ID.asc());
-        return queryWrapper;
     }
 
     @Override
@@ -142,8 +144,9 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
 
     @Override
     public SysOssVo upload(MultipartFile file) {
-        String originalfileName = file.getOriginalFilename();
-        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+        String originalFilename = file.getOriginalFilename();
+        assert originalFilename != null;
+        String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
         OssClient storage = OssFactory.instance();
         UploadResult uploadResult;
         try {
@@ -152,28 +155,29 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
             throw new ServiceException(e.getMessage());
         }
         // 保存文件信息
-        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalFilename, suffix, storage.getConfigKey(), uploadResult);
     }
 
     @Override
     public SysOssVo upload(File file) {
-        String originalfileName = file.getName();
-        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+        String originalFileName = file.getName();
+        String suffix = StringUtils.substring(originalFileName, originalFileName.lastIndexOf("."), originalFileName.length());
         OssClient storage = OssFactory.instance();
         UploadResult uploadResult = storage.uploadSuffix(file, suffix);
         // 保存文件信息
-        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalFileName, suffix, storage.getConfigKey(), uploadResult);
     }
 
-    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) {
+    private SysOssVo buildResultEntity(String originalFileName, String suffix, String configKey, UploadResult uploadResult) {
         SysOss oss = new SysOss();
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);
         oss.setFileName(uploadResult.getFilename());
-        oss.setOriginalName(originalfileName);
+        oss.setOriginalName(originalFileName);
         oss.setService(configKey);
         this.save(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
+        assert sysOssVo != null;
         return this.matchingUrl(sysOssVo);
     }
 
@@ -185,8 +189,17 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
 
         List<SysOss> list = this.listByIds(ids);
         for (SysOss sysOss : list) {
-            OssClient storage = OssFactory.instance(sysOss.getService());
-            storage.delete(sysOss.getUrl());
+            if (StrUtil.equals("Local",sysOss.getService())) {
+                // 删除本地文件
+                String filePath = KmConfig.getProfile() + StringUtils.substringAfter(sysOss.getFileName(), Constants.RESOURCE_PREFIX);
+                boolean deleted = FileUtil.del(filePath);
+                if (!deleted) {
+                    throw new ServiceException(sysOss.getFileName()+ "文件删除失败，可能是因为文件不存在或无权限删除。");
+                }
+            } else {
+                OssClient storage = OssFactory.instance(sysOss.getService());
+                storage.delete(sysOss.getUrl());
+            }
         }
         return this.removeByIds(ids);
     }
@@ -198,6 +211,9 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
      * @return oss 匹配Url的OSS对象
      */
     private SysOssVo matchingUrl(SysOssVo oss) {
+        if (StrUtil.equals("Local",oss.getService())){
+            return oss;
+        }
         OssClient storage = OssFactory.instance(oss.getService());
         // 仅修改桶类型为 private 的URL，临时URL时长为120s
         if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
@@ -205,4 +221,18 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
         }
         return oss;
     }
+
+    @Override
+    public SysOssVo saveResultEntity(String originalFileName, String suffix, String url, String fileName) {
+        SysOss oss = new SysOss();
+        oss.setUrl(url);
+        oss.setFileSuffix(suffix);
+        oss.setFileName(fileName);
+        oss.setOriginalName(originalFileName);
+        oss.setService("Local");
+        this.save(oss);
+        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
+        assert sysOssVo != null;
+        return sysOssVo;
+    }
 }

km-modules/pom.xml

@@ -14,6 +14,7 @@
         <module>km-generator</module>
         <module>km-job</module>
         <module>km-system</module>
+        <module>km-db</module>
     </modules>
 
     <artifactId>km-modules</artifactId>

pom.xml

@@ -27,8 +27,7 @@
         <pagehelper.version>6.1.0</pagehelper.version>
         <fastjson.version>2.0.43</fastjson.version>
         <oshi.version>6.4.8</oshi.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
-        <poi.version>5.2.3</poi.version>
+        <poi.version>5.2.5</poi.version>
         <easyexcel.version>3.3.3</easyexcel.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
@@ -47,11 +46,11 @@
         <lock4j.version>2.2.7</lock4j.version>
         <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
         <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
-        <powerjob.version>4.3.6</powerjob.version>
+        <powerjob.version>4.3.9</powerjob.version>
         <!-- 离线IP地址定位库 -->
         <ip2region.version>2.7.0</ip2region.version>
         <!-- OSS 配置 -->
-        <aws-java-sdk-s3.version>1.12.600</aws-java-sdk-s3.version>
+        <aws-java-sdk-s3.version>1.12.710</aws-java-sdk-s3.version>
         <!-- 加解密依赖库 -->
         <bcprov-jdk.version>1.77</bcprov-jdk.version>
         <!-- SMS 配置 -->
@@ -232,13 +231,6 @@
                 <version>${velocity.version}</version>
             </dependency>
 
-            <!-- collections工具类 -->
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>${commons.collections.version}</version>
-            </dependency>
-
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba.fastjson2</groupId>
@@ -410,6 +402,11 @@
                 <artifactId>km-system</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.km</groupId>
+                <artifactId>km-db</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

script/sql/DM8/dm-km-1.0.0.sql

@@ -80,196 +80,7 @@ CREATE TABLE "km"."gen_table_column"
     "update_by"      BIGINT       NULL,
     "update_time"    TIMESTAMP(6) NULL
 );
-CREATE TABLE "km"."pj_app_info"
-(
-    "id"             BIGINT       NOT NULL,
-    "app_name"       VARCHAR(255) DEFAULT NULL
-                                  NULL,
-    "current_server" VARCHAR(255) DEFAULT NULL
-                                  NULL,
-    "gmt_create"     TIMESTAMP(6) NULL,
-    "gmt_modified"   TIMESTAMP(6) NULL,
-    "password"       VARCHAR(255) DEFAULT NULL
-                                  NULL
-);
-CREATE TABLE "km"."pj_container_info"
-(
-    "id"               BIGINT       NOT NULL,
-    "app_id"           BIGINT       NULL,
-    "container_name"   VARCHAR(255) DEFAULT NULL
-                                    NULL,
-    "gmt_create"       TIMESTAMP(6) NULL,
-    "gmt_modified"     TIMESTAMP(6) NULL,
-    "last_deploy_time" TIMESTAMP(6) NULL,
-    "source_info"      VARCHAR(255) DEFAULT NULL
-                                    NULL,
-    "source_type"      INT          NULL,
-    "status"           INT          NULL,
-    "version"          VARCHAR(255) DEFAULT NULL
-                                    NULL
-);
-CREATE TABLE "km"."pj_instance_info"
-(
-    "id"                    BIGINT       NOT NULL,
-    "actual_trigger_time"   BIGINT       NULL,
-    "app_id"                BIGINT       NULL,
-    "expected_trigger_time" BIGINT       NULL,
-    "finished_time"         BIGINT       NULL,
-    "gmt_create"            TIMESTAMP(6) NULL,
-    "gmt_modified"          TIMESTAMP(6) NULL,
-    "instance_id"           BIGINT       NULL,
-    "instance_params"       TEXT         NULL,
-    "job_id"                BIGINT       NULL,
-    "job_params"            TEXT         NULL,
-    "last_report_time"      BIGINT       NULL,
-    "result"                TEXT         NULL,
-    "running_times"         BIGINT       NULL,
-    "status"                INT          NULL,
-    "task_tracker_address"  VARCHAR(255) DEFAULT NULL
-                                         NULL,
-    "type"                  INT          NULL,
-    "wf_instance_id"        BIGINT       NULL
-);
-CREATE TABLE "km"."pj_job_info"
-(
-    "id"                   BIGINT       NOT NULL,
-    "alarm_config"         VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "app_id"               BIGINT       NULL,
-    "concurrency"          INT          NULL,
-    "designated_workers"   VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "dispatch_strategy"    INT          NULL,
-    "execute_type"         INT          NULL,
-    "extra"                VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "gmt_create"           TIMESTAMP(6) NULL,
-    "gmt_modified"         TIMESTAMP(6) NULL,
-    "instance_retry_num"   INT          NULL,
-    "instance_time_limit"  BIGINT       NULL,
-    "job_description"      VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "job_name"             VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "job_params"           TEXT         NULL,
-    "lifecycle"            VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "log_config"           VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "max_instance_num"     INT          NULL,
-    "max_worker_count"     INT          NULL,
-    "min_cpu_cores"        REAL         NOT NULL,
-    "min_disk_space"       REAL         NOT NULL,
-    "min_memory_space"     REAL         NOT NULL,
-    "next_trigger_time"    BIGINT       NULL,
-    "notify_user_ids"      VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "processor_info"       VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "processor_type"       INT          NULL,
-    "status"               INT          NULL,
-    "tag"                  VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "task_retry_num"       INT          NULL,
-    "time_expression"      VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "time_expression_type" INT          NULL
-);
-CREATE TABLE "km"."pj_oms_lock"
-(
-    "id"            BIGINT       NOT NULL,
-    "gmt_create"    TIMESTAMP(6) NULL,
-    "gmt_modified"  TIMESTAMP(6) NULL,
-    "lock_name"     VARCHAR(255) DEFAULT NULL
-                                 NULL,
-    "max_lock_time" BIGINT       NULL,
-    "ownerip"       VARCHAR(255) DEFAULT NULL
-                                 NULL
-);
-CREATE TABLE "km"."pj_server_info"
-(
-    "id"           BIGINT       NOT NULL,
-    "gmt_create"   TIMESTAMP(6) NULL,
-    "gmt_modified" TIMESTAMP(6) NULL,
-    "ip"           VARCHAR(255) DEFAULT NULL
-                                NULL
-);
-CREATE TABLE "km"."pj_user_info"
-(
-    "id"           BIGINT       NOT NULL,
-    "email"        VARCHAR(255) DEFAULT NULL
-                                NULL,
-    "extra"        VARCHAR(255) DEFAULT NULL
-                                NULL,
-    "gmt_create"   TIMESTAMP(6) NULL,
-    "gmt_modified" TIMESTAMP(6) NULL,
-    "password"     VARCHAR(255) DEFAULT NULL
-                                NULL,
-    "phone"        VARCHAR(255) DEFAULT NULL
-                                NULL,
-    "username"     VARCHAR(255) DEFAULT NULL
-                                NULL,
-    "web_hook"     VARCHAR(255) DEFAULT NULL
-                                NULL
-);
-CREATE TABLE "km"."pj_workflow_info"
-(
-    "id"                   BIGINT       NOT NULL,
-    "app_id"               BIGINT       NULL,
-    "extra"                VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "gmt_create"           TIMESTAMP(6) NULL,
-    "gmt_modified"         TIMESTAMP(6) NULL,
-    "lifecycle"            VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "max_wf_instance_num"  INT          NULL,
-    "next_trigger_time"    BIGINT       NULL,
-    "notify_user_ids"      VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "pedag"                TEXT         NULL,
-    "status"               INT          NULL,
-    "time_expression"      VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "time_expression_type" INT          NULL,
-    "wf_description"       VARCHAR(255) DEFAULT NULL
-                                        NULL,
-    "wf_name"              VARCHAR(255) DEFAULT NULL
-                                        NULL
-);
-CREATE TABLE "km"."pj_workflow_instance_info"
-(
-    "id"                    BIGINT       NOT NULL,
-    "actual_trigger_time"   BIGINT       NULL,
-    "app_id"                BIGINT       NULL,
-    "dag"                   TEXT         NULL,
-    "expected_trigger_time" BIGINT       NULL,
-    "finished_time"         BIGINT       NULL,
-    "gmt_create"            TIMESTAMP(6) NULL,
-    "gmt_modified"          TIMESTAMP(6) NULL,
-    "parent_wf_instance_id" BIGINT       NULL,
-    "result"                TEXT         NULL,
-    "status"                INT          NULL,
-    "wf_context"            TEXT         NULL,
-    "wf_init_params"        TEXT         NULL,
-    "wf_instance_id"        BIGINT       NULL,
-    "workflow_id"           BIGINT       NULL
-);
-CREATE TABLE "km"."pj_workflow_node_info"
-(
-    "id"               BIGINT       NOT NULL,
-    "app_id"           BIGINT       NOT NULL,
-    "enable"           BIT          NOT NULL,
-    "extra"            TEXT         NULL,
-    "gmt_create"       TIMESTAMP(6) NOT NULL,
-    "gmt_modified"     TIMESTAMP(6) NOT NULL,
-    "job_id"           BIGINT       NULL,
-    "node_name"        VARCHAR(255) DEFAULT NULL
-                                    NULL,
-    "node_params"      TEXT         NULL,
-    "skip_when_failed" BIT          NOT NULL,
-    "type"             INT          NULL,
-    "workflow_id"      BIGINT       NULL
-);
+
 CREATE TABLE "km"."sys_client"
 (
     "id"             BIGINT       NOT NULL,
@@ -730,58 +541,6 @@ CREATE TABLE "km"."sys_user_role"
     "user_id" BIGINT NOT NULL,
     "role_id" BIGINT NOT NULL
 );
-INSERT INTO "km"."pj_app_info"("id", "app_name", "current_server", "gmt_create", "gmt_modified", "password")
-VALUES (1, 'km-worker', '127.0.0.1:10010', TO_DATE('2023-06-13 16:32:59.263000', 'YYYY-MM-DD HH24:MI:SS.FF'),
-        TO_DATE('2023-07-04 17:25:49.798000', 'YYYY-MM-DD HH24:MI:SS.FF'), '123456');
-
-INSERT INTO "km"."pj_job_info"("id", "alarm_config", "app_id", "concurrency", "designated_workers", "dispatch_strategy",
-                               "execute_type", "extra", "gmt_create", "gmt_modified", "instance_retry_num",
-                               "instance_time_limit", "job_description", "job_name", "job_params", "lifecycle",
-                               "log_config", "max_instance_num", "max_worker_count", "min_cpu_cores", "min_disk_space",
-                               "min_memory_space", "next_trigger_time", "notify_user_ids", "processor_info",
-                               "processor_type", "status", "tag", "task_retry_num", "time_expression",
-                               "time_expression_type")
-VALUES (1, '{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', 1, 5, '', 2, 1, null,
-        TO_DATE('2023-06-02 15:01:27.717000', 'YYYY-MM-DD HH24:MI:SS.FF'),
-        TO_DATE('2023-07-04 17:22:12.374000', 'YYYY-MM-DD HH24:MI:SS.FF'), 1, 0, '', '单机处理器执行测试', null, '{}',
-        '{"type":1}', 0, 0, 0.0, 0.0, 0.0, null, null, 'com.km.job.processors.StandaloneProcessorDemo', 1, 2, null,
-        1, '30000', 3);
-INSERT INTO "km"."pj_job_info"("id", "alarm_config", "app_id", "concurrency", "designated_workers", "dispatch_strategy",
-                               "execute_type", "extra", "gmt_create", "gmt_modified", "instance_retry_num",
-                               "instance_time_limit", "job_description", "job_name", "job_params", "lifecycle",
-                               "log_config", "max_instance_num", "max_worker_count", "min_cpu_cores", "min_disk_space",
-                               "min_memory_space", "next_trigger_time", "notify_user_ids", "processor_info",
-                               "processor_type", "status", "tag", "task_retry_num", "time_expression",
-                               "time_expression_type")
-VALUES (2, '{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', 1, 5, '', 1, 2, null,
-        TO_DATE('2023-06-02 15:04:45.342000', 'YYYY-MM-DD HH24:MI:SS.FF'),
-        TO_DATE('2023-07-04 17:22:12.816000', 'YYYY-MM-DD HH24:MI:SS.FF'), 0, 0, null, '广播处理器测试', null, '{}',
-        '{"type":1}', 0, 0, 0.0, 0.0, 0.0, null, null, 'com.km.job.processors.BroadcastProcessorDemo', 1, 2, null, 1,
-        '30000', 3);
-INSERT INTO "km"."pj_job_info"("id", "alarm_config", "app_id", "concurrency", "designated_workers", "dispatch_strategy",
-                               "execute_type", "extra", "gmt_create", "gmt_modified", "instance_retry_num",
-                               "instance_time_limit", "job_description", "job_name", "job_params", "lifecycle",
-                               "log_config", "max_instance_num", "max_worker_count", "min_cpu_cores", "min_disk_space",
-                               "min_memory_space", "next_trigger_time", "notify_user_ids", "processor_info",
-                               "processor_type", "status", "tag", "task_retry_num", "time_expression",
-                               "time_expression_type")
-VALUES (3, '{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', 1, 5, '', 1, 4, null,
-        TO_DATE('2023-06-02 15:13:23.519000', 'YYYY-MM-DD HH24:MI:SS.FF'),
-        TO_DATE('2023-06-02 16:03:22.421000', 'YYYY-MM-DD HH24:MI:SS.FF'), 0, 0, null, 'Map处理器测试', null, '{}',
-        '{"type":1}', 0, 0, 0.0, 0.0, 0.0, null, null, 'com.km.job.processors.MapProcessorDemo', 1, 2, null, 1,
-        '1000', 3);
-INSERT INTO "km"."pj_job_info"("id", "alarm_config", "app_id", "concurrency", "designated_workers", "dispatch_strategy",
-                               "execute_type", "extra", "gmt_create", "gmt_modified", "instance_retry_num",
-                               "instance_time_limit", "job_description", "job_name", "job_params", "lifecycle",
-                               "log_config", "max_instance_num", "max_worker_count", "min_cpu_cores", "min_disk_space",
-                               "min_memory_space", "next_trigger_time", "notify_user_ids", "processor_info",
-                               "processor_type", "status", "tag", "task_retry_num", "time_expression",
-                               "time_expression_type")
-VALUES (4, '{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', 1, 5, '', 1, 3, null,
-        TO_DATE('2023-06-02 15:45:25.896000', 'YYYY-MM-DD HH24:MI:SS.FF'),
-        TO_DATE('2023-06-02 16:03:23.125000', 'YYYY-MM-DD HH24:MI:SS.FF'), 0, 0, null, 'MapReduce处理器测试', null,
-        '{}', '{"type":1}', 0, 0, 0.0, 0.0, 0.0, null, null, 'com.km.job.processors.MapReduceProcessorDemo', 1, 2,
-        null, 1, '1000', 3);
 
 INSERT INTO "km"."sys_client"("id", "client_id", "client_key", "client_secret", "grant_type", "device_type",
                               "active_timeout", "timeout", "status", "version", "del_flag", "create_by", "create_time",
@@ -1715,37 +1474,6 @@ ALTER TABLE "km"."gen_table"
 
 ALTER TABLE "km"."gen_table_column"
     ADD CONSTRAINT "gen_table_column_pk" PRIMARY KEY ("column_id");
-
-ALTER TABLE "km"."pj_app_info"
-    ADD CONSTRAINT "pj_app_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_container_info"
-    ADD CONSTRAINT "pj_container_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_instance_info"
-    ADD CONSTRAINT "pj_instance_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_job_info"
-    ADD CONSTRAINT "pj_job_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_oms_lock"
-    ADD CONSTRAINT "pj_oms_lock_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_server_info"
-    ADD CONSTRAINT "pj_server_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_user_info"
-    ADD CONSTRAINT "pj_user_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_workflow_info"
-    ADD CONSTRAINT "pj_workflow_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_workflow_instance_info"
-    ADD CONSTRAINT "pj_workflow_instance_info_pkey" PRIMARY KEY ("id");
-
-ALTER TABLE "km"."pj_workflow_node_info"
-    ADD CONSTRAINT "pj_workflow_node_info_pkey" PRIMARY KEY ("id");
-
 ALTER TABLE "km"."sys_client"
     ADD CONSTRAINT "sys_client_pk" PRIMARY KEY ("id");
 
@@ -1806,51 +1534,6 @@ ALTER TABLE "km"."sys_user_post"
 ALTER TABLE "km"."sys_user_role"
     ADD CONSTRAINT "sys_user_role_pk" PRIMARY KEY ("user_id", "role_id");
 
-CREATE UNIQUE INDEX "uidx01_app_info"
-    ON "km"."pj_app_info" ("app_name");
-
-CREATE INDEX "idx01_container_info"
-    ON "km"."pj_container_info" ("app_id");
-
-CREATE INDEX "idx01_instance_info"
-    ON "km"."pj_instance_info" ("job_id", "status");
-
-CREATE INDEX "idx02_instance_info"
-    ON "km"."pj_instance_info" ("app_id", "status");
-
-CREATE INDEX "idx03_instance_info"
-    ON "km"."pj_instance_info" ("instance_id", "status");
-
-CREATE INDEX "idx01_job_info"
-    ON "km"."pj_job_info" ("app_id", "status", "time_expression_type", "next_trigger_time");
-
-CREATE UNIQUE INDEX "uidx01_oms_lock"
-    ON "km"."pj_oms_lock" ("lock_name");
-
-CREATE INDEX "idx01_server_info"
-    ON "km"."pj_server_info" ("gmt_modified");
-
-CREATE UNIQUE INDEX "uidx01_server_info"
-    ON "km"."pj_server_info" ("ip");
-
-CREATE INDEX "uidx01_user_info"
-    ON "km"."pj_user_info" ("username");
-
-CREATE INDEX "uidx02_user_info"
-    ON "km"."pj_user_info" ("email");
-
-CREATE INDEX "idx01_workflow_info"
-    ON "km"."pj_workflow_info" ("app_id", "status", "time_expression_type", "next_trigger_time");
-
-CREATE INDEX "idx01_wf_instance"
-    ON "km"."pj_workflow_instance_info" ("workflow_id", "status", "app_id", "expected_trigger_time");
-
-CREATE UNIQUE INDEX "uidx01_wf_instance"
-    ON "km"."pj_workflow_instance_info" ("wf_instance_id");
-
-CREATE INDEX "idx01_workflow_node_info"
-    ON "km"."pj_workflow_node_info" ("workflow_id", "gmt_create");
-
 CREATE UNIQUE INDEX "sys_dict_type_index1"
     ON "km"."sys_dict_type" ("tenant_id", "dict_type");
 

script/sql/mysql/mysql-km-V1.0.0.sql

@@ -262,7 +262,7 @@ CREATE TABLE IF NOT EXISTS `pj_app_info` (
 
 -- 正在导出表  ruoyi-flex.pj_app_info 的数据：~0 rows (大约)
 INSERT INTO `pj_app_info` (`id`, `app_name`, `current_server`, `gmt_create`, `gmt_modified`, `password`) VALUES
-    (1, 'ruoyi-worker', '127.0.0.1:10010', '2023-06-13 16:32:59.263000', '2023-09-01 09:15:38.535000', '123456');
+    (1, 'km-worker', '127.0.0.1:10010', '2023-06-13 16:32:59.263000', '2023-09-01 09:15:38.535000', '123456');
 
 -- 导出  表 ruoyi-flex.pj_container_info 结构
 DROP TABLE IF EXISTS `pj_container_info`;