From 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 14 十月 2021 11:07:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java | 103 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 20 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 e7e51e0..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,14 +1,18 @@
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;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
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;
/**
*
@@ -16,7 +20,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Slf4j
@RestController
@RequestMapping("/easy")
@@ -29,60 +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 随手拍列表
+ */
+ @PostMapping("admin/list")
+ public R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO) {
+ return comActEasyPhotoService.easyListByAdmin(easyAppDTO);
+ }
+
+ /**
+ * 后台管理-随手拍详情
+ *
+ * @param easyId
+ * 随手拍id
+ * @return 随手拍详情
+ */
+ @PostMapping("admin/detail")
+ public R easyDetailByAdmin(@RequestParam("easyId") Long easyId) {
+ return comActEasyPhotoService.easyDetailByAdmin(easyId);
+ }
+
+ /**
+ * 后台管理-随手拍处理
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("admin/handle")
+ public R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO) {
+ return comActEasyPhotoService.easyHandleByAdmin(photoHandleDTO);
+ }
+
+ /**
+ * 后台管理-批量修改随手拍公示状态/删除随手拍
+ *
+ * @param photoEditDTO
+ * 请求参数
+ * @return 修改/删除结果
+ */
+ @PostMapping("admin/publicity")
+ public R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoEditDTO) {
+ return comActEasyPhotoService.easyPublicityByAdmin(photoEditDTO);
+ }
}
--
Gitblit v1.7.1