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/EventApi.java

@@ -1,24 +1,26 @@
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.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO;
import com.panzhihua.common.model.vos.grid.EventSpecialPopulationVO;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.ClazzUtils;

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 com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
// import com.panzhihua.common.model.vos.IPageVO;

/**
 *
@@ -26,7 +28,7 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Slf4j
@RestController
@RequestMapping("/event")
@@ -38,7 +40,9 @@

    /**
     * 撤销事件
     * @param eventRevokeDTO 修改事件传递对象
     * 
     * @param eventRevokeDTO
     *            修改事件传递对象
     * @return 修改结果
     */
    @PutMapping("/revoke")
@@ -55,7 +59,9 @@

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * 
     * @param id
     *            事件 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
@@ -66,7 +72,9 @@

    /**
     * 删除
     * @param commonEventDeleteDTO 删除事件传递对象
     * 
     * @param commonEventDeleteDTO
     *            删除事件传递对象
     * @return 删除结果
     */
    @DeleteMapping()
@@ -75,9 +83,12 @@
        ClazzUtils.setIfStringIsEmpty(commonEventDeleteDTO);
        return gridService.delete(commonEventDeleteDTO);
    }

    /**
     * 重新发布事件
     * @param commonEventRepublishDTO 重新发布事件传递对象
     * 
     * @param commonEventRepublishDTO
     *            重新发布事件传递对象
     * @return 修改结果
     */
    @PutMapping("/republish")
@@ -90,10 +101,11 @@
        return gridService.republishEvent(commonEventRepublishDTO);
    }


    /**
     * 发布草稿
     * @param commonEventPublicDTO 添加事件传递对象
     * 
     * @param commonEventPublicDTO
     *            添加事件传递对象
     * @return 新增结果
     */
    @PutMapping("/draft/release")
@@ -108,6 +120,7 @@

    /**
     * 查询社区列表
     * 
     * @return 查找结果
     */
    @GetMapping("/actList")
@@ -118,6 +131,7 @@

    /**
     * 查询距离当前事件最近的网格数据
     * 
     * @param pageEventGridNearbyDTO
     * @return
     */
@@ -134,6 +148,5 @@
        specialPopulationDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        return gridService.specialPopulationList(specialPopulationDTO);
    }


}