From f4925db559734b543a1d3fdb0dea8da3b395b4a9 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 19:46:50 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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..2b38b08 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
@@ -1,11 +1,9 @@
package com.panzhihua.grid_app.api;
-
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.grid.UserEventGridDataVO;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
@@ -13,11 +11,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;
import javax.annotation.Resource;
-import javax.ws.rs.PathParam;
+import javax.validation.Valid;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -58,9 +55,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);
}
@@ -71,12 +67,12 @@
*/
@GetMapping("/statistics/{gridId}")
@ApiOperation(value = "网格统计数据", response= UserEventGridDataVO.class)
- R myGridData(@PathParam("gridId") Long gridId){
+ R myGridData(@PathVariable("gridId") Long gridId){
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
EventGridStatisticsDataDTO eventGridStatisticsDataDTO = new EventGridStatisticsDataDTO();
eventGridStatisticsDataDTO.setUserId(loginUserInfoVO.getUserId());
eventGridStatisticsDataDTO.setGridId(gridId);
- return gridService.getGridData(eventGridStatisticsDataDTO);
+ return gridService.getGridStatisticsdData(eventGridStatisticsDataDTO);
}
--
Gitblit v1.7.1