From ac6261ea96f8b32cd6f1ae52d6dc77700af77ce9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 14:31:12 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
index 615fe10..f4e80b9 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
@@ -94,8 +94,15 @@
                                             @RequestParam @ApiParam(value = "chooseTime",name = "������������������") String chooseTime,
                                             @RequestParam @ApiParam(value = "time",name = "������") String time){
         QueryFiveDataByMacVO queryFiveDataByMacVO = historyFiveMinutelyService.queryFiveDataByMac(mac, chooseTime, time);
-        return ResultMessage.ok(ObjectUtils.isEmpty(queryFiveDataByMacVO)?"0":queryFiveDataByMacVO);
+        if (ObjectUtils.isEmpty(queryFiveDataByMacVO)){
+            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+        }
+        return  ResultMessage.ok(queryFiveDataByMacVO);
     }
+
+
+
 }
 
 
+

--
Gitblit v1.8.0