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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -135,4 +135,7 @@

    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;

    @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）")
    private Integer handleStatus;
}

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

@@ -30,8 +30,8 @@
    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

//    @ApiModelProperty(value = "状态 1待处理 2已处理")
//    private Integer status;
    @ApiModelProperty(value = "状态 1待处理 2已处理")
    private Integer handleStatus;

    @ApiModelProperty(value = "处理人id")
    private Long handlerId;

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

@@ -45,6 +45,9 @@
    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员头像url")
    private String gridMemberImageUrl;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMemberTelephone;

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

    @ApiModelProperty(value = "发生地点")
    @ApiModelProperty(value = "事件发生地点备注")
    private String happentAddress;

    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
@@ -85,6 +88,9 @@

    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
    private Integer eventStatus;

    @ApiModelProperty(value = "事件类型")
    private String eventClazz;

    @ApiModelProperty(value = "1待处理2已解决3待验证")
    private Integer eventProcessStatus;
@@ -108,6 +114,9 @@
    @ApiModelProperty(value = "事件来源")
    private String eventResource;

    @ApiModelProperty(value = "事件发生地点")
    private String happenAddress;

    @ApiModelProperty(value = "危险级别")
    private Integer dangerLevel;


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

@@ -47,4 +47,10 @@
     */
    List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId);

    /**
     * 根据网格员id查询网格员头像url
     * @param gridMemberId  网格员id
     * @return  头像url
     */
    String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
}

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

@@ -98,6 +98,12 @@
                eventVO.setAudios(audioList);
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if(StringUtils.isNotEmpty(imageUrl)){
                    eventVO.setGridMemberImageUrl(imageUrl);
                }
            });
            return R.ok(ipage);
        }

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

@@ -48,12 +48,13 @@
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.handle_status,
        caep.is_report
        FROM
        com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        <where>
            AND caep.delTag = 0
            AND caep.del_tag = 0
            <if test="easyAppDTO.communityId!=null">
                AND caep.community_id = #{easyAppDTO.communityId}
            </if>
@@ -82,6 +83,7 @@
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.handle_status,
        caep.handle_result,
        caep.handle_photo_list,
        caep.feedback_at,

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

@@ -24,6 +24,7 @@
        <result property="communityProcess" column="community_process"/>
        <result property="happenTime" column="happen_time"/>
        <result property="happentAddress" column="happent_address"/>
        <result property="happenAddress" column="happen_address"/>
        <result property="happentLatLng" column="happent_lat_lng"/>
        <result property="eventStatus" column="event_status"/>
        <result property="eventProcessStatus" column="event_process_status"/>
@@ -48,11 +49,12 @@
        <result property="createAt" column="create_at"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateAt" column="update_at"/>
        <result property="eventClazz" column="event_clazz"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,order_sn,event_category,grid_member_street,grid_member_community,grid_id,grid_member_id,grid_member_name,grid_member_telephone,event_title,propaganda_type,propaganda_time,event_type,event_des,propaganda_object,propaganda_num,community_process,happen_time,happent_address,happent_lat_lng,event_status,event_process_status,process_type,process_user_id,process_user_name,process_date,process_desc,event_resource,danger_level,red_card,yellow_card,invalid,major,deaths_number,injuries_number,difficult,urgent,urgent_dell,submit_date,create_by,create_at,update_by,update_at
        id,order_sn,event_category,grid_member_street,happen_address,grid_member_community,event_clazz,grid_id,grid_member_id,grid_member_name,grid_member_telephone,event_title,propaganda_type,propaganda_time,event_type,event_des,propaganda_object,propaganda_num,community_process,happen_time,happent_address,happent_lat_lng,event_status,event_process_status,process_type,process_user_id,process_user_name,process_date,process_desc,event_resource,danger_level,red_card,yellow_card,invalid,major,deaths_number,injuries_number,difficult,urgent,urgent_dell,submit_date,create_by,create_at,update_by,update_at
    ]]>
    </sql>

@@ -459,4 +461,8 @@
            AND grid_id = #{gridId}
    </select>

    <select id="getGridMemberImageUrl" resultType="String">
        select image_url from sys_user where user_id = #{gridMemberId}
    </select>

</mapper>