完善定时器，修改相关信息

rain

2024-05-14 5c288f2960d4256e1a5cfff37dcc976e62bd86ce

完善定时器，修改相关信息

 src/main/java/com/dji/sample/patches/utils/TimerUtil.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.media.dao.IFileMapper;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
@@ -28,6 +29,8 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;

import javax.xml.transform.Result;
import java.nio.file.StandardCopyOption;
import java.time.LocalDateTime;

import java.io.*;
@@ -38,6 +41,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.SQLException;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -68,43 +72,59 @@
    @Autowired
    private TerritoryConfigPojo territoryConfigPojo;


    /**
     * 定时
     * 定时器，将没有规划的图斑生成航线，并将航线飞完后的成果数据进行保存推送
     *
     * @throws IOException
     * @throws SQLException
     */
    @Scheduled(cron = "45 1 16 * * ?")
    @Scheduled(cron = "0 0 0 * * ?")
    public void myTask() throws Exception {
        String taskId="";
        String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
        //获取未规划的图斑集合
//        List<List<LotInfo>> lists = getNoPlan();
//        List<List<LotInfo>> convertedLists = convertToLists(lists);
//        for (List<LotInfo> list : convertedLists) {
//            long timestamp = System.currentTimeMillis();
//            String waylineName = "云飞行调查" + timestamp;
//            //根据获取的图斑集合获得kmz航线文件
//            MultipartFile multipartFile = getFile(waylineName, list);
//            //上传航线文件
//            String waylineId = backWayline(multipartFile, waylineName, workspaceId, backclaim().getUsername());
//            //将为规划的图斑状态更新为已规划
//            updatePatchesStatu(list);
//            //调用publshFlightTask方法创建定时任务
//            waylineJobService.publishFlightTask(JobParam(waylineId), backclaim());
//        }
        List<List<LotInfo>> lists = getNoPlan();
        List<List<LotInfo>> convertedLists = convertToLists(lists);
        for (List<LotInfo> list : convertedLists) {
            long timestamp = System.currentTimeMillis();
            String waylineName = "云飞行调查" + timestamp;
            //根据获取的图斑集合获得kmz航线文件
            MultipartFile multipartFile = getFile(waylineName, list);
            //上传航线文件
            backWayline(multipartFile, waylineName, workspaceId, backclaim().getUsername());
            //将为规划的图斑状态更新为已规划
            updatePatchesStatu(list);
        }
        List<List<MediaFileEntity>> list = getNoadd();
        List<List<MediaFileEntity>> media = convertToLists(list);
        for (int i = 0; i < media.size(); i++) {
        List<List<MediaFileEntity>> medias = convertToLists(list);
        for (List<MediaFileEntity> media : medias) {
            //清空FJ表
            tbFJService.deleteData();
            String dkbh = getDkbh(media.get(i).get(i).getFileName());
            String taskId = getTaskId(media.get(i).get(i).getFileName());
            for (MediaFileEntity mediaFile : media) {
                //获取媒体文件名里的dkbh和taskId
                String dkbh = getDkbh(mediaFile.getFileName());
                taskId = getTaskId(mediaFile.getFileName());
                //获取该媒体文件的图斑信息
            LotInfo lotInfo = getPatchesService.getLotinfo(dkbh, workspaceId);
            tbFJService.insertData(media.get(i), lotInfo);
            updateMediaStatu(media.get(i));
                tbFJService.insertOneData(mediaFile, lotInfo);
                //更新媒体文件的是否添加状态
                updateMediaStatu(mediaFile);

            }
            dbSave(territoryConfigPojo.getResult(), territoryConfigPojo.getResultsave(), taskId);
            //发送请求给第三方接口
            sendPostWithFileAndParameter(territoryConfigPojo.getResult(), taskId);
        }
    }

    /**
     * 创建航线
     * @param waylineName
     * @param list
     * @return
     * @throws IOException
     */
    public MultipartFile getFile(String waylineName, List<LotInfo> list) throws IOException {
        List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, 28.62703, 115.867719);
        XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
@@ -115,6 +135,14 @@
        return convert(new File(destKMZFile));
    }

    /**
     * 将航线上传Oss
     * @param multipartFile
     * @param waylineName
     * @param workspaceId
     * @param username
     * @return
     */
    public String backWayline(MultipartFile multipartFile, String waylineName, String workspaceId, String username) {
        waylineFileService.importKmzFile(multipartFile, workspaceId, username);
        WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
@@ -153,11 +181,9 @@
        }
    }

    public void updateMediaStatu(List<MediaFileEntity> list) {
        for (MediaFileEntity mediaFile : list) {
    public void updateMediaStatu(MediaFileEntity mediaFile) {
            mediaFile.setIsadd(1);
            fileMapper.updateById(mediaFile);
        }
    }

    public List<List<MediaFileEntity>> getNoadd() {
@@ -165,29 +191,6 @@
                .eq(MediaFileEntity::getIsadd, 0).like(MediaFileEntity::getFileName, "~"));
        List<List<MediaFileEntity>> groupedFilenames = groupTasks(list);
        return groupedFilenames;
    }

    public CreateJobParam JobParam(String waylineId) {
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(177271980L); // 添加整数值
        listOfLists.add(sublist);
        List<Long> list = new ArrayList<>();
        list.add(177271980L);
        CreateJobParam param = new CreateJobParam();
        param.setName("云飞行调查");
        param.setTaskType(TIMED);
        param.setOutOfControlAction(0);
        param.setRepFreType(3);
        param.setRepFreVal(1);
        param.setRepRuleType(1);
        param.setRthAltitude(80);
        param.setWaylineType(WAYPOINT);
        param.setTaskPeriods(listOfLists);
        param.setTaskDays(list);
        param.setFileId(waylineId);
        param.setDockSn("4TADKCMB010016");
        return param;
    }

    public CustomClaim backclaim() {
@@ -221,7 +224,7 @@
        return new ArrayList<>(groupedTasks.values());
    }

    // 从filename字段中提取任务ID（假设任务ID在文件名中以"~"开头、"."结尾）
    // 从filename字段中提取任务ID（任务ID在文件名中以"~"开头、"."结尾）
    public static String getTaskId(String filename) {
        // 这里只是一个示例，你需要根据实际情况编写提取task_id的逻辑
        int startIndex = filename.indexOf("~") + 1;
@@ -236,6 +239,12 @@
        return filename.substring(startIndex, endIndex);
    }

    /**
     * 将成果发送post请求到第三方接口
     * @param filePath
     * @param taskId
     * @throws IOException
     */
    public static void sendPostWithFileAndParameter(String filePath, String taskId) throws IOException {
        // 创建 RestTemplate 实例
        RestTemplate restTemplate = new RestTemplate();
@@ -249,20 +258,19 @@
        // 设置请求头
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.MULTIPART_FORM_DATA);

        headers.set("X-SHARE-TOKEN", "981D9B822A9A09DE28B66243AA330DC666E1A82826B58EC3FE63FEB1EC8AA190");
        headers.set("X-SHARE-AK", "gwc952d483-bfe5-476b-8431-ae15fe94c006");

        // 构建请求实体
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(body, headers);

        // 发送请求
        ResponseEntity<String> response = restTemplate.exchange(
                "http://localhost:6789/territory/tbdkjbxx/upload",
                ResponseEntity<String> result=restTemplate.exchange(
                "http://39.98.48.180:8087/landCloudWork/artifact/media/upload.action",
//                "http://localhost:6789/territory/tbdkjbxx/upload",
                HttpMethod.POST,
                requestEntity,
                String.class);

        // 输出响应结果
        System.out.println("Response: " + response.getBody());
    }

    private static MultiValueMap<String, Object> buildRequestBody(String taskId, byte[] fileContent, String filePath) {
@@ -282,4 +290,59 @@
        return Files.readAllBytes(path);
    }

    /**
     * 将上传的db保存一份到本地
     * @param path
     * @param folder
     * @param taskId
     */
    public void dbSave(String path, String folder, String taskId) {
        String sourceFilePath = path; // 源文件路径
        String targetFolderPath = fileFold(folder).getPath(); // 目标文件夹路径

        try {
            // 创建目标文件夹
            File targetFolder = new File(targetFolderPath);
            if (!targetFolder.exists()) {
                targetFolder.mkdirs();
            }

            // 获取当前时间
            LocalDateTime currentTime = LocalDateTime.now();

            // 格式化时间，生成文件名
            String timeName = currentTime.format(DateTimeFormatter.ofPattern("HHmmss"));
            String fileName = timeName + "_" + taskId + ".db";
            // 构建目标文件路径
            String targetFilePath = targetFolderPath + File.separator + fileName;

            // 复制文件到目标文件夹
            Path sourcePath = Paths.get(sourceFilePath);
            Path targetPath = Paths.get(targetFilePath);
            Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
        } catch (IOException e) {
            throw new RuntimeException("Db文件复制失败", e); // 捕获并抛出原始异常
        }
    }

    private static File fileFold(String fold) {
        // 获取当前时间
        LocalDateTime currentTime = LocalDateTime.now();

        // 格式化时间，生成文件夹名字
        String folderName = currentTime.format(DateTimeFormatter.ofPattern("yyyyMMdd"));

        // 拼接文件夹路径
        String folderPath = fold + File.separator + folderName;

        // 创建文件夹
        File folder = new File(folderPath);
        if (!folder.exists()) {
            if (!folder.mkdirs()) {
                throw new RuntimeException("文件创建失败" + folderPath);
            }
        }
        return folder;
    }

}

 src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java

