添加流程记录。

mg

2022-09-29 0c342d5495689e71b29a1b712a166dc7774a6b0d

添加流程记录。

 ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java

File was deleted

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java

@@ -1,9 +1,9 @@
package com.ycl.entity.caseHandler;

import com.ycl.bo.casePool.CurrentSitVo;
import com.ycl.bo.casePool.FilesPictureVo;
import com.ycl.bo.casePool.HandlePassVo;
import com.ycl.bo.casePool.ProblemProVo;
import com.ycl.vo.casePool.CurrentSitVo;
import com.ycl.vo.casePool.FilesPictureVo;
import com.ycl.vo.casePool.HandlePassVo;
import com.ycl.vo.casePool.ProblemProVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -24,27 +24,27 @@
    /**
     * 案件基本信息
     */
    @ApiModelProperty(value = "案件基本信息",dataType = "BaseCase")
    @ApiModelProperty(value = "案件基本信息",dataType = "Object")
    private BaseCase baseCase;
    /**
     * 办理经过
     */
    @ApiModelProperty(value = "办理经过",dataType = "HandlePassVo")
    @ApiModelProperty(value = "办理经过",dataType = "Object")
    private HandlePassVo handlePassVo;
    /**
     * 案卷图片
     */
    @ApiModelProperty(value = "案卷图片",dataType = "FilesPictureVo")
    @ApiModelProperty(value = "案卷图片",dataType = "Object")
    private FilesPictureVo filesPictureVo;
    /**
     * 问题处理
     */
    @ApiModelProperty(value = "问题处理",dataType = "ProblemProVo")
    @ApiModelProperty(value = "问题处理",dataType = "Object")
    private ProblemProVo problemProVo;
    /**
     * 现场处理
     */
    @ApiModelProperty(value = "现场处理",dataType = "CurrentSitVo")
    @ApiModelProperty(value = "现场处理",dataType = "Object")
    private CurrentSitVo currentSitVo;

}

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java

@@ -1,14 +1,14 @@
package com.ycl.entity.caseHandler;

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -35,6 +35,12 @@
    private Integer baseCaseId;

    /**
     * 案件id
     */
    @TableField("workflow_config_step_id")
    private Integer workflowConfigStepId;

    /**
     * 环节名称
     */
    @TableField("step_name")

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java

@@ -34,7 +34,7 @@
    /**
     * 处置流程配置id
     */
    @TableField(value = "workflow_config_id ")
    @TableField(value = "workflow_config_id")
    @ApiModelProperty(value = "处置流程配置id",dataType = "Integer")
    private Integer workflowConfigId ;

@@ -47,13 +47,19 @@
    /**
     * 对应角色id
     */
    @TableField(value = "role_id ")
    @TableField(value = "role_id")
    @ApiModelProperty(value = "对应角色id",dataType = "Integer")
    private Integer roleId ;
    /**
     * 序号
     */
    @TableField(value = "seq ")
    @TableField(value = "seq")
    @ApiModelProperty(value = "序号",dataType = "Integer")
    private Integer seq ;
    /**
     * 处置流程记录
     */
    @TableField(value = "disposeRecord",exist = false)
    @ApiModelProperty(value = "处置流程记录",dataType = "DisposeRecord")
    private DisposeRecord disposeRecord;
}

 ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java

New file
@@ -0,0 +1,61 @@
package com.ycl.entity.common;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
 * 类说明
 * </p>
 *
 * @author mg
 * @since 2022-09-29
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_image_resources")
@ApiModel(value = "图片资源表")
public class ImageResources implements Serializable {

    private static final long serialVersionUID = 1L;
    /**
     * id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "id",dataType = "Integer")
    private Integer id;
    /**
     * 图片类型
     */
    @TableField("type")
    @ApiModelProperty(value = "图片类型",dataType = "String")
    private String type;
    /**
     * 路径
     */
    @TableField("url")
    @ApiModelProperty(value = "路径",dataType = "String")
    private String url;
    /**
     * 创建人
     */
    @TableField("create_user")
    @ApiModelProperty(value = "创建人",dataType = "Integer")
    private Integer createUser;
    /**
     * 创建时间
     */
    @TableField("create_time")
    @ApiModelProperty(value = "创建时间",dataType = "Date")
    private Date createTime;

}

 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.caseHandler.WorkflowConfigStep;

import java.util.List;

/**
 * <p>
 * 处置流程环节配置表 Mapper 接口
@@ -12,4 +14,6 @@
 * @since 2022-09-29
 */
public interface WorkflowConfigStepMapper extends BaseMapper<WorkflowConfigStep> {

   List<WorkflowConfigStep> selectRecordByWorkflowConfigStepId(Integer id);
}

 ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java

New file
@@ -0,0 +1,15 @@
package com.ycl.mapper.common;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.common.ImageResources;

/**
 * <p>
 * 类说明
 * </p>
 *
 * @author mg
 * @since 2022-09-29
 */
