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/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java |   85 ++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java
index 5c44a0d..d0d644c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java
@@ -1,5 +1,9 @@
 package com.panzhihua.service_grid.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditAdminDTO;
 import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
 import com.panzhihua.common.model.dtos.grid.PageEasyAdminDTO;
@@ -7,10 +11,8 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_grid.service.ComActEasyPhotoService;
 import com.panzhihua.service_grid.service.ComActEasyPhotoTypeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
@@ -18,7 +20,7 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Slf4j
 @RestController
 @RequestMapping("/easy")
@@ -31,100 +33,119 @@
 
     /**
      * 分页查询随手拍
-     * @param easyAppDTO    请求参数
+     * 
+     * @param easyAppDTO
+     *            请求参数
      * @return 随手拍列表
      */
     @PostMapping("list")
-    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
+    public R list(@RequestBody PageEasyAppDTO easyAppDTO) {
         return comActEasyPhotoService.query(easyAppDTO);
     }
 
     /**
      * 根据随手拍id查询随手拍详情
-     * @param easyId    随手拍id
-     * @return  随手拍详情
+     * 
+     * @param easyId
+     *            随手拍id
+     * @return 随手拍详情
      */
     @PostMapping("detail")
-    public R detail(@RequestParam("easyId") Long easyId){
+    public R detail(@RequestParam("easyId") Long easyId) {
         return comActEasyPhotoService.detail(easyId);
     }
 
     /**
      * 查询随手拍类型列表
-     * @return  类型列表
+     * 
+     * @return 类型列表
      */
     @PostMapping("type/list")
-    public R typeList(){
+    public R typeList() {
         return comActEasyPhotoTypeService.typeList();
     }
 
     /**
      * 随手拍处理
-     * @param photoHandleDTO    请求参数
-     * @return  处理结果
+     * 
+     * @param photoHandleDTO
+     *            请求参数
+     * @return 处理结果
      */
     @PostMapping("handle")
-    public R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return comActEasyPhotoService.easyHandle(photoHandleDTO);
     }
 
     /**
      * 随手拍公示状态切换
-     * @param photoHandleDTO    请求参数
-     * @return  切换结果
+     * 
+     * @param photoHandleDTO
+     *            请求参数
+     * @return 切换结果
      */
     @PostMapping("publicity")
-    public R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return comActEasyPhotoService.easyPublicity(photoHandleDTO);
     }
 
     /**
      * 随手拍上报社区
-     * @param photoHandleDTO    请求参数
-     * @return  上报结果
+     * 
+     * @param photoHandleDTO
+     *            请求参数
+     * @return 上报结果
      */
     @PostMapping("report")
-    public R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return comActEasyPhotoService.easyReport(photoHandleDTO);
     }
 
     /**
      * 后台管理-分页查询随手拍列表
-     * @param easyAppDTO    请求参数
-     * @return  随手拍列表
+     * 
+     * @param easyAppDTO
+     *            请求参数
+     * @return 随手拍列表
      */
     @PostMapping("admin/list")
-    public R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO){
+    public R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO) {
         return comActEasyPhotoService.easyListByAdmin(easyAppDTO);
     }
 
     /**
      * 后台管理-随手拍详情
-     * @param easyId    随手拍id
-     * @return  随手拍详情
+     * 
+     * @param easyId
+     *            随手拍id
+     * @return 随手拍详情
      */
     @PostMapping("admin/detail")
-    public R easyDetailByAdmin(@RequestParam("easyId") Long easyId){
+    public R easyDetailByAdmin(@RequestParam("easyId") Long easyId) {
         return comActEasyPhotoService.easyDetailByAdmin(easyId);
     }
 
     /**
      * 后台管理-随手拍处理
-     * @param photoHandleDTO    请求参数
-     * @return  处理结果
+     * 
+     * @param photoHandleDTO
+     *            请求参数
+     * @return 处理结果
      */
     @PostMapping("admin/handle")
-    public R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
+    public R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
         return comActEasyPhotoService.easyHandleByAdmin(photoHandleDTO);
     }
 
     /**
      * 后台管理-批量修改随手拍公示状态/删除随手拍
-     * @param photoEditDTO    请求参数
-     * @return  修改/删除结果
+     * 
+     * @param photoEditDTO
+     *            请求参数
+     * @return 修改/删除结果
      */
     @PostMapping("admin/publicity")
-    public R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoEditDTO){
+    public R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoEditDTO) {
         return comActEasyPhotoService.easyPublicityByAdmin(photoEditDTO);
     }
 }

--
Gitblit v1.7.1