修改bug

huanghongfa

2021-06-02 7aa165a3de1fa1878ee5d55512faeb7134c05692

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -462,28 +463,28 @@
    R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);

    /**
     * 添加突发事件
     * @param emergenciesEventAddDTO
     * 添加事件
     * @param commonEventAddDTO
     * @return
     */
    @PostMapping("/event/addEmergencies")
    R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO);
    @PostMapping("/event/addCommon")
    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);

    /**
     * 保存突发事件草稿
     * @param emergenciesEventEditDTO
     * 保存事件草稿
     * @param commonEventEditDTO
     * @return
     */
    @PostMapping("/event/saveEmergenciesDraft")
    R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO);
    @PostMapping("/event/saveDraft")
    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);

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

    /**
     * 突发事件撤销
@@ -494,6 +495,38 @@
    R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO);

    /**
     * 处理事件
     * @param commonEventDealDTO
     * @return
     */
    @PostMapping("/event/dealEvent")
    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO);

    /**
     * 处理事件
     * @param commonEventVerifyDTO
     * @return
     */
    @PostMapping("/event/verify")
    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO);

    /**
     * 处理事件
     * @param commonEventRepublicDTO
     * @return
     */
    @PostMapping("/event/republish")
    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);

    /**
     * 网格数据待处理统计信息
     * @param pageEventGridDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridData")
    R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 查询用户网格
     * @param pageEventGridDataDTO
     * @return
@@ -502,28 +535,36 @@
    R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 处理事件
     * @param eventDealDTO
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    @PostMapping("/event/dealEvent")
    R dealEvent(@RequestBody EventDealDTO eventDealDTO);
    @PostMapping("/event/addSpecial")
    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);

    /**
     * 处理事件
     * @param eventVerifyDTO
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    @PostMapping("/event/verify")
    R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO);
    @PostMapping("/event/getSpecialPopulation")
    R getSpecialPopulation(String idCard);

    /**
     * 处理事件
     * @param eventRepublicDTO
     * 保存殊人群事件上报草稿
     * @param specialEventEditDTO
     * @return
     */
    @PostMapping("/event/republish")
    R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO);
    @PostMapping("/event/saveSpecialDraft")
    R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);

    /**
     * 草稿发布
     * @param commonEventPublicDTO
     * @return
     */
    @PostMapping("/event/draftRelease")
    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);

    /**
     * 查询随手拍列表
@@ -573,10 +614,64 @@
    R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);

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

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO   请求参数
     * @return  保存结果
     */
    @PostMapping("/event/savePublicityDraft")
    R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO);

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/event/queryPublicity")
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 分页查询社区列表
     * @return  结果
     */
    @PostMapping("/event/actList")
    R actList();

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    @PostMapping("/map/getGridDetail")
    R getGridDetail(@RequestParam("gridId") Long gridId);

    /**
     * 地图模块-根据网格员id查询今日运动轨迹
     * @param userId    网格员id
     * @return  运动轨迹
     */
    @PostMapping("/map/getTrajectoryByApp")
    R getTrajectoryByApp(@RequestParam("userId") Long userId);

    /**
     * 地图模块-根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    @PostMapping("/map/getMapGridListByApp")
    R getMapGridListByApp(@RequestParam("userId") Long userId);

    /**
     * 获取最新版本信息
     * @return  版本信息
     */
    @GetMapping("/eventapplicationapprelease/edition")
    R editionUpdate();
}