From 8d16030807fc48f9cacbf2a29a8f4b8a04a715fb Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期六, 01 十月 2022 21:24:05 +0800
Subject: [PATCH] bug 处理

---
 ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java        |    2 +
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml                |    2 +
 ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java              |   21 ++++++----
 ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java              |    2 +
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   39 ++++++++++---------
 ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java        |    3 +
 6 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
index de34a54..6cc25fc 100644
--- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
@@ -9,6 +9,8 @@
 @ApiModel("妗堜欢姹犺繚寤虹珛妗堜欢")
 public class CasePoolIllegalBuildingDO {
 
+    private Integer id;
+
     /**
      * 浜嬩欢缂栧彿
      */
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
index cfb96c0..ab90e48 100644
--- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
@@ -10,6 +10,8 @@
 @ApiModel("妗堜欢姹犺繚瑙勬浠�")
 public class CasePoolViolationDO {
 
+    private Integer id;
+
     /**
      * 浜嬩欢缂栧彿
      */
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 62abac5..de22bbc 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
@@ -143,24 +143,27 @@
         Integer type = 01;
         Integer hours = 60;
         Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
-        List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
-            CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
-            BeanUtils.copyProperties(item, casePoolViolationVO);
-            if (item.getCloseTime() == null) {
-                Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
-                long minutes = duration.toMinutes() - (duration.toHours() * hours);
-                String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
-                casePoolViolationVO.setContinueTime(continueTime);
-            } else {
-                Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
-                long minutes = duration.toMinutes() - (duration.toHours() * hours);
-                String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
-                casePoolViolationVO.setContinueTime(continueTime);
-            }
-            casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
-            casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
-            return casePoolViolationVO;
-        }).collect(Collectors.toList());
+        List<CasePoolViolationVO> violationVOList = violationsPage
+                .getRecords()
+                .stream()
+                .map(item -> {
+                    CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
+                    BeanUtils.copyProperties(item, casePoolViolationVO);
+                    if (item.getCloseTime() == null) {
+                        Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+                        long minutes = duration.toMinutes() - (duration.toHours() * hours);
+                        String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+                        casePoolViolationVO.setContinueTime(continueTime);
+                    } else {
+                        Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+                        long minutes = duration.toMinutes() - (duration.toHours() * hours);
+                        String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+                        casePoolViolationVO.setContinueTime(continueTime);
+                    }
+                    casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
+                    casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
+                    return casePoolViolationVO;
+                }).collect(Collectors.toList());
         Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
         BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage);
         casePoolViolationVOPage.setRecords(violationVOList);
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
index d946d45..840f271 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
@@ -11,6 +11,9 @@
 @ApiModel("妗堜欢姹犺繚寤虹珛妗堜欢")
 public class CasePoolIllegalBuildingVO {
 
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
     /**
      * 浜嬩欢缂栧彿
      */
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
index 644dbf0..43fa21c 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -10,60 +10,63 @@
 @ApiModel(value = "妗堜欢姹犺繚瑙刅O")
 public class CasePoolViolationVO {
 
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
     /**
      * 浜嬩欢缂栧彿
      */
-    @ApiModelProperty(value = "浜嬩欢缂栧彿", dataType = "String")
+    @ApiModelProperty(value = "浜嬩欢缂栧彿")
     private String code;
 
     /**
      * 浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)
      */
-    @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)", dataType = "Integer")
+    @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)")
     private Integer eventSource;
 
 
     /**
      * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
      */
-    @ApiModelProperty(value = "鎶ヨ鐐逛綅", dataType = "String")
+    @ApiModelProperty(value = "鎶ヨ鐐逛綅")
     private String site;
 
     /**
      * 鎵�灞炶閬�
      */
-    @ApiModelProperty(value = "鎵�灞炶閬�", dataType = "Integer")
+    @ApiModelProperty(value = "鎵�灞炶閬�")
     private Integer streetId;
 
     /**
      * 鎶ヨ鏃堕棿
      */
-    @ApiModelProperty(value = "鎶ヨ鏃堕棿", dataType = "LocalDateTime")
+    @ApiModelProperty(value = "鎶ヨ鏃堕棿")
     private LocalDateTime alarmTime;
 
 
     /**
      * 澶х被
      */
-    @ApiModelProperty(value = "澶х被", dataType = "String")
+    @ApiModelProperty(value = "澶х被")
     private String category;
 
     /**
      * 灏忕被
      */
-    @ApiModelProperty(value = "灏忕被", dataType = "String")
+    @ApiModelProperty(value = "灏忕被")
     private String type;
 
 
     /**
      * 妗堢敱
      */
-    @ApiModelProperty(value = "妗堢敱", dataType = "String")
+    @ApiModelProperty(value = "妗堢敱")
     private String actionCause;
 
     /**
      * 鎸佺画鏃堕棿
      */
-    @ApiModelProperty(value = "鎸佺画鏃堕棿", dataType = "String")
+    @ApiModelProperty(value = "鎸佺画鏃堕棿")
     private String continueTime;
 }
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index fd07456..c11bccc 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -40,6 +40,7 @@
 
     <select id="listViolationsPage" resultType="com.ycl.bo.casePool.CasePoolViolationDO">
         SELECT
+            ubc.`id`,
         ubc.`code`,
         ubc.event_source,
         uv.category_id,
@@ -68,6 +69,7 @@
 
     <select id="listIllegalBuildingsPage" resultType="com.ycl.bo.casePool.CasePoolIllegalBuildingDO">
         SELECT
+        ubc.`id`,
         ubc.`code`,
         ubc.event_source,
         uib.category_id,

--
Gitblit v1.8.0