diff --git a/yanzhu-bigscreen/src/api/aiWarning.js b/yanzhu-bigscreen/src/api/aiWarning.js index f291ca95..cca698a5 100644 --- a/yanzhu-bigscreen/src/api/aiWarning.js +++ b/yanzhu-bigscreen/src/api/aiWarning.js @@ -18,9 +18,9 @@ const getDaysTrendView = (projectId) => { } // 统计AI预警数据 -const groupCountByAlarmType = (projectId, now) => { +const groupCountByAlarmType = (projectId, toDay) => { return request({ - url: `/manage/devAiProjectData/groupCountByAlarmType/${projectId || 0}?now=${now}`, + url: `/manage/devAiProjectData/groupCountByAlarmType/${projectId || 0}?toDay=${toDay}`, method: 'get' }) } diff --git a/yanzhu-bigscreen/src/views/safety/aiWarning.vue b/yanzhu-bigscreen/src/views/safety/aiWarning.vue index 1fbf064e..b07594a8 100644 --- a/yanzhu-bigscreen/src/views/safety/aiWarning.vue +++ b/yanzhu-bigscreen/src/views/safety/aiWarning.vue @@ -306,7 +306,7 @@ export default { pageSize: this.todayPage.pageSize, projectId: this.selProject.id, params: { - date: new Date(), + date: new Date().toLocaleDateString().replaceAll("/","-"), }, }; this.$api.aiWarning diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java index 3d379d85..a6061e43 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java @@ -129,7 +129,7 @@ public class DevAiProjectDataController extends BaseController dataQuery.setParams(params); List> list = devAiProjectDataService.findDaysTrendView(dataQuery); - List> daysTrendList = new ArrayList<>(); + /**List> daysTrendList = new ArrayList<>(); for (LocalDate date = todayAgo; !date.isAfter(today); date = date.plusDays(1)) { Map dayMap = new HashMap<>(); dayMap.put("createTime",date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -143,10 +143,10 @@ public class DevAiProjectDataController extends BaseController if (_list.size()>0) { date.put("total", _list.get(0).get("total")); } - } + }*/ - redisService.setCacheObject(key, daysTrendList, 2L, TimeUnit.MINUTES); - return success(daysTrendList); + redisService.setCacheObject(key, list, 2L, TimeUnit.MINUTES); + return success(list); } /**