Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java

@@ -4,16 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.*;
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.EventVO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -34,26 +29,6 @@
    private EventService eventService;

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventAddDTO eventAddDTO){
        return eventService.add(eventAddDTO);
    };

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventEditDTO eventEditDTO){
        return eventService.edit(eventEditDTO);
    };

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
@@ -65,12 +40,12 @@

    /**
     * 删除事件
     * @param EventDeleteDTO
     * @param commonEventDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventDeleteDTO EventDeleteDTO){
        return eventService.delete(EventDeleteDTO);
    R delete(@RequestBody CommonEventDeleteDTO commonEventDeleteDTO){
        return eventService.delete(commonEventDeleteDTO);
    };

    /**
@@ -85,37 +60,37 @@

    /**
     * 添加突发事件
     * @param emergenciesEventAddDTO
     * @param commonEventAddDTO
     * @return 新增结果
     */
    @PostMapping("/addEmergencies")
    R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO){
        return eventService.addEmergencies(emergenciesEventAddDTO);
    @PostMapping("/addCommon")
    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
        return eventService.addCommon(commonEventAddDTO);
    };
    /**
     * 保存草稿
     * @param {classNameFirstLower}AddDTO 添加事件传递对象
     * @return 新增结果
     */
    @PostMapping("/saveEmergenciesDraft")
    R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO){
        return eventService.saveEmergenciesDraft(emergenciesEventEditDTO);
    @PostMapping("/saveDraft")
    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO){
        return eventService.saveDraft(commonEventEditDTO);
    }


    /**
     * 突发事件上报社区
     * @param emergenciesEventReportDTO
     * 事件上报社区
     * @param commonEventReportDTO
     * @return
     */
    @PostMapping("/emergenciesReport")
    R emergenciesReport(@RequestBody EmergenciesEventReportDTO emergenciesEventReportDTO){
        return eventService.emergenciesReport(emergenciesEventReportDTO);
    @PostMapping("/report")
    R report(@RequestBody CommonEventReportDTO commonEventReportDTO){
        return eventService.report(commonEventReportDTO);
    }


    /**
     * 突发事件撤销
     * 事件撤销
     * @param eventRevokeDTO
     * @return
     */
@@ -125,32 +100,159 @@
    }
    /**
     * 处理事件
     * @param eventDealDTO
     * @param commonEventDealDTO
     * @return
     */
    @PostMapping("/dealEvent")
    R dealEvent(@RequestBody EventDealDTO eventDealDTO){
        return eventService.dealEvent(eventDealDTO);
    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
        switch (commonEventDealDTO.getOperateType()){
            case 1:
                return eventService.communityDealEvent(commonEventDealDTO);
            case 0:
                return eventService.dealEvent(commonEventDealDTO);
            default:
                return R.fail("参数错误");
        }
    }

    /**
     * 处理事件
     * @param eventVerifyDTO
     * @param commonEventVerifyDTO
     * @return
     */
    @PostMapping("/verify")
    R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO){
        return eventService.verifyEvent(eventVerifyDTO);
    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
        return eventService.verifyEvent(commonEventVerifyDTO);
    }

    /**
     * 重新发布事件
     * @param eventRepublicDTO
     * @param commonEventRepublishDTO
     * @return
     */
    @PostMapping("/republish")
    R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO){
        return eventService.republishEvent(eventRepublicDTO);
    R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
        return eventService.republishEvent(commonEventRepublishDTO);
    }

    /**
     * 草稿发布
     * @param commonEventPublicDTO
     * @return
     */
    @PostMapping("/draftRelease")
    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO){
        return eventService.draftRelease(commonEventPublicDTO);
    }

    /**
     * 保存殊人群事件上报草稿
     * @param specialEventEditDTO
     * @return
     */
    @PostMapping("/saveSpecialDraft")
    R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO){
        return eventService.saveSpecialDraft(specialEventEditDTO);
    }


    /**
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    @PostMapping("/addSpecial")
    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO){
        return eventService.addSpecial(specialEventAddDTO);
    }

    /**
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    @PostMapping("/getSpecialPopulation")
    R getSpecialPopulation(@RequestBody String idCard){
        return eventService.getSpecialPopulation(idCard);
    }


    /**
     * 添加发布宣传教育事件
     * @param publicityEventAddDTO   请求参数
     * @return  上报结果
     */
    @PostMapping("/addPublicity")
    R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO){
        return eventService.addPublicity(publicityEventAddDTO);
    }

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO   请求参数
     * @return  保存结果
     */
    @PostMapping("/savePublicityDraft")
    R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO) {
        return eventService.savePublicityDraft(publicityEventEditDTO);
    }
    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/queryPublicity")
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO){
        return eventService.selectPublicity(pagePublicityEventDTO);
    }

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/queryPublicityCommunity")
    R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO){
        return eventService.selectCommunityPublicity(pagePublicityEventDTO);
    }

    /**
     * 分页查询宣传教育事件
     * @return  结果
     */
    @PostMapping("/actList")
    R<ComActVO> actList(){
        return eventService.actList();
    }

    /**
     * 查询管理事件
     * @param pageEventManageDTO
     * @return
     */
    @PostMapping("/manage/list")
    R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO){
        return eventService.eventToManage(pageEventManageDTO);
    }

    /**
     * 社区网格后台标记事件无效
     * @param eventRevokeDTO
     * @return
     */
    @PostMapping("/markInvalid")
    R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO){
        return eventService.markEventInvalid(eventRevokeDTO);
    }

    /**
     * 社区网格后台重新发布已标记无效的事件
     * @param commonEventRepublishDTO
     * @return
     */
    @PostMapping("/republishInvalid")
    R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
        return eventService.republishInvalidEvent(commonEventRepublishDTO);
    }

}