add offline queue3

720yun_fd_manage/src/main/java/com/gis/controller/AgeController.java

@@ -1,9 +1,9 @@
 package com.gis.controller;
 
+import cn.hutool.core.util.ObjUtil;
+import com.gis.common.mq.RabbitMqProducerUtil;
 import com.gis.common.util.Result;
-import com.gis.domain.dto.AgePageDto;
-import com.gis.domain.dto.ReportDto;
-import com.gis.domain.dto.UserTrentDto;
+import com.gis.domain.dto.*;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.domain.po.ReportPo;
 import com.gis.service.ReportService;
@@ -13,9 +13,13 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by owen on 2022/6/28 0028 16:56
@@ -33,7 +37,13 @@ public class AgeController {
     @Autowired
     ReportService reportService;
 
-
+    @Value("${queue.qjkk-work-offline}")
+    String workOffline;
+    /** 服务器文件地址*/
+    @Value("${server.file.path}")
+    public  String serverBasePath;
+    @Autowired
+    RabbitMqProducerUtil rabbitMqProducerUtil;
     /**
      * 获取所有场景
      * 使用超级管理员权限的
@@ -87,7 +97,62 @@ public class AgeController {
         po.setPoType("work");
         return reportService.workTrend(po);
     }
+    /*
+     * @Description:离线包下载
+     * @Param:
+     **/
+    @ApiOperation(value = "v2.0.0-下载离线包", notes = "")
+    @PostMapping("/downloadOffline")
+    public Result downloadOffline(@RequestBody WorkDto dto) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("workId", dto.getId());
+        rabbitMqProducerUtil.sendByWorkQueue(workOffline,map);
+        return Result.success();
+    }
+
+    /*
+     * @Description:离线包下载
+     * @Param:
+     **/
+    @ApiOperation(value = "v2.0.0-开始下载离线包重置状态", notes = "")
+    @PostMapping("/UpdateDownloadOfflineStatus")
+    public Result UpdateDownloadOfflineStatus(@RequestBody WorkDto dto) {
+        return Result.success(workService.updateOfflineStatus(dto.getId(),1));
+    }
 
+    /*
+     * @Description:离线包下载
+     * @Param:
+     **/
+    @ApiOperation(value = "v2.0.0-下载离线包详情", notes = "")
+    @PostMapping("/getOfflineDetail")
+    public Result getOfflineDetail(@RequestBody WorkDto dto) {
+        WorkEntity workEntity = workService.getById(dto.getId());
+        WorkOfflineDetailDTO detailDTO=new WorkOfflineDetailDTO();
+        //切图状态：-1失败 0未生成 1排队中 2生成中 3生成成功
+        if (ObjUtil.isNotNull(workEntity)){
+            //初次 进来返回 路径
+            if  (workEntity.getOfflineStatus()==0){
+                String basePath=serverBasePath+
+                        File.separator+"offlineData"+
+                        File.separator+dto.getId();
+                detailDTO.setPath(basePath);
+            }else if (workEntity.getOfflineStatus()==1){
+                detailDTO.setProgress(0);
+            }else if (workEntity.getOfflineStatus()==2){
+                //从redis获取生成进度
+                detailDTO.setProgress(10);
+            }else if (workEntity.getOfflineStatus()==3){
+                //从redis获取生成进度
+                detailDTO.setProgress(100);
+                detailDTO.setUrl(workEntity.getOfflineUrl());
+            }
+
+
+        }
+
+        return Result.success(detailDTO);
+    }
 //    @ApiOperation(value = "v1.3-解密并发测试")
 //    @GetMapping("/decode")
 //    public Result decode()  {

720yun_fd_manage/src/main/java/com/gis/controller/WorkController.java

@@ -64,11 +64,6 @@ public class WorkController extends BaseController {
     @Resource
     FdkkClient fdkkClient;
 
-    @Value("${queue.qjkk-work-offline}")
-    String workOffline;
-    /** 服务器文件地址*/
-    @Value("${server.file.path}")
-    public  String serverBasePath;
     @ApiOperation(value = "列表", position = 1)
     @PostMapping("list")
     public Result<WorkEntity> list(@RequestBody AgePageDto param) {
@@ -241,61 +236,6 @@ public class WorkController extends BaseController {
         return workService.delOss(ossPath);
     }
 
-    /*
-        * @Description:离线包下载
-        * @Param:
-    **/
-    @ApiOperation(value = "v2.0.0-下载离线包", notes = "")
-    @PostMapping("/downloadOffline")
-    public Result downloadOffline(@RequestBody WorkDto dto) {
-        Map<String,Object> map=new HashMap<>();
-        map.put("workId", dto.getId());
-        rabbitMqProducerUtil.sendByWorkQueue(workOffline,map);
-        return Result.success();
-    }
-
-    /*
-     * @Description:离线包下载
-     * @Param:
-     **/
-    @ApiOperation(value = "v2.0.0-开始下载离线包重置状态", notes = "")
-    @PostMapping("/UpdateDownloadOfflineStatus")
-    public Result UpdateDownloadOfflineStatus(@RequestBody WorkDto dto) {
-        return Result.success(workService.updateOfflineStatus(dto.getId(),1));
-    }
-
-    /*
-     * @Description:离线包下载
-     * @Param:
-     **/
-    @ApiOperation(value = "v2.0.0-下载离线包详情", notes = "")
-    @PostMapping("/getOfflineDetail")
-    public Result getOfflineDetail(@RequestBody WorkDto dto) {
-        WorkEntity workEntity = workService.getById(dto.getId());
-        WorkOfflineDetailDTO detailDTO=new WorkOfflineDetailDTO();
-        //切图状态：-1失败 0未生成 1排队中 2生成中 3生成成功
-        if (ObjUtil.isNotNull(workEntity)){
-            //初次 进来返回 路径
-            if  (workEntity.getOfflineStatus()==0){
-                String basePath=serverBasePath+
-                        File.separator+"offlineData"+
-                        File.separator+dto.getId();
-                detailDTO.setPath(basePath);
-            }else if (workEntity.getOfflineStatus()==1){
-                detailDTO.setProgress(0);
-            }else if (workEntity.getOfflineStatus()==2){
-                //从redis获取生成进度
-                detailDTO.setProgress(10);
-            }else if (workEntity.getOfflineStatus()==3){
-                //从redis获取生成进度
-                detailDTO.setProgress(100);
-                detailDTO.setUrl(workEntity.getOfflineUrl());
-            }
-
 
-        }
-
-        return Result.success(detailDTO);
-    }
 
 }