From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 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 97d243e..733db2f 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,5 +1,9 @@
 package com.panzhihua.grid_app.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
 import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
@@ -7,11 +11,9 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
 import com.panzhihua.common.service.grid.GridService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 
 /**
  * @author lyq
@@ -24,34 +26,34 @@
     @Resource
     private GridService gridService;
 
-    @ApiOperation(value = "随手拍列表-lyq",response = ComActEasyPhotoVO.class)
+    @ApiOperation(value = "随手拍列表-lyq", response = ComActEasyPhotoVO.class)
     @PostMapping("list")
-    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
+    public R list(@RequestBody PageEasyAppDTO easyAppDTO) {
         LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
-        if(userInfoVO == null){
+        if (userInfoVO == null) {
             return R.fail("请先登录");
         }
         easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
         return gridService.easyList(easyAppDTO);
     }
 
-    @ApiOperation(value = "随手拍详情-lyq",response = ComActEasyPhotoVO.class)
+    @ApiOperation(value = "随手拍详情-lyq", response = ComActEasyPhotoVO.class)
     @PostMapping("detail")
-    public R detail(@RequestParam("easyId") Long easyId){
+    public R detail(@RequestParam("easyId") Long easyId) {
         return gridService.easyDetailByApp(easyId);
     }
 
-    @ApiOperation(value = "随手拍类型列表-lyq",response = ComActEasyPhotoVO.class)
+    @ApiOperation(value = "随手拍类型列表-lyq", response = ComActEasyPhotoVO.class)
     @PostMapping("type/list")
-    public R typeList(){
+    public R typeList() {
         return gridService.easyTypeListByApp();
     }
 
     @ApiOperation(value = "随手拍处理-lyq")
     @PostMapping("handle")
-    public R handle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R handle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
-        if(userInfoVO == null){
+        if (userInfoVO == null) {
             return R.fail("请先登录");
         }
         photoHandleDTO.setHandlerId(userInfoVO.getUserId());
@@ -60,13 +62,13 @@
 
     @ApiOperation(value = "随手拍切换公示状态-lyq")
     @PostMapping("publicity")
-    public R publicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R publicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return gridService.easyPublicity(photoHandleDTO);
     }
 
     @ApiOperation(value = "随手拍上报社区-lyq")
     @PostMapping("report")
-    public R report(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R report(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return gridService.easyReport(photoHandleDTO);
     }
 

--
Gitblit v1.7.1