From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java |  131 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 104 insertions(+), 27 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 d7351a3..3eb15f9 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,26 +1,23 @@
 package com.panzhihua.service_community.api;
 
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.common.constants.Constants;
-import com.panzhihua.common.constants.TokenConstant;
-import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.exceptions.ServiceException;
-import com.panzhihua.common.exceptions.UnAuthenticationException;
-import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
-import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import javax.annotation.Resource;
+
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.common.utlis.AES;
-import com.panzhihua.service_community.service.ComActWorkGuideService;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.service_community.service.ComActWorkGuideClassifyService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+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
@@ -32,55 +29,135 @@
 public class WorkGuideApi extends BaseController {
     @Resource
     private ComActWorkGuideService workGuideService;
+    @Resource
+    private ComActWorkGuideClassifyService comActWorkGuideClassifyService;
+
     /**
      * 办事指南_新增
-     * @param workGuideDTO 新增信息
+     * 
+     * @param workGuideDTO
+     *            新增信息
      * @return 新增结果
      */
     @PostMapping("addworkguide")
     @Transactional(rollbackFor = Exception.class)
-    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId")Long userId) {
-        return workGuideService.addWorkGuide(workGuideDTO,userId);
+    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) {
+        return workGuideService.addWorkGuide(workGuideDTO, userId);
     }
 
     /**
      * 办事指南_编辑
+     * 
      * @param workGuideDTO
      * @return 编辑结果
      */
     @PostMapping("editworkguide")
     @Transactional(rollbackFor = Exception.class)
-    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId")Long userId) {
-        return workGuideService.editWorkGuide(workGuideDTO,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 , @RequestParam("conmunityId")Long conmunityId) {
-        return workGuideService.detailWorkGuide(workGuideId, conmunityId);
+    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
+        @RequestParam("communityId") Long communityId) {
+        return workGuideService.detailWorkGuide(workGuideId, communityId);
     }
 
     /**
      * 办事指南_分页
-     * @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);
     }
 
+    /**
+     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
+     * @param    comActWorkGuideClassifyVO   查询参数
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @PostMapping("workGuide/classify/apage")
+    public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+        return comActWorkGuideClassifyService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
+    }
+
+    /**
+     * 办事执念-分类管理新增或修改  addWorkGuideClassify  办事执念-分类管理新增或修改
+     * @param    comActWorkGuideClassifyVO   新增或修改参数
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @PostMapping("workGuide/classify/add")
+    public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+        return comActWorkGuideClassifyService.addWorkGuideClassify(comActWorkGuideClassifyVO);
+    }
+
+    /**
+     * 办事执念-分类管理删除  addWorkGuideClassify  办事执念-分类管理删除
+     * @param    workGuideClassifyId    办事执念-分类管理id
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @GetMapping("workGuide/classify/delete")
+    public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) {
+        return comActWorkGuideClassifyService.deleteWorkGuideClassify(workGuideClassifyId);
+    }
+
+    /**
+     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @GetMapping("workGuide/classify/getList")
+    public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode) {
+        return comActWorkGuideClassifyService.getWorkGuideClassifyList(areaCode);
+    }
+
+    /**
+     * 办事指南列表-按分类查询
+     * @param pageActWorkGuideDTO   请求参数
+     * @return  办事指南分类列表
+     */
+    @PostMapping("listworkguide")
+    public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+        return workGuideService.listWorkGuide(pageActWorkGuideDTO);
+    }
+
+    /**
+     * 根据办事指南分类id查询办事指南列表
+     * @param classifyId   办事指南分类id
+     * @return  办事指南列表数据
+     */
+    @GetMapping("listworkguide/classify")
+    public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) {
+        return workGuideService.listWorkGuideByClassifyId(classifyId);
+    }
+
 }

--
Gitblit v1.7.1