From 0c342d5495689e71b29a1b712a166dc7774a6b0d Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期四, 29 九月 2022 18:34:30 +0800 Subject: [PATCH] 添加流程记录。 --- ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java | 2 ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java | 61 +++++++++++++++ ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java | 12 ++ ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java | 24 ++++++ ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml | 27 ++++++ ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java | 16 ++- ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java | 2 /dev/null | 12 --- ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java | 2 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java | 18 ++-- ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java | 4 + ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml | 5 + ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 26 ++++-- ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java | 15 +++ 14 files changed, 185 insertions(+), 41 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java deleted file mode 100644 index b087bd6..0000000 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.ycl.bo.casePool; - -/** - * <p> - * 妗堝嵎鍥剧墖 绫� - * </p> - * - * @author mg - * @since 2022-09-29 - */ -public class FilesPictureVo { -} diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java index 0407995..1d099f2 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java +++ b/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; } diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java index 87aaa07..b0cae77 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java +++ b/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") diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java index 62bae4b..da3fdf5 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java +++ b/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; } diff --git a/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java new file mode 100644 index 0000000..7b9678a --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java @@ -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; + +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java index 487a0fd..a80a186 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java +++ b/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); } diff --git a/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java new file mode 100644 index 0000000..9226758 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java @@ -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> { +} diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index b1913e7..e5220d4 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/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); diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java similarity index 96% rename from ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java rename to ycl-platform/src/main/java/com/ycl/vo/casePool/CurrentSitVo.java index 7609027..132383b 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java +++ b/ycl-platform/src/main/java/com/ycl/vo/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; diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java new file mode 100644 index 0000000..e95e1ef --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java @@ -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; +} diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java similarity index 93% rename from ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java rename to ycl-platform/src/main/java/com/ycl/vo/casePool/HandlePassVo.java index 0e6c662..a422231 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java +++ b/ycl-platform/src/main/java/com/ycl/vo/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; diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java similarity index 93% rename from ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java rename to ycl-platform/src/main/java/com/ycl/vo/casePool/ProblemProVo.java index d6e4b0e..783791f 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java +++ b/ycl-platform/src/main/java/com/ycl/vo/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; diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml index e86cabb..be82f85 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml +++ b/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> diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml new file mode 100644 index 0000000..9cc2038 --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml @@ -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> -- Gitblit v1.8.0