@@ -96,7 +96,7 @@

    @PostMapping("/uploadUrl")
    public ResponseResult uploadUrl( @RequestBody UploadUrlParam param){
        tbDkjbxxService.uploadUrl(param.getDbUrl());
        tbDkjbxxService.uploadUrl(param.getDbUrl(), param.getTaskName());
        String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
        List<TbDkjbxxEntity> list = tbDkjbxxService.list();
        shpToDataSourceService.savaInMysql(list, workspaceId,param.getTaskId(),param.getTaskName());

 src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java

@@ -56,4 +56,10 @@

    private String url;

    private int fjyskd;

    private int fjysgd;

    private String pstz;

}

 src/main/java/com/dji/sample/territory/pojo/TerritoryConfigPojo.java

@@ -19,4 +19,10 @@

    @Value("${db.sqlite.result}")
    private String result;
    @Value("${db.sqlite.resultSave}")
    private String resultsave;

    @Value("${db.sqlite.resourceSave}")
    private String resourcesave;

}

 src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java

@@ -29,6 +29,6 @@

    MultipartFile listFile(String workspaceId, String waylineName, double airportLat, double airportLon) throws IOException;

    ResponseResult uploadUrl(String url);
    ResponseResult uploadUrl(String url,String taskName);

}

 src/main/java/com/dji/sample/territory/service/ITbFJService.java

