|
@@ -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();
|