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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java

@@ -1,24 +1,25 @@
package com.panzhihua.grid_app.api;

import javax.annotation.Resource;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO;
import com.panzhihua.common.model.dtos.grid.PublicityEventAddDTO;
import com.panzhihua.common.model.dtos.grid.PublicityEventEditDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCardUtil;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
@@ -26,20 +27,21 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Slf4j
@RestController
@RequestMapping("/event/publicity")
@Api(tags = {"宣传教育 @chendong"})
public class PublicityEventApi extends BaseController {


    @Resource
    private GridService gridService;

    /**
     * 事件列表
     * @param pagePublicityEventDTO 查找事件
     * 
     * @param pagePublicityEventDTO
     *            查找事件
     * @return 查找结果
     */
    @GetMapping("/usersList")
@@ -51,9 +53,12 @@
        pagePublicityEventDTO.setRevokeType(1);
        return gridService.queryPublicity(pagePublicityEventDTO);
    }

    /**
     * 添加宣传教育事件
     * @param publicityEventAddDTO 特殊人群信息
     * 
     * @param publicityEventAddDTO
     *            特殊人群信息
     * @return 查找结果
     */
    @PostMapping()
@@ -69,7 +74,9 @@

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO 保存草稿传递对象
     * 
     * @param publicityEventEditDTO
     *            保存草稿传递对象
     * @return 保存结果
     */
    @PostMapping("/draft")
@@ -85,6 +92,7 @@

    /**
     * 查询距离当前事件最近的网格数据
     * 
     * @param pageEventGridNearbyDTO
     * @return
     */