Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java

@@ -1,26 +1,17 @@
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 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 javax.annotation.Resource;

import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
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,9 +23,12 @@
public class WorkGuideApi extends BaseController {
    @Resource
    private ComActWorkGuideService workGuideService;

    /**
     * 办事指南_新增
     * @param workGuideDTO 新增信息
     * 
     * @param workGuideDTO
     *            新增信息
     * @return 新增结果
     */
    @PostMapping("addworkguide")
@@ -45,6 +39,7 @@

    /**
     * 办事指南_编辑
     * 
     * @param workGuideDTO
     * @return 编辑结果
     */
@@ -56,26 +51,33 @@

    /**
     * 办事指南_详情
     * 
     * @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")