Merge branch 'dev-lzy' into develop

# Conflicts:
#	taais-admin/src/main/resources/application-dev.yml
#	taais-admin/src/main/resources/application.yml
#	taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataServiceImpl.java

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

@@ -2,6 +2,9 @@ server:
   video_stable_url: http://localhost:11002/video_stable
   video_stable_start_url: http://localhost:11002/video_stable
   video_stable_stop_url: http://localhost:11002/video_stable_stop
+  to_infrared_stop_url: http://localhost:11002/to_infrared_stop
+  track_sequence_stop_url: http://localhost:11003/track_sequence_stop
+  target_detection_stop_url: http://localhost:11003/target_detection_stop
   task_stop_url: http://localhost:11003/stop
 
 # 数据源配置
@@ -41,7 +44,7 @@ mybatis-flex:
       #      password: Root@369
       #postgresql数据库
       driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/taais?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #      url: jdbc:postgresql://localhost:5432/taais?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
       url: jdbc:postgresql://110.41.34.83:5432/taais?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
       username: postgres
       password: P3x0LG8jzyHRX59l

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

@@ -1,20 +1,18 @@
 package com.taais.biz.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.domain.Data;
 import com.taais.biz.domain.bo.DataBo;
-import com.taais.biz.domain.vo.BatchDataResult;
 import com.taais.biz.domain.dto.DataAmplifyDto;
+import com.taais.biz.domain.vo.BatchDataResult;
 import com.taais.biz.domain.vo.DataSelectVo;
 import com.taais.biz.domain.vo.DataVo;
 import com.taais.biz.mapper.DataMapper;
+import com.taais.biz.service.IDataAmplificationTaskService;
 import com.taais.biz.service.IDataService;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.core.domain.CommonResult;
@@ -24,7 +22,6 @@ import com.taais.common.core.utils.StringUtils;
 import com.taais.common.core.utils.file.FileUploadUtils;
 import com.taais.common.core.utils.file.FileUtils;
 import com.taais.common.core.utils.file.UnPackedUtil;
-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.common.redis.utils.RedisUtils;
@@ -49,7 +46,6 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 import static com.taais.biz.domain.table.DataTableDef.DATA;
 
@@ -68,13 +64,16 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
     private static final String RAR = ".rar";
     private static final String TXT = ".txt";
     private static final String[] VALID_EXTENSIONS = {".jpg", ".jpeg", ".png", ".bmp"};
-    private static final String PYTHON_DATA_AMPLIFY_API = "http://127.0.0.1:9096/api/data/amplify";
+    private static final String PYTHON_DATA_AMPLIFY_API = "http://127.0.0.1:11001/augment";
     private static final String RESULT_CODE = "status";
     private static final String RESULT_STATUS = "200";
     private static final String AMPLIFY = "/AMPLIFY/";
     @Resource
     private DataMapper dataMapper;
 
+    @Resource
+    private IDataAmplificationTaskService dataAmplificationTaskService;
+
     @Override
     public QueryWrapper query() {
         return super.query().from(DATA);
@@ -258,7 +257,7 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
                     String format = String.format("错误: 已标注文件 %d 个，未标注文件 %d 个", markedCount, unmarkedCount);
                     return CommonResult.fail(format);
                 }
-
+                // 如果存在标注的数据，则返回错误信息
                 if (markedCount > 0 && !labeled) {
                     String format = String.format("错误: 已标注文件 %d 个，未标注文件 %d 个", markedCount, unmarkedCount);
                     return CommonResult.fail(format);
@@ -399,6 +398,8 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
     public boolean update(DataBo dataBo) {
         Data data = MapstructUtils.convert(dataBo, Data.class);
         if (ObjectUtil.isNotNull(data) && ObjectUtil.isNotNull(data.getId())) {
+            // 不更新采集时间
+            data.setGatherTime(null);
             boolean updated = this.updateById(data);
             //新增之后清除缓存
             deleteFormSelectKey();