feat: sql update new clomun task_type

script/sql/postgresql/data_augmented.sql

@@ -0,0 +1,76 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : PostgreSql本地
+ Source Server Type    : PostgreSQL
+ Source Server Version : 160004
+ Source Host           : localhost:5432
+ Source Catalog        : taais
+ Source Schema         : public
+
+ Target Server Type    : PostgreSQL
+ Target Server Version : 160004
+ File Encoding         : 65001
+
+ Date: 07/09/2024 11:43:44
+*/
+
+
+-- ----------------------------
+-- Table structure for data_augmentation
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."data_augmentation";
+CREATE TABLE "public"."data_augmentation" (
+  "id" "pg_catalog"."int8" NOT NULL DEFAULT nextval('demo_data_augmentation_id_seq'::regclass),
+  "name" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "status" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "start_time" "pg_catalog"."timestamp",
+  "end_time" "pg_catalog"."timestamp",
+  "cost_second" "pg_catalog"."int8",
+  "task_type" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "log" "pg_catalog"."text" COLLATE "pg_catalog"."default",
+  "create_by" "pg_catalog"."int8",
+  "create_time" "pg_catalog"."timestamp" DEFAULT CURRENT_TIMESTAMP,
+  "update_by" "pg_catalog"."int8",
+  "update_time" "pg_catalog"."timestamp" DEFAULT CURRENT_TIMESTAMP,
+  "remarks" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "del_flag" "pg_catalog"."int2" NOT NULL DEFAULT '0'::smallint,
+  "tenant_id" "pg_catalog"."int8",
+  "version" "pg_catalog"."int4",
+  "input_path" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "output_path" "pg_catalog"."varchar" COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "input_oss_id" "pg_catalog"."int8",
+  "algorithm_path" "pg_catalog"."varchar" COLLATE "pg_catalog"."default",
+  "hyperparameter_configuration" "pg_catalog"."varchar" COLLATE "pg_catalog"."default"
+)
+;
+COMMENT ON COLUMN "public"."data_augmentation"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."data_augmentation"."name" IS '名称';
+COMMENT ON COLUMN "public"."data_augmentation"."status" IS '任务状态 0未开始 1进行中 2已结束 3 失败';
+COMMENT ON COLUMN "public"."data_augmentation"."start_time" IS '开始时间';
+COMMENT ON COLUMN "public"."data_augmentation"."end_time" IS '结束时间';
+COMMENT ON COLUMN "public"."data_augmentation"."cost_second" IS '耗时';
+COMMENT ON COLUMN "public"."data_augmentation"."task_type" IS '任务类型';
+COMMENT ON COLUMN "public"."data_augmentation"."log" IS '日志';
+COMMENT ON COLUMN "public"."data_augmentation"."create_by" IS '创建人';
+COMMENT ON COLUMN "public"."data_augmentation"."create_time" IS '创建时间';
+COMMENT ON COLUMN "public"."data_augmentation"."update_by" IS '更新人';
+COMMENT ON COLUMN "public"."data_augmentation"."update_time" IS '更新时间';
+COMMENT ON COLUMN "public"."data_augmentation"."remarks" IS '备注';
+COMMENT ON COLUMN "public"."data_augmentation"."del_flag" IS '逻辑删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN "public"."data_augmentation"."tenant_id" IS '租户编码';
+COMMENT ON COLUMN "public"."data_augmentation"."version" IS '乐观锁';
+COMMENT ON COLUMN "public"."data_augmentation"."input_path" IS ' 输入路径';
+COMMENT ON COLUMN "public"."data_augmentation"."output_path" IS '输出路径';
+COMMENT ON COLUMN "public"."data_augmentation"."algorithm_path" IS '算法路径';
+COMMENT ON COLUMN "public"."data_augmentation"."hyperparameter_configuration" IS '超参配置';
+COMMENT ON TABLE "public"."data_augmentation" IS '数据增强';
+
+-- ----------------------------
+-- Records of data_augmentation
+-- ----------------------------
+
+-- ----------------------------
+-- Primary Key structure for table data_augmentation
+-- ----------------------------
+ALTER TABLE "public"."data_augmentation" ADD CONSTRAINT "data_augmentation_pkey" PRIMARY KEY ("id");

