Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-08-20 74d1c21ebb6b3b916904d95d13d289df23dcdedd

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

@@ -6,6 +6,7 @@
import com.dji.sample.common.util.MinioUrlUtils;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.service.impl.FileServiceImpl;
import com.dji.sample.patches.constant.FileSufConstant;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
@@ -255,6 +256,10 @@
                                 @RequestParam double airportLat,
                                 @RequestParam double airportLon,
                                 HttpServletRequest request) throws Exception {
        // 检查格式是否正确
        if(!checkFileType(file.getOriginalFilename())){
            throw new RuntimeException("文件格式异常");
        }
        CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
        String creator = customClaim.getUsername();
        MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon, creator);
@@ -272,6 +277,22 @@
        return ResponseResult.success(infoMap);
    }

    /**
     * 检查文件格式是否正确
     * @param originalFilename
     * @return
     */
    private boolean checkFileType(String originalFilename) {
        if (originalFilename.endsWith(FileSufConstant.FILE_SUFFIX_ZIP) ||
                originalFilename.endsWith(FileSufConstant.FILE_SUFFIX_KML) ||
                originalFilename.endsWith(FileSufConstant.FILE_SUFFIX_KMZ)
        ){
            return true;
        }
        // 返回
        return false;
    }

    @GetMapping("/getExcel")
    public ResponseEntity<byte[]> exportExcel(@RequestParam String ids) {
//        List<LotInfo> lotInfos = getPatchesService.listLotinfo(workspaceId);