From f363449e42530f0bcb1cc6a72e0d52fb1f775f54 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 29 九月 2022 13:08:57 +0800
Subject: [PATCH] 案件详情。
---
ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java | 12 +++
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 9 ++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 11 ++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java | 50 ++++++++++++
ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java | 34 ++++++++
ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java | 12 +++
ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java | 12 +++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 54 +++++++++++--
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java | 16 +++
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 5 +
10 files changed, 205 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
new file mode 100644
index 0000000..23265c6
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
@@ -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;
+}
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
new file mode 100644
index 0000000..fbfa680
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java
@@ -0,0 +1,12 @@
+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/bo/casePool/HandlePassVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
new file mode 100644
index 0000000..90b9253
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java
@@ -0,0 +1,12 @@
+package com.ycl.bo.casePool;
+
+/**
+ * <p>
+ * 绫昏鏄�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+public class HandlePassVo {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
new file mode 100644
index 0000000..8aa5227
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java
@@ -0,0 +1,12 @@
+package com.ycl.bo.casePool;
+
+/**
+ * <p>
+ * 绫昏鏄�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-09-29
+ */
+public class ProblemProVo {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index fd638a9..0f17330 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/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));
+ }
+
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
index dcf9484..ffb38b1 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
+++ b/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;
}
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
new file mode 100644
index 0000000..0407995
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCaseDetail.java
@@ -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;
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index c72ca6c..82a709e 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/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;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 2174583..a6f36b9 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/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);
}
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 a4cd580..ff3c5dc 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
@@ -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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0