Commit 996267e7 by 真的三个金鑫

UOM 上报 打印返回结果日志++

parent 9004bf19
...@@ -3,6 +3,7 @@ package com.dji.sample.manage.service.impl; ...@@ -3,6 +3,7 @@ package com.dji.sample.manage.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.json.JSONUtil;
import com.dji.sample.component.websocket.model.BizCodeEnum; import com.dji.sample.component.websocket.model.BizCodeEnum;
import com.dji.sample.component.websocket.service.IWebSocketMessageService; import com.dji.sample.component.websocket.service.IWebSocketMessageService;
import com.dji.sample.manage.model.dto.DeviceDTO; import com.dji.sample.manage.model.dto.DeviceDTO;
...@@ -206,11 +207,14 @@ public class SDKDeviceService extends AbstractDeviceService { ...@@ -206,11 +207,14 @@ public class SDKDeviceService extends AbstractDeviceService {
uomDroneFlightRecordDTO.setVS((int) (NumberUtil.round(request.getData().getVerticalSpeed(),1, RoundingMode.DOWN).doubleValue() * 10)); uomDroneFlightRecordDTO.setVS((int) (NumberUtil.round(request.getData().getVerticalSpeed(),1, RoundingMode.DOWN).doubleValue() * 10));
uomDroneFlightRecordDTO.setGS((int) (NumberUtil.round(request.getData().getHorizontalSpeed(),1, RoundingMode.DOWN).doubleValue() * 10)); uomDroneFlightRecordDTO.setGS((int) (NumberUtil.round(request.getData().getHorizontalSpeed(),1, RoundingMode.DOWN).doubleValue() * 10));
uomDroneFlightRecordDTO.setCourse(-999); uomDroneFlightRecordDTO.setCourse(-999);
log.info("UOM Record DTO: " + JSONUtil.toJsonStr(uomDroneFlightRecordDTO));
try { try {
String body = uomRecordService.sendRecord(uomDroneFlightRecordDTO); String body = uomRecordService.sendRecord(uomDroneFlightRecordDTO);
log.info("UOM Record: " + body); log.info("UOM Record: " + body);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("UOM Record Error: " + e.getMessage());
log.error("UOM Record Error: " + e.getMessage());
} }
}).start(); }).start();
deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DEVICE_OSD, from, request.getData()); deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DEVICE_OSD, from, request.getData());
......
...@@ -3,10 +3,12 @@ package com.dji.sample.uom; ...@@ -3,10 +3,12 @@ package com.dji.sample.uom;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@Slf4j
@Service @Service
public class UOMRecordService { public class UOMRecordService {
...@@ -50,6 +52,7 @@ public class UOMRecordService { ...@@ -50,6 +52,7 @@ public class UOMRecordService {
sendUOMDTO.setPaths(paths); sendUOMDTO.setPaths(paths);
String encrypt = SM3Util.encrypt(JSONUtil.toJsonStr(sendUOMDTO), uomConfiguration.getAppKey()); String encrypt = SM3Util.encrypt(JSONUtil.toJsonStr(sendUOMDTO), uomConfiguration.getAppKey());
post.body(encrypt); post.body(encrypt);
log.info("UOM Record: " + JSONUtil.toJsonStr(sendUOMDTO));
return post.execute().body(); return post.execute().body();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment