From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java
index 6d95c76..dbda0cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java
@@ -1,16 +1,15 @@
package com.panzhihua.grid_app.api;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -18,14 +17,14 @@
* @author lyq
*/
@RestController
-@RequestMapping("/easy")
-@Api(tags = {"网格综治APP随手拍模块"})
+@RequestMapping("/easy/")
+@Api(tags = {"网格综治APP随手拍模块@lyq"})
public class EasyPhotoApi extends BaseController {
@Resource
private GridService gridService;
- @ApiOperation(value = "随手拍列表")
+ @ApiOperation(value = "随手拍列表-lyq",response = ComActEasyPhotoVO.class)
@PostMapping("list")
public R list(@RequestBody PageEasyAppDTO easyAppDTO){
LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
@@ -33,10 +32,42 @@
return R.fail("请先登录");
}
easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
+ return gridService.easyList(easyAppDTO);
+ }
+ @ApiOperation(value = "随手拍详情-lyq",response = ComActEasyPhotoVO.class)
+ @PostMapping("detail")
+ public R detail(@RequestParam("easyId") Long easyId){
+ return gridService.easyDetailByApp(easyId);
+ }
+ @ApiOperation(value = "随手拍类型列表-lyq",response = ComActEasyPhotoVO.class)
+ @PostMapping("type/list")
+ public R typeList(){
+ return gridService.easyTypeListByApp();
+ }
- return R.ok();
+ @ApiOperation(value = "随手拍处理-lyq")
+ @PostMapping("handle")
+ public R handle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if(userInfoVO == null){
+ return R.fail("请先登录");
+ }
+ photoHandleDTO.setHandlerId(userInfoVO.getUserId());
+ return gridService.easyHandle(photoHandleDTO);
+ }
+
+ @ApiOperation(value = "随手拍切换公示状态-lyq")
+ @PostMapping("publicity")
+ public R publicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+ return gridService.easyPublicity(photoHandleDTO);
+ }
+
+ @ApiOperation(value = "随手拍上报社区-lyq")
+ @PostMapping("report")
+ public R report(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+ return gridService.easyReport(photoHandleDTO);
}
}
--
Gitblit v1.7.1