@@ -18,4 +18,5 @@
     */
    int insertData(List<MediaFileEntity> mediaFile, LotInfo lotInfo) throws Exception;
    void deleteData();
    void  insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception;
}

 src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java

@@ -9,6 +9,7 @@
import com.dji.sample.patches.utils.GeoToolsUtil;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.patches.utils.PointPO;
import com.dji.sample.patches.utils.TimerUtil;
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.dao.ITbDkjbxxMapper;
@@ -118,7 +119,7 @@
    }

    @Override
    public ResponseResult uploadUrl(String url) {
    public ResponseResult uploadUrl(String url,String taskName) {
        if (url.isEmpty()) {
            throw new IllegalArgumentException("上传文件为空");
        }
@@ -130,6 +131,8 @@
        } catch (IOException e) {
            System.out.println("下载文件时发生错误：" + e.getMessage());
        }
        TimerUtil util=new TimerUtil();
        util.dbSave(territoryConfigPojo.getResource(),territoryConfigPojo.getResourcesave(),taskName);
        return ResponseResult.success();
    }
    public static void downloadFile(String fileUrl, String saveFilePath) throws IOException {

 src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java

@@ -8,6 +8,7 @@
import com.dji.sample.territory.dao.ITbFjMapper;
import com.dji.sample.territory.model.entity.TbFjEntity;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.territory.utils.HashUtil;
import com.dji.sample.territory.utils.Sm3Util;
import com.dji.sample.territory.utils.VideoZipUtil;
import com.dji.sample.territory.utils.WaterMarkUtil;
@@ -16,10 +17,19 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.imageio.ImageIO;
import javax.xml.crypto.Data;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;

@@ -58,6 +68,11 @@
        return count;
    }

    public void   insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception {
        TbFjEntity tbFj = dbConvertToEntity(mediaFile, lotInfo);
        tbFjMapper.insert(tbFj);
    }

    @Override
    public void deleteData() {
        tbFjMapper.delete(null);
@@ -87,30 +102,34 @@
        double y = Double.parseDouble(((formatCoordinate(coordinates[0]))));
        //本地数据库没有的数据在FJ表非空用0
        int psjd = 0;
        String fjhxz = "0";
        int pshgj = 0;
        String psry = "0";
        String psry = "中图智绘无人机";
        String zsdm = "23C8CCC61E3042FBA6A658F319337B1A";
        String dklx = "0";
        String xzqdm = "0";
        int fjlx = 1;
        Long pssj = mediaFile.getCreateTime();
        String pstz="Y";
        Long sj = mediaFile.getCreateTime();
        String pssj=convertTimestampToDateTime(sj);
        String bsm = UUID.randomUUID().toString();
        String fjmc = mediaFile.getFileName();
        String key = mediaFile.getObjectKey();
        String head = "http://dev.jxpskj.com:9000/cloud-bucket";
        String url = head + key;
        File file = downloadFile(url);
        String fjhxz = HashUtil.SM3Hash(file);
        BufferedImage image = ImageIO.read(file);
        int width = image.getWidth();
        int height = image.getHeight();
        //对应图片和视频文件进行不同处理
        boolean endsWith = key.endsWith(".mp4");
        if (!endsWith) {
            file1 = WaterMarkUtil.addWatermark(file, patchesConfigPojo.getUnzip(), pssj, lat, lng,gimbalYawDegree);
            file1 = WaterMarkUtil.addWatermark(file, patchesConfigPojo.getUnzip(), sj, lat, lng,gimbalYawDegree);
            FJ = fileToByteArray(file1);
        } else {
            file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
            FJ = fileToByteArray(file1);
        }
        String sm3 = Sm3Util.calculateSM3Hash(fjhxz+","+pssj+","+lng+","+lat+","+gimbalYawDegree+","+psjd+","+pshgj+","+psry+","+zsdm);
        String sm3 = Sm3Util.calculateSM3Hash(fjhxz+","+pssj+","+y+","+x+","+gimbalYawDegree+","+psjd+","+pshgj+","+psry+","+zsdm);

        byte[] hash = sm3.getBytes(); // 注意：使用SM3或其他哈希算法来计算数据的哈希值
        // 加载私钥
@@ -120,8 +139,8 @@
        TbFjEntity.TbFjEntityBuilder builder = TbFjEntity.builder();
        if (lotInfo != null) {
            builder.bsm(bsm)
                    .dkbsm(lotInfo.getDkbh())
                    .xzqdm(xzqdm)
                    .dkbsm(lotInfo.getBsm())
                    .xzqdm(lotInfo.getXzqdm())
                    .dklx(dklx)
                    .xdgd(relativeAltitude)
                    .jdgd(absoluteAltitude)
@@ -131,7 +150,7 @@
                    .fjmc(fjmc)
                    .fjlx(fjlx)
                    .psfyj(gimbalYawDegree)
                    .pssj(String.valueOf(pssj))
                    .pssj(pssj)
                    .psjd(psjd)
                    .fjhxz(fjhxz)
                    .pshgj(pshgj)
@@ -139,6 +158,9 @@
                    .psry(psry)
                    .jym(signatureHex)
                    .url(url)
                    .pstz(pstz)
                    .fjyskd(width)
                    .fjysgd(height)
                    .build();
        }
//        else {
@@ -189,4 +211,15 @@
        fis.close();
        return data;
    }
    public static String convertTimestampToDateTime(long timestamp) {
        // 将时间戳转换为 Instant 对象
        Instant instant = Instant.ofEpochMilli(timestamp);

        // 将 Instant 对象转换为 LocalDateTime 对象
        LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());

        // 格式化日期时间
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        return dateTime.format(formatter);
    }
}

 src/main/resources/application-dev.yml

@@ -116,3 +116,5 @@
  sqlite:
    resource: DB/resource_db.db
    result: DB/result_db.db
    resultSave: src/main/resources/tmp
    resourceSave: src/main/resources/tmp

 src/main/resources/application-prod.yml

@@ -115,3 +115,5 @@
  sqlite:
    resource: /home/drone/server/sqlite/resource_db.db
    result: /home/drone/server/sqlite/result_db.db
    resultSave: /home/drone/server/sqlite/retUpload/
    resourceSave: /home/drone/server/sqlite/upload/