taais-common/taais-common-core/src/main/java/com/taais/common/core/core/domain/CommonResult.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 通用响应信息

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/DataAugmentation.java

@@ -52,7 +52,8 @@ public class DataAugmentation extends BaseEntity {
     private Long inputOssId;
     private String inputPath;
     private String outputPath;
-
+    /** 任务类型 */
+    private String taskType;
     /**
      * 开始时间
      */

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/bo/DataAugmentationBo.java

@@ -46,7 +46,8 @@ public class DataAugmentationBo extends BaseEntity{
     @NotNull(message = "输入图片集不能为空")
     private Long inputOssId;
 
-
+    @NotBlank(message = "任务类型不能为空")
+    private String taskType;
 
     private String inputPath;
     private String outputPath;

taais-modules/taais-biz/src/main/java/com/taais/biz/domain/vo/DataAugmentationVo.java

@@ -55,6 +55,9 @@ public class DataAugmentationVo extends BaseEntity implements Serializable {
     /** 结束时间 */
     @ExcelProperty(value = "结束时间")
     private Date endTime;
+    /** 任务类型 */
+    @ExcelProperty(value = "任务类型")
+    private String taskType;
 
     /** 耗时 */
     @ExcelProperty(value = "耗时")

taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataAugmentationServiceImpl.java

@@ -21,8 +21,12 @@ import com.taais.common.core.utils.StringUtils;
 import com.taais.common.json.utils.JsonUtils;
 import com.taais.common.orm.core.page.PageQuery;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
+import com.taais.system.domain.SysDictData;
 import com.taais.system.domain.SysOss;
+import com.taais.system.domain.bo.SysDictDataBo;
+import com.taais.system.domain.vo.SysDictDataVo;
 import com.taais.system.domain.vo.SysOssVo;
+import com.taais.system.service.ISysDictDataService;
 import com.taais.system.service.ISysOssService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -57,15 +61,16 @@ import static com.taais.biz.domain.table.DataAugmentationTableDef.DATA_AUGMENTAT
 @Service
 @Slf4j
 public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentationMapper, DataAugmentation> implements IDataAugmentationService {
-    @Value("${server.video_stable_start_url}")
-    private String video_stable_start_url;
-
-    @Value("${server.video_stable_stop_url}")
-    private String video_stable_stop_url;
+//    @Value("${server.video_stable_start_url}")
+//    private String data_augmentation_start_url;
+//
+//    @Value("${server.video_stable_start_url}")
+//    private String data_augmentation_stop_url;
 
     @Autowired
     private ISysOssService ossService;
-
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
     @Resource
     private DataAugmentationMapper dataAugmentationMapper;
 
@@ -96,6 +101,8 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
             (dataAugmentationBo.getAlgorithmPath()));
         queryWrapper.and(DATA_AUGMENTATION.HYPERPARAMETER_CONFIGURATION.like
             (dataAugmentationBo.getHyperparameterConfiguration()));
+        queryWrapper.and(DATA_AUGMENTATION.TASK_TYPE.like
+            (dataAugmentationBo.getTaskType()));
 
         return queryWrapper;
     }
@@ -155,18 +162,6 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
         }
 
         DataAugmentation dataAugmentation = MapstructUtils.convert(dataAugmentationBo, DataAugmentation.class);
-//        DataAugmentation dataAugmentation = new DataAugmentation();
-//        dataAugmentation.setId(dataAugmentationBo.getId());
-//        dataAugmentation.setOutputPath(dataAugmentationBo.getOutputPath());
-//        dataAugmentation.setLog(dataAugmentationBo.getLog());
-//        dataAugmentation.setCostSecond(dataAugmentationBo.getCostSecond());
-//        dataAugmentation.setInputPath(dataAugmentationBo.getInputPath());
-//        dataAugmentation.setEndTime(dataAugmentationBo.getEndTime());
-//        dataAugmentation.setAlgorithmPath(dataAugmentationBo.getAlgorithmPath());
-//        dataAugmentation.setHyperparameterConfiguration(dataAugmentationBo.getHyperparameterConfiguration());
-//        dataAugmentation.setInputOssId(dataAugmentationBo.getInputOssId());
-//        dataAugmentation.setRemarks(dataAugmentationBo.getRemarks());
-//        dataAugmentation.setStartTime(dataAugmentationBo.getStartTime());
         dataAugmentation.setStatus(BizConstant.VideoStatus.NOT_START);
 
         return this.save(dataAugmentation);// 使用全局配置的雪花算法主键生成器生成ID值
@@ -250,8 +245,15 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
 
         dataAugmentation.setStatus(BizConstant.VideoStatus.RUNNING);
         updateById(dataAugmentation);
-
-        HttpResponseEntity responseEntity = sendPostMsg(video_stable_start_url, dataAugmentation);
+        SysDictDataBo sysDictDataBo = new SysDictDataBo();
+        sysDictDataBo.setDictLabel(dataAugmentation.getTaskType() + "开始url");
+        sysDictDataBo.setDictType("biz_data_augmentation");
+        List<SysDictDataVo> sysDictDataVos = iSysDictDataService.selectDictDataList(sysDictDataBo);
+        if (sysDictDataVos.size() == 0) {
+            return CommonResult.fail("未设置数据增强算法推理的url！请在数据字典中设置该算法的推理url！");
+        }
+        String data_augmentation_start_url = sysDictDataVos.get(0).getDictValue();
+        HttpResponseEntity responseEntity = sendPostMsg(data_augmentation_start_url, dataAugmentation);
         if (responseEntity.getStatus() == 200) {
             dataAugmentation.setStatus(BizConstant.VideoStatus.FAILED);
             updateById(dataAugmentation);
@@ -343,12 +345,19 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
     @Override
     public CommonResult stop(Long id) {
         DataAugmentation dataAugmentation = getById(id);
-
-        HttpResponseEntity responseEntity = sendPostMsg(video_stable_stop_url, dataAugmentation);
+        SysDictDataBo sysDictDataBo = new SysDictDataBo();
+        sysDictDataBo.setDictLabel(dataAugmentation.getTaskType() + "停止url");
+        sysDictDataBo.setDictType("biz_data_augmentation");
+        List<SysDictDataVo> sysDictDataVos = iSysDictDataService.selectDictDataList(sysDictDataBo);
+        if (sysDictDataVos.size() == 0) {
+            return CommonResult.fail("未设置数据增强算法停止推理的url！请在数据字典中设置该算法的停止推理地址！");
+        }
+        String data_augmentation_stop_url = sysDictDataVos.get(0).getDictValue();
+        HttpResponseEntity responseEntity = sendPostMsg(data_augmentation_stop_url, dataAugmentation);
         if (ObjectUtil.isNotNull(responseEntity) && responseEntity.getStatus() == 200) {
             dataAugmentation.setStatus(BizConstant.VideoStatus.INTERRUPTED);
             updateById(dataAugmentation);
-            return CommonResult.fail("终止任务成功");
+            return CommonResult.success("终止任务成功");
         } else {
             return CommonResult.fail("终止任务失败");
         }

taais-modules/taais-system/src/main/java/com/taais/system/controller/system/SysDictDataController.java

@@ -2,6 +2,7 @@ package com.taais.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.common.core.core.domain.CommonResult;
 import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.StringUtils;
@@ -9,6 +10,7 @@ import com.taais.common.excel.utils.ExcelUtil;
 import com.taais.common.log.annotation.Log;
 import com.taais.common.log.enums.BusinessType;
 import com.taais.common.web.core.BaseController;
+import com.taais.system.domain.SysDictData;
 import com.taais.system.domain.bo.SysDictDataBo;
 import com.taais.system.domain.vo.SysDictDataVo;
 import com.taais.system.service.ISysDictDataService;
@@ -125,4 +127,6 @@ public class SysDictDataController extends BaseController {
         }
         return CommonResult.success();
     }
+
+
 }