Selaa lähdekoodia

add offline queue3

xiewj 3 kuukautta sitten
vanhempi
commit
0d94dd9843

+ 3 - 0
720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkOfflineDetailDTO.java

@@ -2,6 +2,8 @@ package com.gis.domain.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author Xiewj
  * @date 2024/4/3
@@ -17,5 +19,6 @@ public class WorkOfflineDetailDTO {
 
     private String url;
 
+    private List<String> sceneCodes;
 
 }

+ 2 - 0
720yun_fd_base/gis_service/src/main/java/com/gis/service/WorkNavigationService.java

@@ -25,4 +25,6 @@ public interface WorkNavigationService extends IService<WorkNavigationEntity> {
     void removeByWorkId(String workId);
 
     WorkNavigationEntity selectByWorkIdAndSomeDataSceneCode(String workId, String sceneCode);
+
+    List<String> selectListByWorkId(String workId);
 }

+ 10 - 3
720yun_fd_base/gis_service/src/main/java/com/gis/service/impl/WorkNavigationServiceImpl.java

@@ -11,9 +11,7 @@ import com.gis.service.WorkNavigationService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -87,4 +85,13 @@ public class WorkNavigationServiceImpl extends ServiceImpl<WorkNavigationMapper,
     public WorkNavigationEntity selectByWorkIdAndSomeDataSceneCode(String workId, String sceneCode) {
         return this.getOne(new LambdaQueryWrapper<WorkNavigationEntity>().eq(WorkNavigationEntity::getWorkId, workId).eq(WorkNavigationEntity::getSceneCode, sceneCode));
     }
+
+    @Override
+    public List<String> selectListByWorkId(String workId) {
+        if (Objects.isNull(workId)){
+            return Collections.emptyList();
+        }else {
+            return selectByWorkId(workId).stream().map(WorkNavigationEntity::getSceneCode).collect(Collectors.toList());
+        }
+    }
 }

+ 6 - 2
720yun_fd_manage/src/main/java/com/gis/controller/AgeController.java

@@ -9,6 +9,7 @@ import com.gis.domain.dto.*;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.domain.po.ReportPo;
 import com.gis.service.ReportService;
+import com.gis.service.WorkNavigationService;
 import com.gis.service.WorkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,6 +49,8 @@ public class AgeController {
     @Autowired
     RabbitMqProducerUtil rabbitMqProducerUtil;
 
+    @Autowired
+    WorkNavigationService workNavigationService;
 
     @Autowired
     RedisUtil redisUtil;
@@ -141,11 +145,11 @@ public class AgeController {
         if (ObjUtil.isNotNull(workEntity)){
             //初次 进来返回 路径
             if  (workEntity.getOfflineStatus()==0 || workEntity.getOfflineStatus()==1){
-                String basePath=serverBasePath+
-                        File.separator+"offlineData"+
+                String basePath=serverBasePath+"offlineData"+
                         File.separator+dto.getWorkId();
                 detailDTO.setPath(basePath);
                 detailDTO.setProgress(0);
+                detailDTO.setSceneCodes(workNavigationService.selectListByWorkId( dto.getWorkId()));
             }else if (workEntity.getOfflineStatus()==2){
                 //从redis获取生成进度
                 if (redisUtil.hasKey(progressKey)){