From d5c1061180b0a6867857b7eef3b7cd6d35ef7f7c Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 22 Sep 2022 15:04:11 +0800
Subject: [PATCH] 大屏实时显示bug修改
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index 787b4f6..29c41ef 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -5,6 +5,7 @@
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
import com.moral.api.pojo.form.uav.UAVQueryTimeSlotForm;
+import com.moral.api.pojo.vo.uav.HistorySecondUavVOs;
import com.moral.api.pojo.vo.uav.UAVQueryDateVO;
import com.moral.api.pojo.vo.uav.UAVQueryTimeSlotVO;
import com.moral.api.pojo.vo.uav.UAVQueryTimeSlotVOs;
@@ -50,7 +51,13 @@
@RequestMapping("queryDataByBatch")
public ResultMessage queryDataByBatch(String batch){
List<HistorySecondUav> historySecondUavs = historySecondUavService.queryDataByBatch(batch);
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
+ if (historySecondUavs==null){
+ return new ResultMessage(ResponseCodeEnum.SENSOR_IS_NOT_EXIST,"null");
+ }
+
+ //������������������������
+ HistorySecondUavVOs vo = HistorySecondUavVOs.convert(historySecondUavs);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
@RequestMapping("test")
--
Gitblit v1.8.0