no

CeDo

2021-06-08 8f173595405f004f94d8a7022884a8fa98540b20

no

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.util.List;


/**
 * 删除表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-28
 * */
@Data
@ApiModel("删除事件请求参数")
public class EventDeleteSingleDTO {

    @ApiModelProperty(value = "id", hidden = false, example = "1")
    @NotNull
    private Long id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

}

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

@@ -51,6 +51,11 @@
    @NotNull(message = "宣传区域不能为空")
    private Long gridId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
    //@NotNull(message = "上报人不能为空")
    private Long gridMemberId;

    @Length(max=255)
    @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
    @NotNull(message = "宣传主题不能为空")

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

@@ -44,6 +44,9 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridId;

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

    @ApiModelProperty(value = "网格员")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberId;
@@ -161,7 +164,7 @@
    private Long createBy;

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

    @ApiModelProperty(value = "修改人")

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

@@ -29,11 +29,11 @@

    /**
     * 删除事件
     * @param eventDeleteDTO
     * @param eventDeleteSingleDTO
     * @return 平台用户信息
     */
    @PostMapping("/event/delete")
    R delete(@RequestBody EventDeleteDTO eventDeleteDTO);
    R delete(@RequestBody EventDeleteSingleDTO eventDeleteSingleDTO);

    /**
     * 查询事件详细信息

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

@@ -63,14 +63,14 @@

    /**
     * 删除
     * @param eventDeleteDTO 删除事件传递对象
     * @param eventDeleteSingleDTO 删除事件传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除事件", response = R.class)
    R delete(@Validated @RequestBody EventDeleteDTO  eventDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
        return gridService.delete(eventDeleteDTO);
    R delete(@Validated @RequestBody EventDeleteSingleDTO  eventDeleteSingleDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteSingleDTO);
        return gridService.delete(eventDeleteSingleDTO);
    }
    /**
     * 重新发布事件

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/SpecialPopulationEventApi.java

@@ -128,5 +128,21 @@
        return gridService.verifyEvent(commonEventVerifyDTO);
    }

    /**
     * 直接上报社区
     * @param commonEventDirectReportDTO 上报社区传递对象
     * @return 上报结果
     */
    @PostMapping("/reportDirect")
    @ApiOperation(value = "直接上报社区", response = R.class)
    R reportDirect(@Validated @RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        ClazzUtils.setIfStringIsEmpty(commonEventDirectReportDTO);
        commonEventDirectReportDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDirectReportDTO.setUserName(loginUserInfoVO.getNickName());
        commonEventDirectReportDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        return gridService.reportDirect(commonEventDirectReportDTO);
    }


}

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

@@ -109,15 +109,15 @@

    /**
     * 删除
     * @param eventDeleteDTO 删除事件传递对象
     * @param eventDeleteSingleDTO 删除事件传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除事件", response = R.class)
    R delete(@Validated @RequestBody EventDeleteDTO  eventDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
        eventDeleteDTO.setUserId(this.getUserId());
        return gridService.delete(eventDeleteDTO);
    R delete(@Validated @RequestBody EventDeleteSingleDTO  eventDeleteSingleDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteSingleDTO);
        eventDeleteSingleDTO.setUserId(this.getUserId());
        return gridService.delete(eventDeleteSingleDTO);
    }
    /**
     * 重新发布事件

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

@@ -431,7 +431,7 @@
            e.id,e.order_sn,e.event_category,e.grid_member_street,e.happen_address,e.grid_member_community,e.event_clazz,e.grid_id,e.grid_member_id,e.grid_member_name,e.grid_member_telephone,
            e.event_title,e.propaganda_type,e.propaganda_time,e.event_type,e.event_des,e.propaganda_object,e.propaganda_num,e.community_process,e.happen_time,e.happent_address,e.happent_lat_lng,
            e.event_status,e.event_process_status,e.process_type,e.process_user_id,e.process_user_name,e.process_date,e.process_desc,e.event_resource,e.danger_level,e.red_card,e.yellow_card,e.invalid,
            e.major,e.deaths_number,e.injuries_number,e.difficult,e.urgent,e.urgent_dell,e.submit_date,e.create_by,e.create_at,e.update_by,e.update_at,e.event_deal_status
            e.major,e.deaths_number,e.injuries_number,e.difficult,e.urgent,e.urgent_dell,e.submit_date,e.create_by,e.create_at,e.update_by,e.update_at,e.event_deal_status,egd.grid_name
        FROM
            event e left join event_grid_data egd on e.grid_id = egd.id
        <where>