ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
New file @@ -0,0 +1,34 @@ package com.ycl.bo.casePool; import com.ycl.entity.caseHandler.ArrivalSituation; import com.ycl.entity.caseHandler.Investigation; import com.ycl.entity.caseHandler.Writ; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * <p> * 类说明 * </p> * * @author mg * @since 2022-09-29 */ @Data public class CurrentSitVo { /** * 到达现场情况 */ @ApiModelProperty(value = "到达现场情况",dataType = "ArrivalSituation") private ArrivalSituation arrivalSituation; /** * 调查取证 */ @ApiModelProperty(value = "调查取证",dataType = "Investigation") private Investigation investigation; /** * 告知违法 */ @ApiModelProperty(value = "告知违法",dataType = "Writ") private Writ writ; } ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java
New file @@ -0,0 +1,12 @@ package com.ycl.bo.casePool; /** * <p> * 类说明 * </p> * * @author mg * @since 2022-09-29 */ public class FilesPictureVo { } ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
New file @@ -0,0 +1,12 @@ package com.ycl.bo.casePool; /** * <p> * 类说明 * </p> * * @author mg * @since 2022-09-29 */ public class HandlePassVo { } ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
New file @@ -0,0 +1,12 @@ package com.ycl.bo.casePool; /** * <p> * 类说明 * </p> * * @author mg * @since 2022-09-29 */ public class ProblemProVo { } ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -172,4 +172,15 @@ baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId())); } @ApiOperation(value = "案件详情") @GetMapping("/baseCaseDetail/{code}") @ApiImplicitParams({ @ApiImplicitParam(name = "code", value = "事件编号") }) public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) { return CommonResult.success(baseCaseService.baseCaseDetail(code)); } } ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -1,6 +1,7 @@ package com.ycl.dto.caseHandler; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -16,41 +17,49 @@ * 执法人员 */ @JsonProperty("lawEnforcer") @ApiModelProperty(value = "执法人员",dataType = "Integer") private Integer lawEnforcer; /** * 执法人员姓名 */ @JsonProperty("lawEnforcerName") @ApiModelProperty(value = "执法人员姓名",dataType = "String") private String lawEnforcerName; /** * 执法车 */ @JsonProperty("enforcementCar") @ApiModelProperty(value = "执法车",dataType = "Integer") private Integer enforcementCar; /** * 执法队伍 */ @JsonProperty("enforcementTeam") @ApiModelProperty(value = "执法队伍",dataType = "String") private String enforcementTeam; /** * 联系方式 */ @JsonProperty("contactWay") @ApiModelProperty(value = "联系方式",dataType = "String") private String contactWay; /** * 距离 */ @JsonProperty("distance") @ApiModelProperty(value = "距离",dataType = "Integer") private Integer distance; /** * 处置日期 */ @JsonProperty("disposeDate") @ApiModelProperty(value = "处置日期",dataType = "String") private String disposeDate; /** * 派遣意见 */ @JsonProperty("dispatchOpinion") @ApiModelProperty(value = "派遣意见",dataType = "String") private String dispatchOpinion; } ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
New file @@ -0,0 +1,50 @@ 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 io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; /** * <p> * 案件详情类 * </p> * * @author mg * @since 2022-09-29 */ @Data public class BaseCaseDetail implements Serializable { private static final long serialVersionUID = 1L; /** * 案件基本信息 */ @ApiModelProperty(value = "案件基本信息",dataType = "BaseCase") private BaseCase baseCase; /** * 办理经过 */ @ApiModelProperty(value = "办理经过",dataType = "HandlePassVo") private HandlePassVo handlePassVo; /** * 案卷图片 */ @ApiModelProperty(value = "案卷图片",dataType = "FilesPictureVo") private FilesPictureVo filesPictureVo; /** * 问题处理 */ @ApiModelProperty(value = "问题处理",dataType = "ProblemProVo") private ProblemProVo problemProVo; /** * 现场处理 */ @ApiModelProperty(value = "现场处理",dataType = "CurrentSitVo") private CurrentSitVo currentSitVo; } ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; /** @@ -20,7 +22,7 @@ @Data @EqualsAndHashCode(callSuper = false) @TableName("ums_dispatch_info") public class DispatchInfo { public class DispatchInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -28,62 +30,74 @@ * id */ @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "id",dataType = "Integer") private Integer id; /** * 处置流程记录Id */ @TableField("dispose_record_id") @ApiModelProperty(value = "处置流程记录Id",dataType = "Integer") private Integer disposeRecordId; /** * 执法人员 */ @TableField("law_enforcer") @ApiModelProperty(value = "执法人员",dataType = "Integer") private Integer lawEnforcer; /** * 执法人员姓名 */ @TableField("law_enforcer_name") @ApiModelProperty(value = "执法人员姓名",dataType = "String") private String lawEnforcerName; /** * 执法车 */ @TableField("enforcement_car") @ApiModelProperty(value = "执法车",dataType = "Integer") private Integer enforcementCar; /** * 执法队伍 */ @TableField("enforcement_team") @ApiModelProperty(value = "执法队伍",dataType = "String") private String enforcementTeam; /** * 联系方式 */ @TableField("contact_way") @ApiModelProperty(value = "联系方式",dataType = "String") private String contactWay; /** * 距离 */ @TableField("distance") @ApiModelProperty(value = "距离",dataType = "Integer") private Integer distance; /** * 处置日期 */ @TableField("dispose_date") @ApiModelProperty(value = "处置日期",dataType = "Date") private Date disposeDate; /** * 派遣意见 */ @TableField("dispatch_opinion") @ApiModelProperty(value = "派遣意见",dataType = "String") private String dispatchOpinion; /** * 创建人 */ @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/service/caseHandler/IBaseCaseService.java
@@ -1,10 +1,11 @@ package com.ycl.service.caseHandler; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.BaseCase; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.caseHandler.BaseCaseDetail; /** * <p> @@ -41,4 +42,6 @@ * @date 2022-09-28 17:45 */ String processEvent(Integer caseId); BaseCaseDetail baseCaseDetail(String code); } ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -1,21 +1,19 @@ package com.ycl.service.caseHandler.impl; 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.CasePoolIllegalBuildingDO; import com.ycl.bo.casePool.CasePoolViolationDO; import com.ycl.bo.casePool.CurrentSitVo; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.BaseCase; import com.ycl.entity.caseHandler.IllegalBuilding; import com.ycl.entity.caseHandler.Violations; import com.ycl.entity.caseHandler.*; import com.ycl.entity.video.VideoAlarmReport; import com.ycl.mapper.caseHandler.BaseCaseMapper; import com.ycl.mapper.caseHandler.IllegalBuildingMapper; import com.ycl.mapper.caseHandler.ViolationsMapper; import com.ycl.mapper.caseHandler.*; import com.ycl.mapper.dict.DataDictionaryMapper; import com.ycl.remote.dto.*; import com.ycl.remote.service.CityPlatformService; 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; @@ -74,6 +72,14 @@ ViolationsMapper violationsMapper; @Resource IllegalBuildingMapper illegalBuildingMapper; @Resource ArrivalSituationMapper arrivalSituationMapper; @Resource InvestigationMapper investigationMapper; @Resource WritMapper writMapper; @Override public String uploadEvent(Integer caseId) { @@ -190,4 +196,36 @@ Integer value = 1; return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false; } @Override public BaseCaseDetail baseCaseDetail(String code) { BaseCaseDetail bcd = new BaseCaseDetail(); //1.查询案件基本信息 QueryWrapper<BaseCase> wrapper = new QueryWrapper<>(); wrapper.lambda().eq(BaseCase::getCode, code); BaseCase baseCase = baseCaseMapper.selectOne(wrapper); bcd.setBaseCase(baseCase); //2.查询办理经过信息 //3.查询案卷图片信息 //4.查询问题处理信息 //5.查询现场情况信息 CurrentSitVo currentSitVo = new CurrentSitVo(); QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>(); wrapperAs.lambda().eq(ArrivalSituation::getBaseCaseId, baseCase.getId()); //设置到达现场情况 ArrivalSituation as = arrivalSituationMapper.selectOne(wrapperAs); currentSitVo.setArrivalSituation(as); //设置调查取证 QueryWrapper<Investigation> wrapperI = new QueryWrapper<>(); wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId()); Investigation investigation = investigationMapper.selectOne(wrapperI); currentSitVo.setInvestigation(investigation); //设置告知违法 QueryWrapper<Writ> wrapperW = new QueryWrapper<>(); wrapperW.lambda().eq(Writ::getBaseCaseId, baseCase.getId()); Writ writ = writMapper.selectOne(wrapperW); currentSitVo.setWrit(writ); bcd.setCurrentSitVo(currentSitVo); return bcd; } }