Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

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

@@ -1,7 +1,10 @@
package com.panzhihua.common.service.grid;

import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
@@ -1127,12 +1130,12 @@
    /**
     * 删除走访任务
     *
     * @param ids
     * @param idDTO
     * @param communityId
     * @return
     */
    @PostMapping("/eventvisitingtasks/delete")
    R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId);
    R delete(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId);

    /**
     * 被走访人员列表
@@ -1157,31 +1160,31 @@
    /**
     * 撤销走访
     *
     * @param id
     * @param idDTO
     * @return
     */
    @PostMapping("/eventvisitingtasks/cancel/{id}")
    R cancel(@PathVariable("id") Long id);
    @PostMapping("/eventvisitingtasks/cancel")
    R cancel(@RequestBody IdDTO idDTO);

    /**
     * 恢复走访
     *
     * @param id
     * @param idDTO
     * @return
     */
    @PostMapping("/eventvisitingtasks/reset/{id}")
    R reset(@PathVariable("id") Long id);
    @PostMapping("/eventvisitingtasks/reset")
    R reset(@RequestBody IdDTO idDTO);

    /**
     * 新增走访
     *
     * @param ids
     * @param idDTO
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/eventvisitingtasks/add")
    R addVisitingTask(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
    R addVisitingTask(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 开始走访
@@ -1200,4 +1203,58 @@
     */
    @PostMapping("/eventvisitingtasks/complete")
    R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);

    /**
     * 查询市平台网格员列表
     * @return  市平台网格员列表
     */
    @GetMapping("/eventgridmemberrelation/lc/list")
    R gridMemberLcList();

    /**
     * 综治后台-添加网格员级联列表
     * @param memberCascadeAddDTO   请求参数
     * @return  级联列表
     */
    @PostMapping("/eventgridmemberrelation/cascade/list")
    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/eventgriddata/lc/list")
    R getLcGridLists();

    /**
     * 首页查询网格级联列表
     * @param cascadeListDTO    请求参数
     * @return  网格列表
     */
    @PostMapping("/map/getMapGridListsByApp")
    R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO);

    /**
     * 首页查询网格级联列表2
     * @param userId    用户id
     * @return  网格列表
     */
    @PostMapping("/map/getMapGridsListsByApp")
    R getMapGridsListsByApp(@RequestParam("userId") Long userId);

    /**
     * 绘制多边形统计数据
     * @param eventListDTO  请求参数
     * @return  统计数据
     */
    @PostMapping("/screen/getCivilDrawList")
    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);

    /**
     * 大屏-根据小区id查询小区统计人数
     * @param villageId 小区id
     * @return  小区统计数据
     */
    @GetMapping("/screen/village/statistics")
    R civilVillageStatistics(@RequestParam("villageId") Long villageId);
}