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 ++++++++-
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 1 +
screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java | 3 +++
3 files changed, 12 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);
}
+
+
+
}
+
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java
index d927c65..d9862c0 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java
@@ -44,4 +44,7 @@
@ApiModelProperty(value = "������")
private String a01007;
+
+ @ApiModelProperty(value = "tvos")
+ private String a99054;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 36cffd6..c290dc5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -303,6 +303,7 @@
queryFiveDataByMacVO.setA05024(result.get("a05024").toString());
queryFiveDataByMacVO.setA01008(result.get("a01008").toString());
queryFiveDataByMacVO.setA01007(result.get("a01007").toString());
+ queryFiveDataByMacVO.setA99054(result.get("a99054").toString());
return queryFiveDataByMacVO;
}
--
Gitblit v1.8.0