aix
2024-07-09 2aaaaf4598b869085ae35871de018cd35847c232
src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -4,14 +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;
@@ -70,6 +68,7 @@
                                                        @RequestParam(name = "xmc", required = false) String xmc,
                                                        @RequestParam(name = "investigate", required = false) Integer investigate
    ) {
        fileService.getNoaddFile();
        //调用service分页查询
        PatchesParam param = PatchesParam.builder()
                .page(page)
@@ -120,34 +119,39 @@
    @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("/useMyTask")
    public ResponseResult useMyTask() throws Exception {
@@ -166,7 +170,7 @@
        return ResponseResult.success();
    }
        @GetMapping ("/tests")
    @GetMapping ("/tests")
    public ResponseResult use()  {
            ExecutorService executor = Executors.newSingleThreadExecutor();
            executor.execute(() -> {
@@ -204,7 +208,6 @@
                                                                           @RequestParam String dkbh) {
        try {
            fileService.getNoaddFile();
            PatchesParam param = PatchesParam.builder()
                    .page(page)
                    .workspaceId(workspaceId)