add:社区网格信息查询接口

CeDo

2021-06-05 aab6195e2c377c91fac4fd6fe170c590755f2831

add:社区网格信息查询接口

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java

@@ -53,7 +53,7 @@
    private Long gridId;


    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java

@@ -57,7 +57,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java

@@ -77,7 +77,7 @@
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java

@@ -80,7 +80,7 @@
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -116,7 +116,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTimeEnd;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java

@@ -115,7 +115,7 @@
    private Integer eventType;


    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java

@@ -109,7 +109,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTimeEnd;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java

@@ -54,7 +54,7 @@
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java

@@ -56,7 +56,7 @@
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java

@@ -44,7 +44,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java

@@ -46,7 +46,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java

New file
@@ -0,0 +1,84 @@
package com.panzhihua.common.model.vos.grid;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格数据")
public class EventGridDataAreaVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
    private Long type;

    @ApiModelProperty(value = "区/县ID")
    private Long zoneId;

    @ApiModelProperty(value = "区/县名称")
    private String zoneName;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属街道名称")
    private String gridStreetName;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格所属社区名称")
    private String gridCommunityName;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "所属图层")
    private Integer mapLevel;

    @ApiModelProperty(value = "面积")
    private String area;

    @ApiModelProperty(value = "线条颜色")
    private String lineColor;

    @ApiModelProperty(value = "线条宽度")
    private String lineBroadband;

    @ApiModelProperty(value = "填充颜色")
    private String fillColor;

    @ApiModelProperty(value = "备注")
    private String remarks;

    @ApiModelProperty(value = "围栏数据")
    private String data;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

@@ -779,4 +779,20 @@
     */
    @PostMapping("/easy/admin/publicity")
    R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/eventgriddata/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/eventgriddata/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -170,7 +170,7 @@


    @ApiOperation(value = "查询当前社区所有网格员", response = EventGridMemberAdminVO.class)
    @PostMapping("/member/list")
    @GetMapping("/member/list")
    public R getGridMemberLists(){
        Long communityId = this.getCommunityId();
        if(communityId == null){
@@ -179,4 +179,16 @@
        return gridService.getGridMemberLists(communityId);
    }

    @ApiOperation(value = "查询网格下所有网格员", response = EventGridMemberAdminVO.class)
    @GetMapping("/member/{gridId}")
    public R getGridMemberInLists(@PathVariable("gridId") Long gridId){
        return gridService.getGridMemberListsByGrid(gridId);
    }

    @ApiOperation(value = "查询社区所有网格", response = EventGridMemberAdminVO.class)
    @GetMapping("/grid/list/{communityId}")
    public R getGridLists(@PathVariable("communityId") Long communityId){
        return gridService.getGridDataListByCommunity(communityId);
    }

}

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

@@ -137,4 +137,27 @@
    public R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO){
        return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
    }


    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId){
        return eventGridDataService.getGridMemberListsByGrid(gridId);
    }

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId){
        return eventGridDataService.getGridDataListByCommunity(communityId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java

@@ -61,4 +61,7 @@

    void removeGridRelationByGridId(@Param("gridId") Long gridId);

    List<EventGridMemberAdminVO> getGridMemberListsByGrid(@Param("gridId") Long gridId);

    List<EventGridDataAreaVO> getGridDataListByCommunity(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java

@@ -95,4 +95,18 @@
     * @return  修改结果
     */
    R editGridDataByAdmin(EventGridDataEditAdminDTO eventGridDataDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    R getGridMemberListsByGrid(Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    R getGridDataListByCommunity(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -247,4 +247,16 @@
        return R.fail();
    }

    @Override
    public R getGridMemberListsByGrid(Long gridId) {
        List<EventGridMemberAdminVO> eventGridMemberAdminVOList = this.getBaseMapper().getGridMemberListsByGrid(gridId);
        return R.ok(eventGridMemberAdminVOList);
    }

    @Override
    public R getGridDataListByCommunity(Long communityId) {
        List<EventGridDataAreaVO>  eventGridDataAreaVOList = this.getBaseMapper().getGridDataListByCommunity(communityId);
        return R.ok(eventGridDataAreaVOList);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -387,8 +387,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/已撤销状态");
            }
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
@@ -1049,8 +1049,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/撤销状态");
            }
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -213,6 +213,25 @@
    <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">
        select community_id,street_id,name,address,province_code,city_code,area_code from com_act where community_id = #{communityId}
    </select>
    <select id="getGridMemberListsByGrid" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO">
        SELECT
            su.user_id,
            su.nick_name
        FROM
            event_grid_member_relation AS egmr
            LEFT JOIN sys_user AS su ON su.user_id = egmr.grid_member_id
        WHERE
            egmr.grid_id = #{gridId}
    </select>
    <select id="getGridDataListByCommunity"
            resultType="com.panzhihua.common.model.vos.grid.EventGridDataAreaVO" parameterType="long">
        SELECT
            gd.id, gd.grid_name , ad.district_name AS zoneName, st.name AS gridStreetName,  act.name AS gridCommunityName
        FROM event_grid_data gd LEFT JOIN com_mng_struct_area_district ad ON gd.zone_id = ad.district_adcode
            LEFT JOIN com_street st ON gd.grid_street_id = st.street_id
            LEFT JOIN com_act act ON gd.grid_community_id = act.community_id
        WHERE gd.grid_community_id = #{communityId}
    </select>

    <delete id="removeGridRelationByGridId">
        delete from event_grid_member_relation where grid_id = #{gridId}