任务管理和事件关联，事件添加任务id字段；事件添加title字段

guoshilong

2022-10-10 c17ffce2cfe55605e0b9fdd465503347c3f584d3

任务管理和事件关联，事件添加任务id字段；事件添加title字段

 src/main/java/org/springblade/modules/eventgm/entity/EventgmEntity.java

@@ -40,6 +40,11 @@
public class EventgmEntity extends TenantEntity {

    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String title;
    /**
     * 事件类型
     */
    @ApiModelProperty(value = "事件类型")
@@ -75,6 +80,13 @@
     */
    @ApiModelProperty(value = "工单编号")
    private String no;

    /**
     * 巡检任务id
     */
    @ApiModelProperty(value = "巡检任务id")
    private String taskinfoId;

    /**
     * 备注
     */

 src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml

@@ -5,6 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="eventgmResultMap" type="org.springblade.modules.eventgm.vo.EventgmVO">
        <result column="id" property="id"/>
        <result column="title" property="title"/>
        <result column="type" property="type"/>
        <result column="address" property="address"/>
        <result column="longitude" property="longitude"/>

 src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java

@@ -35,4 +35,12 @@
    private String startTime;

    private String endTime;
    /**
     * 状态
     */
    private String stateName;
    /**
     * 类型
     */
    private String typeName;
}

 src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml

@@ -21,10 +21,48 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <select id="getTaskInfoOne" resultMap="taskinfoResultMap">
        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,
               state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo
        where id = #{id} and is_deleted = 0

    <resultMap id="taskinfoResultMapList" type="org.springblade.modules.taskinfo.vo.TaskInfoVO">
        <result column="id" property="id"/>
        <result column="title" property="title"/>
        <result column="start_time" property="startTime"/>
        <result column="end_time" property="endTime"/>
        <result column="content" property="content"/>
        <result column="to_user_id" property="toUserId"/>
        <result column="route_range" property="routeRange"/>
        <result column="state" property="state"/>
        <result column="source" property="source"/>
        <result column="create_user" property="createUser"/>
        <result column="create_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
        <collection property="eventgmList" javaType="java.util.List" ofType="org.springblade.modules.eventgm.vo.EventgmVO">
            <result column="eventId" property="id"/>
            <result column="eventType" property="type"/>
            <result column="eventState" property="state"/>
            <result column="eventAddress" property="address"/>
            <result column="eventLongitude" property="longitude"/>
            <result column="eventLatitude" property="latitude"/>
            <result column="eventPicUrls" property="picUrls" typeHandler="org.springblade.common.handler.JsonStringArrayTypeHandler"/>
            <result column="eventSource" property="source"/>
            <result column="eventNo" property="no"/>
            <result column="eventRemark" property="remark"/>
        </collection>
    </resultMap>

    <select id="getTaskInfoOne" resultMap="taskinfoResultMapList">
        select  task.id,task.title,task.start_time,task.end_time,task.content,task.to_user_id,ST_ASTEXT(task.route_range) as route_range,
        task.state,task.source,task.create_user,task.create_time,task.update_user,task.update_time,task.status,task.create_dept,task.is_deleted,
        event.id eventId,
        event.type eventType,
        event.state eventState,
        event.address eventAddress,event.longitude eventLongitude,event.latitude eventLatitude,
        event.pic_urls eventPicUrls,event.source eventSource,event.no eventNo,event.remark eventRemark
        from ins_taskinfo task
        LEFT JOIN ins_eventgm event ON event.taskinfo_id = task.id
        where task.id = #{id} and task.is_deleted = 0
    </select>

    <select id="selectTaskInfoPage" resultMap="taskinfoResultMap">

 src/main/java/org/springblade/modules/taskinfo/vo/TaskInfoVO.java

@@ -16,10 +16,14 @@
 */
package org.springblade.modules.taskinfo.vo;

import org.springblade.modules.eventgm.entity.EventgmEntity;
import org.springblade.modules.eventgm.vo.EventgmVO;
import org.springblade.modules.taskinfo.entity.TaskInfoEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

/**
 * 日常巡检 视图实体类
@@ -32,4 +36,5 @@
public class TaskInfoVO extends TaskInfoEntity {
    private static final long serialVersionUID = 1L;

    private List<EventgmVO> eventgmList;
}