拍照录像接口调整

aix

2024-08-15 8c93ab27f55588300dc2bf07b0c1f7001bb78943

拍照录像接口调整

 src/main/java/com/dji/sample/common/model/ResponseResult.java

@@ -24,7 +24,7 @@

    private T data;

    private String traceId;
    private String traceid;

    public static <T> ResponseResult<T> success(T data) {
        return ResponseResult.<T>builder()
@@ -53,14 +53,14 @@
                .code(code)
                .data(data)
                .message(message)
                .traceId(traceid)
                .traceid(traceid)
                .build();
    }
    public static ResponseResult success(int code, String message,String traceid) {
        return ResponseResult.builder()
                .code(code)
                .message(message)
                .traceId(traceid)
                .traceid(traceid)
                .build();
    }


 src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java

@@ -424,7 +424,7 @@
                .checkCondition(param.getSn());

        ResponseResult result = ResponseResult.success();
        result.setTraceId(bid);
        result.setTraceid(bid);

        Long timestamp = System.currentTimeMillis();


 src/main/java/com/dji/sample/droneairport/controller/MediaApiController.java

@@ -25,13 +25,21 @@
    @GetMapping("{sn}/getMedia/{traceid}")
    public ResponseResult getMedia(@PathVariable String sn, @PathVariable String traceid) {

        String timestamp = (Long)RedisOpsUtils.hashGet(RedisConst.COMMANDS_PREFIX + sn + RedisConst.DELIMITER + traceid,traceid) / 1000 * 1000 + "";
        MediaFileEntity entity = mediaService.getMediaFieByTid(timestamp);
        String url = "https://wrj.shuixiongit.com/minio/cloud-bucket" + entity.getObjectKey();
        Map ret = new HashMap();
        ret.put("url", url);
        ret.put("metadata", JSONObject.parseObject(entity.getMetadata().toString()));
        return ResponseResult.success(ret);
        try{
            String timestamp = (Long)RedisOpsUtils.hashGet(RedisConst.COMMANDS_PREFIX + sn + RedisConst.DELIMITER + traceid,traceid) / 1000 * 1000 + "";
            MediaFileEntity entity = mediaService.getMediaFieByTid(timestamp);
            if (null == entity) {
                return ResponseResult.error(-1,"等待媒体文件上传中");
            }
            String url = "https://wrj.shuixiongit.com/minio/cloud-bucket" + entity.getObjectKey();
            Map ret = new HashMap();
            ret.put("url", url);
            ret.put("metadata", JSONObject.parseObject(entity.getMetadata().toString()));
            return ResponseResult.success(ret);
        } catch (Exception e) {
            return ResponseResult.error(-1,"拍摄未完成或者媒体文件未上传");
        }

    }

}

 src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java

@@ -234,7 +234,7 @@

    /**
     * Handles the highest priority message about media uploads.
     *
     * 处理有关媒体上传的最高优先级消息。
     * @param receiver
     * @param headers
     * @return