From 531dc517028e2fda0e8477429cc7c835be9f7d28 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 27 Sep 2021 15:26:16 +0800
Subject: [PATCH] 5分钟统计任务，数据time改为开始时间
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 5 ++++-
1 files changed, 4 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..73c119e 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,9 @@
@RequestMapping("queryDataByBatch")
public ResultMessage queryDataByBatch(String batch){
List<HistorySecondUav> historySecondUavs = historySecondUavService.queryDataByBatch(batch);
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
+ //������������������������
+ HistorySecondUavVOs vo = HistorySecondUavVOs.convert(historySecondUavs);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
@RequestMapping("test")
--
Gitblit v1.8.0