From 302d51ec3c223fd32c746d6bc163a840225b6f46 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 20:02:47 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
index 9fa15d7..ac6af3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
@@ -17,6 +17,7 @@
import com.panzhihua.common.service.grid.GridService;
import javax.annotation.Resource;
+import javax.validation.Valid;
import javax.ws.rs.PathParam;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
@@ -58,9 +59,8 @@
*/
@GetMapping("/myGridTodoData")
@ApiOperation(value = "网格待处理统计数据", response= UserEventGridDataVO.class)
- R myTodoGridData(){
+ R myTodoGridData(@Valid @ModelAttribute EventGridTodoDataDTO eventGridTodoDataDTO){
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
- EventGridTodoDataDTO eventGridTodoDataDTO = new EventGridTodoDataDTO();
eventGridTodoDataDTO.setUserId(loginUserInfoVO.getUserId());
return gridService.getGridTodoData(eventGridTodoDataDTO);
}
@@ -76,7 +76,7 @@
EventGridStatisticsDataDTO eventGridStatisticsDataDTO = new EventGridStatisticsDataDTO();
eventGridStatisticsDataDTO.setUserId(loginUserInfoVO.getUserId());
eventGridStatisticsDataDTO.setGridId(gridId);
- return gridService.getGridData(eventGridStatisticsDataDTO);
+ return gridService.getGridStatisticsdData(eventGridStatisticsDataDTO);
}
--
Gitblit v1.7.1