allen 7 сар өмнө
parent
commit
9780ec944b
14 өөрчлөгдсөн 141 нэмэгдсэн , 127 устгасан
  1. 12 10
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmConfigServiceImpl.java
  2. 12 9
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmModelServiceImpl.java
  3. 12 10
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskConfigurationServiceImpl.java
  4. 2 3
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskServiceImpl.java
  5. 3 1
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataAmplificationTaskServiceImpl.java
  6. 3 0
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataAugmentationServiceImpl.java
  7. 13 11
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataSeqServiceImpl.java
  8. 3 4
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataServiceImpl.java
  9. 6 7
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/ObjectTraceMergeServiceImpl.java
  10. 18 18
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetDetectionServiceImpl.java
  11. 13 14
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/ToInfraredServiceImpl.java
  12. 17 13
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TrackSequenceServiceImpl.java
  13. 13 14
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/Video2imageServiceImpl.java
  14. 14 13
      taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/VideoStableServiceImpl.java

+ 12 - 10
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmConfigServiceImpl.java

@@ -1,24 +1,24 @@
 package com.taais.biz.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.taais.biz.domain.AlgorithmConfig;
+import com.taais.biz.domain.bo.AlgorithmConfigBo;
+import com.taais.biz.domain.vo.AlgorithmConfigVo;
+import com.taais.biz.mapper.AlgorithmConfigMapper;
+import com.taais.biz.service.IAlgorithmConfigService;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
-import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.AlgorithmConfigMapper;
-import com.taais.biz.domain.AlgorithmConfig;
-import com.taais.biz.domain.bo.AlgorithmConfigBo;
-import com.taais.biz.domain.vo.AlgorithmConfigVo;
-import com.taais.biz.service.IAlgorithmConfigService;
+
+import java.util.Arrays;
+import java.util.List;
+
 import static com.taais.biz.domain.table.AlgorithmConfigTableDef.ALGORITHM_CONFIG;
 
 /**
@@ -72,6 +72,7 @@ public class AlgorithmConfigServiceImpl extends BaseServiceImpl<AlgorithmConfigM
     @Override
     public List<AlgorithmConfigVo> selectList(AlgorithmConfigBo algorithmConfigBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmConfigBo);
+        queryWrapper.orderBy(ALGORITHM_CONFIG.CREATE_TIME,Boolean.FALSE);
             return this.listAs(queryWrapper, AlgorithmConfigVo.class);
     }
 
@@ -84,6 +85,7 @@ public class AlgorithmConfigServiceImpl extends BaseServiceImpl<AlgorithmConfigM
     @Override
     public PageResult<AlgorithmConfigVo> selectPage(AlgorithmConfigBo algorithmConfigBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmConfigBo);
+        queryWrapper.orderBy(ALGORITHM_CONFIG.CREATE_TIME,Boolean.FALSE);
             Page<AlgorithmConfigVo> page = this.pageAs(PageQuery.build(), queryWrapper, AlgorithmConfigVo.class);
         return PageResult.build(page);
     }

+ 12 - 9
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmModelServiceImpl.java

@@ -1,27 +1,28 @@
 package com.taais.biz.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
 import com.taais.biz.domain.AlgorithmBizProcess;
+import com.taais.biz.domain.AlgorithmModel;
+import com.taais.biz.domain.bo.AlgorithmModelBo;
+import com.taais.biz.domain.vo.AlgorithmModelVo;
+import com.taais.biz.mapper.AlgorithmModelMapper;
+import com.taais.biz.service.IAlgorithmModelService;
 import com.taais.common.core.config.TaaisConfig;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.file.FileUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.AlgorithmModelMapper;
-import com.taais.biz.domain.AlgorithmModel;
-import com.taais.biz.domain.bo.AlgorithmModelBo;
-import com.taais.biz.domain.vo.AlgorithmModelVo;
-import com.taais.biz.service.IAlgorithmModelService;
+
+import java.util.Arrays;
+import java.util.List;
+
 import static com.taais.biz.domain.table.AlgorithmModelTableDef.ALGORITHM_MODEL;
 
 /**
@@ -76,6 +77,7 @@ public class AlgorithmModelServiceImpl extends BaseServiceImpl<AlgorithmModelMap
     @Override
     public List<AlgorithmModelVo> selectList(AlgorithmModelBo algorithmModelBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmModelBo);
+        queryWrapper.orderBy(ALGORITHM_MODEL.CREATE_TIME,Boolean.FALSE);
             return this.listAs(queryWrapper, AlgorithmModelVo.class);
     }
 
@@ -88,6 +90,7 @@ public class AlgorithmModelServiceImpl extends BaseServiceImpl<AlgorithmModelMap
     @Override
     public PageResult<AlgorithmModelVo> selectPage(AlgorithmModelBo algorithmModelBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmModelBo);
+        queryWrapper.orderBy(ALGORITHM_MODEL.CREATE_TIME,Boolean.FALSE);
             Page<AlgorithmModelVo> page = this.pageAs(PageQuery.build(), queryWrapper, AlgorithmModelVo.class);
         return PageResult.build(page);
     }

+ 12 - 10
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskConfigurationServiceImpl.java

@@ -1,26 +1,26 @@
 package com.taais.biz.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
+import com.taais.biz.domain.AlgorithmTaskConfiguration;
+import com.taais.biz.domain.bo.AlgorithmTaskConfigurationBo;
 import com.taais.biz.domain.bo.AlgorithmTaskConfigurationParam;
+import com.taais.biz.domain.vo.AlgorithmTaskConfigurationVo;
+import com.taais.biz.mapper.AlgorithmTaskConfigurationMapper;
+import com.taais.biz.service.IAlgorithmTaskConfigurationService;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
-import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.AlgorithmTaskConfigurationMapper;
-import com.taais.biz.domain.AlgorithmTaskConfiguration;
-import com.taais.biz.domain.bo.AlgorithmTaskConfigurationBo;
-import com.taais.biz.domain.vo.AlgorithmTaskConfigurationVo;
-import com.taais.biz.service.IAlgorithmTaskConfigurationService;
+
+import java.util.Arrays;
+import java.util.List;
+
 import static com.taais.biz.domain.table.AlgorithmTaskConfigurationTableDef.ALGORITHM_TASK_CONFIGURATION;
 
 /**
@@ -80,6 +80,7 @@ public class AlgorithmTaskConfigurationServiceImpl extends BaseServiceImpl<Algor
     @Override
     public List<AlgorithmTaskConfigurationVo> selectList(AlgorithmTaskConfigurationBo algorithmTaskConfigurationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmTaskConfigurationBo);
+        queryWrapper.orderBy(ALGORITHM_TASK_CONFIGURATION.CREATE_TIME,Boolean.FALSE);
             return this.listAs(queryWrapper, AlgorithmTaskConfigurationVo.class);
     }
 
@@ -92,6 +93,7 @@ public class AlgorithmTaskConfigurationServiceImpl extends BaseServiceImpl<Algor
     @Override
     public PageResult<AlgorithmTaskConfigurationVo> selectPage(AlgorithmTaskConfigurationBo algorithmTaskConfigurationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmTaskConfigurationBo);
+        queryWrapper.orderBy(ALGORITHM_TASK_CONFIGURATION.CREATE_TIME,Boolean.FALSE);
             Page<AlgorithmTaskConfigurationVo> page = this.pageAs(PageQuery.build(), queryWrapper, AlgorithmTaskConfigurationVo.class);
         return PageResult.build(page);
     }

+ 2 - 3
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmTaskServiceImpl.java

@@ -27,7 +27,6 @@ import com.taais.common.core.utils.StringUtils;
 import com.taais.common.core.utils.file.FileUtils;
 import com.taais.common.orm.core.page.PageQuery;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
-import com.taais.system.domain.vo.SysDictDataVo;
 import com.taais.system.service.ISysDictDataService;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
@@ -38,8 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -115,6 +112,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
     @Override
     public List<AlgorithmTaskVo> selectList(AlgorithmTaskBo algorithmTaskBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmTaskBo);
+        queryWrapper.orderBy(ALGORITHM_TASK.CREATE_TIME,Boolean.FALSE);
             return this.listAs(queryWrapper, AlgorithmTaskVo.class);
     }
 
@@ -127,6 +125,7 @@ public class AlgorithmTaskServiceImpl extends BaseServiceImpl<AlgorithmTaskMappe
     @Override
     public PageResult<AlgorithmTaskVo> selectPage(AlgorithmTaskBo algorithmTaskBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(algorithmTaskBo);
+        queryWrapper.orderBy(ALGORITHM_TASK.CREATE_TIME,Boolean.FALSE);
             Page<AlgorithmTaskVo> page = this.pageAs(PageQuery.build(), queryWrapper, AlgorithmTaskVo.class);
         return PageResult.build(page);
     }

+ 3 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataAmplificationTaskServiceImpl.java

@@ -12,11 +12,11 @@ import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.orm.core.page.PageQuery;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 
@@ -54,12 +54,14 @@ public class DataAmplificationTaskServiceImpl extends BaseServiceImpl<DataAmplif
     @Override
     public List<DataAmplificationTaskVo> selectList(DataAmplificationTaskBo taskBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(taskBo);
+        queryWrapper.orderBy(DATA_AMPLIFICATION_TASK.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, DataAmplificationTaskVo.class);
     }
 
     @Override
     public PageResult<DataAmplificationTaskVo> selectPage(DataAmplificationTaskBo taskBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(taskBo);
+        queryWrapper.orderBy(DATA_AMPLIFICATION_TASK.CREATE_TIME,Boolean.FALSE);
         Page<DataAmplificationTaskVo> page = this.pageAs(PageQuery.build(), queryWrapper, DataAmplificationTaskVo.class);
         return PageResult.build(page);
     }

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

@@ -134,6 +134,7 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
     @Override
     public List<DataAugmentationVo> selectList(DataAugmentationBo dataAugmentationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataAugmentationBo);
+        queryWrapper.orderBy(DATA_AUGMENTATION.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, DataAugmentationVo.class);
     }
 
@@ -146,6 +147,7 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
     @Override
     public PageResult<DataAugmentationVo> selectPage(DataAugmentationBo dataAugmentationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataAugmentationBo);
+        queryWrapper.orderBy(DATA_AUGMENTATION.CREATE_TIME,Boolean.FALSE);
         Page<DataAugmentationVo> page = this.pageAs(PageQuery.build(), queryWrapper, DataAugmentationVo.class);
         return PageResult.build(page);
     }
@@ -153,6 +155,7 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
     @Override
     public PageResult<DataAugmentationVo> selectPage1(DataAugmentationBo dataAugmentationBo, String type) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataAugmentationBo);
+        queryWrapper.orderBy(DATA_AUGMENTATION.CREATE_TIME,Boolean.FALSE);
         if ("dataAugmentation".equals(type)) {
             queryWrapper.and(wrapper -> {
                 wrapper.or(orWrapper -> {

+ 13 - 11
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/DataSeqServiceImpl.java

@@ -4,21 +4,21 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
+import com.taais.biz.domain.DataSeq;
+import com.taais.biz.domain.bo.DataSeqBo;
+import com.taais.biz.domain.vo.DataSeqVo;
+import com.taais.biz.mapper.DataSeqMapper;
+import com.taais.biz.service.IDataSeqService;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.system.domain.vo.SysOssVo;
 import com.taais.system.service.ISysOssService;
@@ -26,11 +26,11 @@ import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.DataSeqMapper;
-import com.taais.biz.domain.DataSeq;
-import com.taais.biz.domain.bo.DataSeqBo;
-import com.taais.biz.domain.vo.DataSeqVo;
-import com.taais.biz.service.IDataSeqService;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import static com.taais.biz.domain.table.DataSeqTableDef.DATA_SEQ;
 import static com.taais.biz.utils.ZipUtils.unzip;
@@ -94,6 +94,7 @@ public class DataSeqServiceImpl extends BaseServiceImpl<DataSeqMapper, DataSeq>
     @Override
     public List<DataSeqVo> selectList(DataSeqBo dataSeqBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataSeqBo);
+        queryWrapper.orderBy(DATA_SEQ.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, DataSeqVo.class);
     }
 
@@ -106,6 +107,7 @@ public class DataSeqServiceImpl extends BaseServiceImpl<DataSeqMapper, DataSeq>
     @Override
     public PageResult<DataSeqVo> selectPage(DataSeqBo dataSeqBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataSeqBo);
+        queryWrapper.orderBy(DATA_SEQ.CREATE_TIME,Boolean.FALSE);
         Page<DataSeqVo> page = this.pageAs(PageQuery.build(), queryWrapper, DataSeqVo.class);
         return PageResult.build(page);
     }

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

@@ -1,7 +1,5 @@
 package com.taais.biz.service.impl;
 
-import java.util.Date;
-
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -13,8 +11,8 @@ import com.taais.biz.domain.Data;
 import com.taais.biz.domain.DataAmplificationTask;
 import com.taais.biz.domain.bo.DataAmplificationTaskBo;
 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.DataAmplificationTaskVo;
 import com.taais.biz.domain.vo.DataSelectVo;
 import com.taais.biz.domain.vo.DataVo;
@@ -56,7 +54,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;
 
@@ -155,6 +152,7 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
     @Override
     public List<DataVo> selectList(DataBo dataBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataBo);
+        queryWrapper.orderBy(DATA.ID,Boolean.FALSE);
         return this.listAs(queryWrapper, DataVo.class);
     }
 
@@ -350,6 +348,7 @@ public class DataServiceImpl extends BaseServiceImpl<DataMapper, Data> implement
     @Override
     public PageResult<DataVo> selectPage(DataBo dataBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(dataBo);
+        queryWrapper.orderBy(DATA.ID,Boolean.FALSE);
         Page<DataVo> page = this.pageAs(PageQuery.build(), queryWrapper, DataVo.class);
         return PageResult.build(page);
     }

+ 6 - 7
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/ObjectTraceMergeServiceImpl.java

@@ -1,28 +1,25 @@
 package com.taais.biz.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.domain.ObjectTraceMerge;
 import com.taais.biz.domain.bo.ObjectTraceMergeBo;
-import com.taais.biz.domain.bo.TargetIdentificationSubtaskDetailsBo;
 import com.taais.biz.domain.vo.ObjectTraceMergeVo;
 import com.taais.biz.mapper.ObjectTraceMergeMapper;
 import com.taais.biz.service.IObjectTraceMergeService;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
-import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
+import java.util.List;
+
 import static com.taais.biz.domain.table.ObjectTraceMergeTableDef.OBJECT_TRACE_MERGE;
-import static com.taais.biz.domain.table.TargetIdentificationSubtaskDetailsTableDef.TARGET_IDENTIFICATION_SUBTASK_DETAILS;
 
 /**
  * 多物体融合轨迹识别Service业务层处理
@@ -88,6 +85,7 @@ public class ObjectTraceMergeServiceImpl extends BaseServiceImpl<ObjectTraceMerg
     @Override
     public List<ObjectTraceMergeVo> selectList(ObjectTraceMergeBo objectTraceMergeBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(objectTraceMergeBo);
+        queryWrapper.orderBy(OBJECT_TRACE_MERGE.CREATE_TIME,Boolean.FALSE);
             return this.listAs(queryWrapper, ObjectTraceMergeVo.class);
     }
 
@@ -100,6 +98,7 @@ public class ObjectTraceMergeServiceImpl extends BaseServiceImpl<ObjectTraceMerg
     @Override
     public PageResult<ObjectTraceMergeVo> selectPage(ObjectTraceMergeBo objectTraceMergeBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(objectTraceMergeBo);
+        queryWrapper.orderBy(OBJECT_TRACE_MERGE.CREATE_TIME,Boolean.FALSE);
             Page<ObjectTraceMergeVo> page = this.pageAs(PageQuery.build(), queryWrapper, ObjectTraceMergeVo.class);
         return PageResult.build(page);
     }

+ 18 - 18
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetDetectionServiceImpl.java

@@ -4,30 +4,27 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.DecimalFormat;
-import java.util.*;
-
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
 import com.taais.biz.domain.*;
-import com.taais.biz.domain.vo.*;
+import com.taais.biz.domain.bo.TargetDetectionBo;
+import com.taais.biz.domain.vo.AlgorithmConfigTrackVo;
+import com.taais.biz.domain.vo.AlgorithmModelTrackVo;
+import com.taais.biz.domain.vo.StartTaskConfig;
+import com.taais.biz.domain.vo.TargetDetectionVo;
+import com.taais.biz.mapper.TargetDetectionMapper;
+import com.taais.biz.service.ITargetDetectionService;
 import com.taais.biz.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.common.websocket.utils.WebSocketUtils;
 import com.taais.system.domain.vo.SysOssVo;
@@ -41,17 +38,18 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.TargetDetectionMapper;
-import com.taais.biz.domain.bo.TargetDetectionBo;
-import com.taais.biz.service.ITargetDetectionService;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.DecimalFormat;
+import java.util.*;
 
 import static com.taais.biz.constant.BizConstant.VideoStatus.NOT_START;
 import static com.taais.biz.domain.table.TargetDetectionTableDef.TARGET_DETECTION;
 import static com.taais.biz.service.impl.ToInfraredServiceImpl.readLogContent;
 import static com.taais.biz.service.impl.VideoStableServiceImpl.*;
-import static com.taais.biz.service.impl.VideoStableServiceImpl.sendPostMsg;
-
-import com.alibaba.fastjson2.JSON;
 
 /**
  * 目标检测Service业务层处理
@@ -122,6 +120,7 @@ public class TargetDetectionServiceImpl extends BaseServiceImpl<TargetDetectionM
     @Override
     public List<TargetDetectionVo> selectList(TargetDetectionBo targetDetectionBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(targetDetectionBo);
+        queryWrapper.orderBy(TARGET_DETECTION.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, TargetDetectionVo.class);
     }
 
@@ -134,6 +133,7 @@ public class TargetDetectionServiceImpl extends BaseServiceImpl<TargetDetectionM
     @Override
     public PageResult<TargetDetectionVo> selectPage(TargetDetectionBo targetDetectionBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(targetDetectionBo);
+        queryWrapper.orderBy(TARGET_DETECTION.CREATE_TIME,Boolean.FALSE);
         Page<TargetDetectionVo> page = this.pageAs(PageQuery.build(), queryWrapper, TargetDetectionVo.class);
         page.getRecords().forEach(entity -> {
             Long modelId = entity.getAlgorithmModelId();

+ 13 - 14
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/ToInfraredServiceImpl.java

@@ -4,22 +4,11 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.DecimalFormat;
-import java.util.*;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
 import com.taais.biz.domain.*;
-import com.taais.biz.domain.ToInfrared;
 import com.taais.biz.domain.bo.ToInfraredBo;
 import com.taais.biz.domain.vo.AlgorithmConfigTrackVo;
 import com.taais.biz.domain.vo.AlgorithmModelTrackVo;
@@ -31,11 +20,12 @@ import com.taais.biz.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
+import com.taais.common.websocket.utils.WebSocketUtils;
 import com.taais.system.domain.vo.SysOssVo;
 import com.taais.system.service.ISysOssService;
 import jakarta.annotation.Resource;
@@ -49,12 +39,19 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.DecimalFormat;
+import java.util.*;
+
 import static com.taais.biz.constant.BizConstant.VideoStatus.NOT_START;
 import static com.taais.biz.domain.table.ToInfraredTableDef.TO_INFRARED;
 import static com.taais.biz.service.impl.DataSeqServiceImpl.calculateImagePath;
-import static com.taais.biz.service.impl.DataSeqServiceImpl.isImageFile;
 import static com.taais.biz.service.impl.VideoStableServiceImpl.*;
-import com.taais.common.websocket.utils.WebSocketUtils;
 
 /**
  * 可见光转红外Service业务层处理
@@ -138,6 +135,7 @@ public class ToInfraredServiceImpl extends BaseServiceImpl<ToInfraredMapper, ToI
     @Override
     public List<ToInfraredVo> selectList(ToInfraredBo toInfraredBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(toInfraredBo);
+        queryWrapper.orderBy(TO_INFRARED.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, ToInfraredVo.class);
     }
 
@@ -150,6 +148,7 @@ public class ToInfraredServiceImpl extends BaseServiceImpl<ToInfraredMapper, ToI
     @Override
     public PageResult<ToInfraredVo> selectPage(ToInfraredBo toInfraredBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(toInfraredBo);
+        queryWrapper.orderBy(TO_INFRARED.CREATE_TIME,Boolean.FALSE);
         Page<ToInfraredVo> page = this.pageAs(PageQuery.build(), queryWrapper, ToInfraredVo.class);
         page.getRecords().forEach(entity -> {
             Long modelId = entity.getAlgorithmModelId();

+ 17 - 13
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TrackSequenceServiceImpl.java

@@ -4,29 +4,28 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.DecimalFormat;
-import java.util.*;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
 import com.taais.biz.domain.*;
-import com.taais.biz.domain.vo.*;
+import com.taais.biz.domain.bo.TrackSequenceBo;
+import com.taais.biz.domain.vo.AlgorithmConfigTrackVo;
+import com.taais.biz.domain.vo.AlgorithmModelTrackVo;
+import com.taais.biz.domain.vo.StartTaskConfig;
+import com.taais.biz.domain.vo.TrackSequenceVo;
+import com.taais.biz.mapper.TrackSequenceMapper;
+import com.taais.biz.service.ITrackSequenceService;
 import com.taais.biz.utils.CsvReadUtils;
 import com.taais.biz.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.common.websocket.utils.WebSocketUtils;
 import com.taais.system.domain.vo.SysOssVo;
@@ -41,9 +40,13 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.TrackSequenceMapper;
-import com.taais.biz.domain.bo.TrackSequenceBo;
-import com.taais.biz.service.ITrackSequenceService;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.DecimalFormat;
+import java.util.*;
 
 import static com.taais.biz.constant.BizConstant.VideoStatus.NOT_START;
 import static com.taais.biz.domain.table.TrackSequenceTableDef.TRACK_SEQUENCE;
@@ -52,7 +55,6 @@ import static com.taais.biz.service.impl.TargetDetectionServiceImpl.port;
 import static com.taais.biz.service.impl.ToInfraredServiceImpl.getCompareImage;
 import static com.taais.biz.service.impl.ToInfraredServiceImpl.readLogContent;
 import static com.taais.biz.service.impl.VideoStableServiceImpl.*;
-import static com.taais.biz.service.impl.VideoStableServiceImpl.makeDir;
 
 /**
  * 注视轨迹序列Service业务层处理
@@ -124,6 +126,7 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
     @Override
     public List<TrackSequenceVo> selectList(TrackSequenceBo trackSequenceBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(trackSequenceBo);
+        queryWrapper.orderBy(TRACK_SEQUENCE.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, TrackSequenceVo.class);
     }
 
@@ -136,6 +139,7 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
     @Override
     public PageResult<TrackSequenceVo> selectPage(TrackSequenceBo trackSequenceBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(trackSequenceBo);
+        queryWrapper.orderBy(TRACK_SEQUENCE.CREATE_TIME,Boolean.FALSE);
         Page<TrackSequenceVo> page = this.pageAs(PageQuery.build(), queryWrapper, TrackSequenceVo.class);
         page.getRecords().forEach(entity -> {
             Long modelId = entity.getAlgorithmModelId();

+ 13 - 14
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/Video2imageServiceImpl.java

@@ -4,15 +4,6 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -21,12 +12,14 @@ import com.taais.biz.domain.bo.Video2imageBo;
 import com.taais.biz.domain.vo.Video2imageVo;
 import com.taais.biz.mapper.Video2imageMapper;
 import com.taais.biz.service.IVideo2imageService;
+import com.taais.biz.utils.VideoCapture;
+import com.taais.biz.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.common.websocket.utils.WebSocketUtils;
 import com.taais.system.domain.vo.SysOssVo;
@@ -41,14 +34,18 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.taais.biz.constant.BizConstant.UPLOAD_DIR;
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import static com.taais.biz.constant.BizConstant.VideoStatus.*;
 import static com.taais.biz.domain.table.Video2imageTableDef.VIDEO2IMAGE;
 import static com.taais.biz.service.impl.VideoStableServiceImpl.removeFileExtension;
 
-import com.taais.biz.utils.VideoCapture;
-import com.taais.biz.utils.ZipUtils;
-
 /**
  * 视频转图片 Service业务层处理
  *
@@ -115,6 +112,7 @@ public class Video2imageServiceImpl extends BaseServiceImpl<Video2imageMapper, V
     @Override
     public List<Video2imageVo> selectList(Video2imageBo video2imageBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(video2imageBo);
+        queryWrapper.orderBy(VIDEO2IMAGE.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, Video2imageVo.class);
     }
 
@@ -127,6 +125,7 @@ public class Video2imageServiceImpl extends BaseServiceImpl<Video2imageMapper, V
     @Override
     public PageResult<Video2imageVo> selectPage(Video2imageBo video2imageBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(video2imageBo);
+        queryWrapper.orderBy(VIDEO2IMAGE.CREATE_TIME,Boolean.FALSE);
         Page<Video2imageVo> page = this.pageAs(PageQuery.build(), queryWrapper, Video2imageVo.class);
         return PageResult.build(page);
     }

+ 14 - 13
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/VideoStableServiceImpl.java

@@ -4,36 +4,35 @@
 
 package com.taais.biz.service.impl;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.constant.BizConstant;
 import com.taais.biz.domain.HttpResponseEntity;
-import com.taais.biz.domain.ToInfrared;
+import com.taais.biz.domain.VideoStable;
+import com.taais.biz.domain.bo.VideoStableBo;
 import com.taais.biz.domain.bo.VideoStableStartResultBo;
+import com.taais.biz.domain.vo.VideoStableVo;
+import com.taais.biz.mapper.VideoStableMapper;
+import com.taais.biz.service.IVideoStableService;
 import com.taais.biz.utils.ZipUtils;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
 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.core.core.page.PageResult;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
 import com.taais.common.websocket.utils.WebSocketUtils;
 import com.taais.system.domain.vo.SysOssVo;
 import com.taais.system.service.ISysOssService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
@@ -41,11 +40,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.taais.biz.mapper.VideoStableMapper;
-import com.taais.biz.domain.VideoStable;
-import com.taais.biz.domain.bo.VideoStableBo;
-import com.taais.biz.domain.vo.VideoStableVo;
-import com.taais.biz.service.IVideoStableService;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
 
 import static com.taais.biz.domain.table.VideoStableTableDef.VIDEO_STABLE;
 import static com.taais.biz.service.impl.DataSeqServiceImpl.isImageFile;
@@ -112,6 +111,7 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
     @Override
     public List<VideoStableVo> selectList(VideoStableBo videoStableBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(videoStableBo);
+        queryWrapper.orderBy(VIDEO_STABLE.CREATE_TIME,Boolean.FALSE);
         return this.listAs(queryWrapper, VideoStableVo.class);
     }
 
@@ -124,6 +124,7 @@ public class VideoStableServiceImpl extends BaseServiceImpl<VideoStableMapper, V
     @Override
     public PageResult<VideoStableVo> selectPage(VideoStableBo videoStableBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(videoStableBo);
+        queryWrapper.orderBy(VIDEO_STABLE.CREATE_TIME,Boolean.FALSE);
         Page<VideoStableVo> page = this.pageAs(PageQuery.build(), queryWrapper, VideoStableVo.class);
         return PageResult.build(page);
     }