From 0bbfd2faf511cdde6d179f5e2cde365624e52f5d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 23 八月 2021 19:31:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java |   50 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
index 41f3ea0..c54ec07 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
@@ -1,14 +1,17 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.service_community.service.ComActWorkGuideService;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComActWorkGuideService;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @auther llming
@@ -17,57 +20,68 @@
 @Slf4j
 @RestController
 @RequestMapping("/")
-public class WorkGuideApi {
+public class WorkGuideApi extends BaseController {
     @Resource
     private ComActWorkGuideService workGuideService;
+
     /**
      * 办事指南_新增
-     * @param workGuideVO 新增信息
+     * 
+     * @param workGuideDTO
+     *            新增信息
      * @return 新增结果
      */
     @PostMapping("addworkguide")
     @Transactional(rollbackFor = Exception.class)
-    public R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId) {
-        return workGuideService.addWorkGuide(workGuideVO,userId);
+    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) {
+        return workGuideService.addWorkGuide(workGuideDTO, userId);
     }
 
     /**
      * 办事指南_编辑
-     * @param workGuideVO
+     * 
+     * @param workGuideDTO
      * @return 编辑结果
      */
     @PostMapping("editworkguide")
     @Transactional(rollbackFor = Exception.class)
-    public R putWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId) {
-        return workGuideService.editWorkGuide(workGuideVO,userId);
+    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) {
+        return workGuideService.editWorkGuide(workGuideDTO, userId);
     }
 
     /**
      * 办事指南_详情
+     * 
      * @param workGuideId
      * @return 详情
      */
     @GetMapping("detailworkguide")
-    public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId) {
-        return workGuideService.detailWorkGuide(workGuideId);
+    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
+        @RequestParam("conmunityId") Long conmunityId) {
+        return workGuideService.detailWorkGuide(workGuideId, conmunityId);
     }
 
     /**
      * 办事指南_分页
-     * @param pageActWorkGuideDTO 查询参数
+     * 
+     * @param pageActWorkGuideDTO
+     *            查询参数
      * @return 分页集合
      */
     @PostMapping("pageworkguide")
     public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
         return workGuideService.pageWorkGuide(pageActWorkGuideDTO);
     }
+
     /**
      * 办事指南_删除
-     * @param workGuideId 办事指南id
+     * 
+     * @param workGuideId
+     *            办事指南id
      * @return 删除结果
      */
     @PostMapping("delectworkguide")
-    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId){
+    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) {
         return workGuideService.delectWorkGuide(workGuideId);
     }
 

--
Gitblit v1.7.1