|
@@ -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)){
|