public interface ImageResourcesMapper extends BaseMapper<ImageResources> {
}

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -4,20 +4,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.casePool.*;
import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
import com.ycl.bo.casePool.CasePoolViolationDO;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.common.ImageResources;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.mapper.caseHandler.*;
import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.remote.dto.EventAddParamDto;
import com.ycl.remote.dto.EventProcessParamDto;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
import com.ycl.vo.casePool.CasePoolViolationVO;
import com.ycl.vo.casePool.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -84,6 +86,10 @@
    WorkflowConfigStepMapper workflowConfigStepMapper;
    @Resource
    WorkflowConfigMapper workflowConfigMapper;
    @Resource
    ImageResourcesMapper imageResourcesMapper;




    @Override
@@ -226,19 +232,21 @@
            }
        }
        //2.2查询处置流程环节配置
        QueryWrapper<WorkflowConfigStep> wrapperWcs = new QueryWrapper<>();
        wrapperWcs.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, ddlcId);
        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectList(wrapperWcs);
        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
        //2.3设置调度流程
        handlePassVo.setWorkflowConfigSteps(listWcs);
        bcd.setHandlePassVo(handlePassVo);
        //3.查询案卷图片信息
        FilesPictureVo filesPictureVo = new FilesPictureVo();
        QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
        wrapperIr.lambda().eq(ImageResources::getType, "01").or().eq(ImageResources::getType, "02");
        List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
        filesPictureVo.setImageResources(irs);
        bcd.setFilesPictureVo(filesPictureVo);
        //4.查询问题处理信息
        ProblemProVo problemProVo = new ProblemProVo();
        //4.2查询处置流程环节配置
        QueryWrapper<WorkflowConfigStep> wrapperWcsPp = new QueryWrapper<>();
        wrapperWcsPp.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, wtcllcId);
        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectList(wrapperWcsPp);
        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(wtcllcId);
        //4.3设置调度流程
        problemProVo.setWorkflowConfigSteps(listWcsPp);
        bcd.setProblemProVo(problemProVo);

 ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java

File was renamed from ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
@@ -1,4 +1,4 @@
package com.ycl.bo.casePool;
package com.ycl.vo.casePool;

import com.ycl.entity.caseHandler.ArrivalSituation;
import com.ycl.entity.caseHandler.Investigation;

 ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java

New file
@@ -0,0 +1,24 @@
package com.ycl.vo.casePool;

import com.ycl.entity.common.ImageResources;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * <p>
 *  案卷图片 类
 * </p>
 *
 * @author mg
 * @since 2022-09-29
 */
@Data
public class FilesPictureVo {
    /**
     * 图片列表
     */
    @ApiModelProperty(value = "图片列表",dataType = "ImageResources")
    private List<ImageResources> imageResources;
}

 ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java

File was renamed from ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
@@ -1,4 +1,4 @@
package com.ycl.bo.casePool;
package com.ycl.vo.casePool;

import com.ycl.entity.caseHandler.WorkflowConfigStep;
import io.swagger.annotations.ApiModelProperty;

 ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java

File was renamed from ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
@@ -1,4 +1,4 @@
package com.ycl.bo.casePool;
package com.ycl.vo.casePool;

import com.ycl.entity.caseHandler.WorkflowConfigStep;
import io.swagger.annotations.ApiModelProperty;

 ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.DisposeRecord">
        <id column="id" property="id" />
        <result column="base_case_id" property="baseCaseId" />
        <result column="workflow_config_step_id" property="workflowConfigStepId" />
        <result column="step_name" property="stepName" />
        <result column="start_time" property="startTime" />
        <result column="handler_role_id" property="handlerRoleId" />
@@ -20,5 +21,9 @@
    <sql id="Base_Column_List">
        id, base_case_id, step_name, start_time, handler_role_id, end_time, state, handler_id, create_user, create_time
    </sql>
    <select id="selectByWorkflowConfigStepId" parameterType="Integer" resultMap="BaseResultMap">
        SELECT * FROM ums_dispose_record udr
        WHERE udr.workflow_config_step_id=#{id}
    </select>

</mapper>

 ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml

New file
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.caseHandler.WorkflowConfigStepMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.WorkflowConfigStep">
        <id column="id" property="id" />
        <result column="workflow_config_id" property="workflowConfigId" />
        <result column="name" property="name" />
        <result column="role_id" property="roleId" />
        <result column="seq" property="seq" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, workflow_config_id "workflowConfigId", name "name",role_id "roleId",seq "seq"
    </sql>
    <resultMap type="com.ycl.entity.caseHandler.WorkflowConfigStep" id="RecordResultMap" extends="BaseResultMap">
        <association property="disposeRecord" column="id"
                     select="com.ycl.mapper.caseHandler.DisposeRecordMapper.selectByWorkflowConfigStepId"
                     javaType="com.ycl.entity.caseHandler.DisposeRecord" />
    </resultMap>
    <select id="selectRecordByWorkflowConfigStepId" parameterType="Integer" resultMap="RecordResultMap">
        SELECT * FROM ums_workflow_config_step uwcs
                 WHERE uwcs.workflow_config_id=#{id}
    </select>
</mapper>