修改智能航线规划，修改南昌机场和西安机场人工接管时图片绑定图斑问题

rain

2024-07-06 3db92a6fff18c1591b298fa0bf8085dfcbdb6747

 src/main/java/com/dji/sample/patches/controller/PatchesController.java

@@ -4,13 +4,12 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.common.util.MinioUrlUtils;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.service.impl.FileServiceImpl;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.service.impl.ShpToDataSourceServiceImpl;
import com.dji.sample.patches.utils.DistrictCodeUtils;
import com.dji.sample.patches.utils.TimerUtil;
import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
@@ -28,6 +27,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

@@ -44,6 +45,8 @@
    private IWaylineJobService waylineJobService;
    @Autowired
    private TbDkjbxxServiceImpl tbDkjbxxService;
    @Autowired
    private FileServiceImpl fileService;
    @Autowired
    private TimerUtil timerUtil;

@@ -115,59 +118,56 @@
    @GetMapping("/getWayline")
    public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
        try {
            MultipartFile file = timerUtil.getFile(waylineName, list);
            MultipartFile file = timerUtil.getFile(waylineName, list, 25.8917266,116.020940643);
            return ResponseResult.success(file);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }

    @PostMapping("/patchesToWayline")
    public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
                                           @RequestParam String waylineName,
                                           @RequestParam String workspaceId,
                                           HttpServletRequest request) throws IOException {
        CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
        String creator = customClaim.getUsername();
        MultipartFile file = timerUtil.getFile(waylineName, list);
        waylineFileService.importKmzFileBack(file, workspaceId, creator);
        WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
        Map<String, String> infoMap = new HashMap<>();
        URL url = null;
        try {
            url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
            infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
            infoMap.put("waylineId", entity.getWaylineId());
        } catch (SQLException e) {
            throw new RuntimeException(e);

        @PostMapping("/patchesToWayline")
        public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
                                               @RequestParam String waylineName,
                                               @RequestParam String spotInFreckle,
                                               @RequestParam String workspaceId,
                                               @RequestParam String patchesId,
                                               @RequestParam double lat,
                                               @RequestParam double lon,
                                               HttpServletRequest request) throws IOException {
            CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
            String creator = customClaim.getUsername();
            MultipartFile file = timerUtil.getFile(waylineName, lotInfos, lat, lon);
            waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, spotInFreckle);
            WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
            Map<String, String> infoMap = new HashMap<>();
            URL url = null;
            try {
                url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
                infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
                infoMap.put("waylineId", entity.getWaylineId());
            } catch (SQLException e) {
                throw new RuntimeException(e);
            }
            return ResponseResult.success(infoMap);
        }
        return ResponseResult.success(infoMap);



    @GetMapping ("/tests")
    public ResponseResult use()  {
            ExecutorService executor = Executors.newSingleThreadExecutor();
            executor.execute(() -> {
                try {
                    timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
                            "635148ea-0ddb-4b23-945c-8a67abd813c9");
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
            });
            executor.shutdown();
            return ResponseResult.success();
    }

    @GetMapping("/useMyTask")
    public ResponseResult useMyTask() throws Exception {
        try {
//            timerUtil.myTask();
//            timerUtil.myTask2();
//            timerUtil.myTask3();
            timerUtil.mytask4();

        } catch (Exception e) {
            throw new RuntimeException("db存储发送出现异常" + e);
        }
        return ResponseResult.success();
    }

    //    @GetMapping ("/tests")
//    public ResponseResult use()  {
//        try {
//            TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240613/205621_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
//                    "635148ea-0ddb-4b23-945c-8a67abd813c9");
//        } catch (IOException e) {
//            throw new RuntimeException(e);
//        }
//        return ResponseResult.success();
//    }
    @PostMapping("/way")
    public void getway(@RequestParam("file") MultipartFile file,
                       @RequestParam String workspaceId,
@@ -190,7 +190,9 @@
                                                                           @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
                                                                           @RequestParam String workspaceId,
                                                                           @RequestParam String dkbh) {

        try {
            fileService.getNoaddFile();
            PatchesParam param = PatchesParam.builder()
                    .page(page)
                    .workspaceId(workspaceId)