From a2a2209f983a2bb736b59c9217790740930e7017 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 06 八月 2024 15:13:45 +0800
Subject: [PATCH] Monitor结构更新

---
 ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java        |   11 
 ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java         |   12 
 ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java        |   12 
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java               |    2 
 ycl-server/src/main/java/com/ycl/task/CarTask.java                                 |    2 
 ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java        |   13 
 ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java        |   14 
 ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java          |   11 
 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java            |    2 
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java                  |  496 +++++-----------------------
 ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java         |   12 
 ycl-server/src/main/java/com/ycl/task/FaceTask.java                                |    2 
 ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java        |   11 
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java |   62 ++-
 ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java         |   12 
 ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java       |   12 
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java                |   22 -
 ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java        |   12 
 ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java       |   12 
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                       |  277 ++++++++++-----
 ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java             |   11 
 21 files changed, 407 insertions(+), 613 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
index 296b1ba..eb49977 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
@@ -142,33 +142,12 @@
     @Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
     private Long lxbm;
 
-    @TableField(exist = false)
-    private Integer recovery;
-
-    private Long deptId;
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
     public void setInstalledTime(Date installedTime) {
         this.installedTime = installedTime;
     }
 
     public Date getInstalledTime() {
         return installedTime;
-    }
-
-    public Integer getRecovery() {
-        return recovery;
-    }
-
-    public void setRecovery(Integer recovery) {
-        this.recovery = recovery;
     }
 
     public void setId(Long id)
@@ -477,7 +456,6 @@
                 ", cameraDept='" + cameraDept + '\'' +
                 ", hybm='" + hybm + '\'' +
                 ", lxbm=" + lxbm +
-                ", deptId=" + deptId +
                 '}';
     }
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
index 6d3d648..fa83f24 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
@@ -3,6 +3,7 @@
 import annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -13,131 +14,193 @@
  * @author ruoyi
  * @date 2024-03-04
  */
-public class TMonitorVO extends BaseEntity
-{
+@Data
+public class TMonitorVO extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 璁惧缂栫爜 */
+    /**
+     * 璁惧缂栫爜
+     */
     @Excel(name = "璁惧缂栫爜")
     private String serialNumber;
 
-    /** 璁惧鍚嶇О */
+    /**
+     * 璁惧鍚嶇О
+     */
     @Excel(name = "璁惧鍚嶇О")
     private String name;
 
-    /** 鐩戞帶鐐逛綅绫诲瀷 [1.涓�绫昏棰戠洃鎺х偣;2.浜岀被瑙嗛鐩戞帶鐐�;3.涓夌被瑙嗛鐩戞帶鐐�;4.鍏畨鍐呴儴瑙嗛鐩戞帶鐐�;9.鍏朵粬鐐逛綅;] */
+    /**
+     * 鐩戞帶鐐逛綅绫诲瀷 [1.涓�绫昏棰戠洃鎺х偣;2.浜岀被瑙嗛鐩戞帶鐐�;3.涓夌被瑙嗛鐩戞帶鐐�;4.鍏畨鍐呴儴瑙嗛鐩戞帶鐐�;9.鍏朵粬鐐逛綅;]
+     */
     @Excel(name = "鐩戞帶鐐逛綅绫诲瀷 [1.涓�绫昏棰戠洃鎺х偣;2.浜岀被瑙嗛鐩戞帶鐐�;3.涓夌被瑙嗛鐩戞帶鐐�;4.鍏畨鍐呴儴瑙嗛鐩戞帶鐐�;9.鍏朵粬鐐逛綅;]")
     private Long siteType;
 
-    /** 鎽勫儚鏈篗ac鍦板潃 */
+    /**
+     * 鎽勫儚鏈篗ac鍦板潃
+     */
     @Excel(name = "鎽勫儚鏈篗ac鍦板潃")
     private String macAddr;
 
-    /** 鎽勫儚鏈篒PV4鎴朓PV6鍦板潃 */
+    /**
+     * 鎽勫儚鏈篒PV4鎴朓PV6鍦板潃
+     */
     @Excel(name = "鎽勫儚鏈篒PV4鎴朓PV6鍦板潃")
     private String ip;
 
-    /** 鎽勫儚鏈哄姛鑳界被鍨媅1.瑙嗛鐩戞帶;2.杞﹁締璇嗗埆;3.浜哄憳璇嗗埆;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2] */
+    /**
+     * 鎽勫儚鏈哄姛鑳界被鍨媅1.瑙嗛鐩戞帶;2.杞﹁締璇嗗埆;3.浜哄憳璇嗗埆;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2]
+     */
     @Excel(name = "鎽勫儚鏈哄姛鑳界被鍨媅1.瑙嗛鐩戞帶;2.杞﹁締璇嗗埆;3.浜哄憳璇嗗埆;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2]")
     private String cameraFunType;
 
-    /** 璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
+    /**
+     * 璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�
+     */
     @Excel(name = "璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
     private String longitude;
 
-    /** 璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
+    /**
+     * 璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�
+     */
     @Excel(name = "璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
     private String latitude;
 
-    /** 鎽勫儚鏈洪噰闆嗗尯鍩熷弬鑰冨瓧鍏歌〃锛屾暟鎹閫変互/闅斿紑 */
+    /**
+     * 鎽勫儚鏈洪噰闆嗗尯鍩熷弬鑰冨瓧鍏歌〃锛屾暟鎹閫変互/闅斿紑
+     */
     @Excel(name = "鎽勫儚鏈洪噰闆嗗尯鍩熷弬鑰冨瓧鍏歌〃锛屾暟鎹閫変互/闅斿紑")
     private String cameraCaptureArea;
 
-    /** 璁惧鐘舵�� 1/2 鍙敤/涓嶅彲鐢� */
+    /**
+     * 璁惧鐘舵�� 1/2 鍙敤/涓嶅彲鐢�
+     */
     @Excel(name = "璁惧鐘舵�� 1/2 鍙敤/涓嶅彲鐢�")
     private Long onState;
 
-    /** 琛屾斂鍖哄煙 */
+    /**
+     * 琛屾斂鍖哄煙
+     */
     @Excel(name = "琛屾斂鍖哄煙")
     private String civilCode;
 
-    /** 鏄惁闆嗘垚璁惧锛�0/1 涓嶆槸/鏄� */
+    /**
+     * 鏄惁闆嗘垚璁惧锛�0/1 涓嶆槸/鏄�
+     */
     @Excel(name = "鏄惁闆嗘垚璁惧锛�0/1 涓嶆槸/鏄�")
     private Long integratedDevice;
 
-    /** 鎽勫儚鏈哄搧鐗� [1.娴峰悍濞佽;2.澶у崕;3.澶╁湴浼熶笟;4.绉戣揪;5.瀹夎澹�;6.鍗氫笘;7.浜氬畨;8.鑻遍鎷�;9.瀹囪;10.娴蜂俊;11.涓槦鐢靛瓙;12.鏄庢櫙;13.鑱旀兂;14.涓叴;15.绱㈠凹;16.涓夋槦;99.鍏跺畠; */
+    /**
+     * 鎽勫儚鏈哄搧鐗� [1.娴峰悍濞佽;2.澶у崕;3.澶╁湴浼熶笟;4.绉戣揪;5.瀹夎澹�;6.鍗氫笘;7.浜氬畨;8.鑻遍鎷�;9.瀹囪;10.娴蜂俊;11.涓槦鐢靛瓙;12.鏄庢櫙;13.鑱旀兂;14.涓叴;15.绱㈠凹;16.涓夋槦;99.鍏跺畠;
+     */
     @Excel(name = "鎽勫儚鏈哄搧鐗� [1.娴峰悍濞佽;2.澶у崕;3.澶╁湴浼熶笟;4.绉戣揪;5.瀹夎澹�;6.鍗氫笘;7.浜氬畨;8.鑻遍鎷�;9.瀹囪;10.娴蜂俊;11.涓槦鐢靛瓙;12.鏄庢櫙;13.鑱旀兂;14.涓叴;15.绱㈠凹;16.涓夋槦;99.鍏跺畠;")
     private Long cameraBrand;
 
-    /** 瀹夎鍦板潃 */
+    /**
+     * 瀹夎鍦板潃
+     */
     @Excel(name = "瀹夎鍦板潃")
     private String address;
 
-    /** 鑱旂綉灞炴�� 0/1 宸茶仈缃�/鏈仈缃� */
+    /**
+     * 鑱旂綉灞炴�� 0/1 宸茶仈缃�/鏈仈缃�
+     */
     @Excel(name = "鑱旂綉灞炴�� 0/1 宸茶仈缃�/鏈仈缃�")
     private Long netWorking;
 
-    /** 鎵�灞炶緰鍖哄叕瀹夋満鍏� */
+    /**
+     * 鎵�灞炶緰鍖哄叕瀹夋満鍏�
+     */
     @Excel(name = "鎵�灞炶緰鍖哄叕瀹夋満鍏�")
     private String publicSecurity;
 
-    /** 瀹夎鏃堕棿 yyyy-MM-dd HH:mm:ss */
+    /**
+     * 瀹夎鏃堕棿 yyyy-MM-dd HH:mm:ss
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "瀹夎鏃堕棿 yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date installedTime;
 
-    /** 绠$悊鍗曚綅 */
+    /**
+     * 绠$悊鍗曚綅
+     */
     @Excel(name = "绠$悊鍗曚綅")
     private String managementUnit;
 
-    /** 绠$悊鍗曚綅鑱旂郴鏂瑰紡 */
+    /**
+     * 绠$悊鍗曚綅鑱旂郴鏂瑰紡
+     */
     @Excel(name = "绠$悊鍗曚綅鑱旂郴鏂瑰紡")
     private String muContactInfo;
 
-    /** 褰曡薄淇濆瓨澶╂暟 0 - 2147483647 */
+    /**
+     * 褰曡薄淇濆瓨澶╂暟 0 - 2147483647
+     */
     @Excel(name = "褰曡薄淇濆瓨澶╂暟 0 - 2147483647")
     private Long storageDays;
 
-    /** 鐩戣鏂逛綅 [1.涓�;2.瑗�;3.鍗�;4.鍖�;5.涓滃崡;6.涓滃寳;7.瑗垮崡;8.瑗垮寳;9.鍏ㄥ悜;] */
+    /**
+     * 鐩戣鏂逛綅 [1.涓�;2.瑗�;3.鍗�;4.鍖�;5.涓滃崡;6.涓滃寳;7.瑗垮崡;8.瑗垮寳;9.鍏ㄥ悜;]
+     */
     @Excel(name = "鐩戣鏂逛綅 [1.涓�;2.瑗�;3.鍗�;4.鍖�;5.涓滃崡;6.涓滃寳;7.瑗垮崡;8.瑗垮寳;9.鍏ㄥ悜;]")
     private Long monitorAzimuth;
 
-    /** 鎽勫儚鏈哄満鏅璁剧収鐗嘦RL */
+    /**
+     * 鎽勫儚鏈哄満鏅璁剧収鐗嘦RL
+     */
     @Excel(name = "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL")
     private String scenePhotoAddr;
 
-    /** 璁惧鍨嬪彿 */
+    /**
+     * 璁惧鍨嬪彿
+     */
     @Excel(name = "璁惧鍨嬪彿")
     private String model;
 
-    /** 鐐逛綅淇楃О */
+    /**
+     * 鐐逛綅淇楃О
+     */
     @Excel(name = "鐐逛綅淇楃О")
     private String siteVulgo;
 
-    /** 鎽勫儚鏈虹被鍨� [1.鐞冩満;2.鍗婄悆;3.鍥哄畾鏋満;4.閬ユ帶鏋満;5.鍗″彛鏋満;99.鏈煡; */
+    /**
+     * 鎽勫儚鏈虹被鍨� [1.鐞冩満;2.鍗婄悆;3.鍥哄畾鏋満;4.閬ユ帶鏋満;5.鍗″彛鏋満;99.鏈煡;
+     */
     @Excel(name = "鎽勫儚鏈虹被鍨� [1.鐞冩満;2.鍗婄悆;3.鍥哄畾鏋満;4.閬ユ帶鏋満;5.鍗″彛鏋満;99.鏈煡;")
     private Long cameraType;
 
-    /** 琛ュ厜灞炴�1.鏃犺ˉ鍏�;2.绾㈠琛ュ厜;3.鐧藉厜琛ュ厜;9.鍏朵粬琛ュ厜;]  */
+    /**
+     * 琛ュ厜灞炴�1.鏃犺ˉ鍏�;2.绾㈠琛ュ厜;3.鐧藉厜琛ュ厜;9.鍏朵粬琛ュ厜;]
+     */
     @Excel(name = "琛ュ厜灞炴�1.鏃犺ˉ鍏�;2.绾㈠琛ュ厜;3.鐧藉厜琛ュ厜;9.鍏朵粬琛ュ厜;] ")
     private Long cameraLightType;
 
-    /** 鎽勫儚鏈虹紪鐮佹牸寮� [1.MPEG-4;2.H.264;3.SVAC;4.H.265;] */
+    /**
+     * 鎽勫儚鏈虹紪鐮佹牸寮� [1.MPEG-4;2.H.264;3.SVAC;4.H.265;]
+     */
     @Excel(name = "鎽勫儚鏈虹紪鐮佹牸寮� [1.MPEG-4;2.H.264;3.SVAC;4.H.265;]")
     private Long encodedFormat;
 
-    /** 鎵�灞為儴闂�/琛屼笟 鍙栧�艰寖鍥�(澶氶��) : [1.鍏畨鏈哄叧;2.鐜繚閮ㄩ棬;3.鏂囧崥閮ㄩ棬;4.鍖荤枟閮ㄩ棬;5.鏃呮父绠$悊;6.鏂伴椈骞跨數;7.椋熷搧鍖昏嵂鐩戠潱绠$悊閮ㄩ棬;8.鏁欒偛绠$悊閮ㄩ棬;9.妫�瀵熼櫌;10.娉曢櫌;11.閲戣瀺閮ㄩ棬;12.浜ら�氶儴闂�;13.浣忔埧鍜屽煄涔″缓璁鹃儴闂�;14.姘村埄閮ㄩ棬;15.鏋椾笟閮ㄩ棬;16.瀹夊叏鐢熶骇鐩戠潱閮ㄩ棬;17.甯傛斂甯傚濮�;18.鍥藉湡灞�;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2] */
+    /**
+     * 鎵�灞為儴闂�/琛屼笟 鍙栧�艰寖鍥�(澶氶��) : [1.鍏畨鏈哄叧;2.鐜繚閮ㄩ棬;3.鏂囧崥閮ㄩ棬;4.鍖荤枟閮ㄩ棬;5.鏃呮父绠$悊;6.鏂伴椈骞跨數;7.椋熷搧鍖昏嵂鐩戠潱绠$悊閮ㄩ棬;8.鏁欒偛绠$悊閮ㄩ棬;9.妫�瀵熼櫌;10.娉曢櫌;11.閲戣瀺閮ㄩ棬;12.浜ら�氶儴闂�;13.浣忔埧鍜屽煄涔″缓璁鹃儴闂�;14.姘村埄閮ㄩ棬;15.鏋椾笟閮ㄩ棬;16.瀹夊叏鐢熶骇鐩戠潱閮ㄩ棬;17.甯傛斂甯傚濮�;18.鍥藉湡灞�;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2]
+     */
     @Excel(name = "鎵�灞為儴闂�/琛屼笟 鍙栧�艰寖鍥�(澶氶��) : [1.鍏畨鏈哄叧;2.鐜繚閮ㄩ棬;3.鏂囧崥閮ㄩ棬;4.鍖荤枟閮ㄩ棬;5.鏃呮父绠$悊;6.鏂伴椈骞跨數;7.椋熷搧鍖昏嵂鐩戠潱绠$悊閮ㄩ棬;8.鏁欒偛绠$悊閮ㄩ棬;9.妫�瀵熼櫌;10.娉曢櫌;11.閲戣瀺閮ㄩ棬;12.浜ら�氶儴闂�;13.浣忔埧鍜屽煄涔″缓璁鹃儴闂�;14.姘村埄閮ㄩ棬;15.鏋椾笟閮ㄩ棬;16.瀹夊叏鐢熶骇鐩戠潱閮ㄩ棬;17.甯傛斂甯傚濮�;18.鍥藉湡灞�;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡�  1/2]")
     private String cameraDept;
 
-    /** 琛屼笟缂栫爜 [00.绀句細娌诲畨璺潰鎺ュ叆;01.绀句細娌诲畨绀惧尯鎺ュ叆;02.绀句細娌诲畨鍐呴儴鎺ュ叆;03.绀句細娌诲畨鍏朵粬鎺ュ叆;04.浜ら�氳矾闈㈡帴鍏�;05.浜ら�氬崱鍙f帴鍏�;06.浜ら�氬唴閮ㄦ帴鍏�;07.浜ら�氬叾浠栨帴鍏�;08.鍩庡競绠$悊鎺ュ叆;09.鍗敓鐜繚鎺ュ叆;10.鍟嗘娴峰叧鎺ュ叆;11.鏁欒偛閮ㄩ棬鎺ュ叆;] */
+    /**
+     * 琛屼笟缂栫爜 [00.绀句細娌诲畨璺潰鎺ュ叆;01.绀句細娌诲畨绀惧尯鎺ュ叆;02.绀句細娌诲畨鍐呴儴鎺ュ叆;03.绀句細娌诲畨鍏朵粬鎺ュ叆;04.浜ら�氳矾闈㈡帴鍏�;05.浜ら�氬崱鍙f帴鍏�;06.浜ら�氬唴閮ㄦ帴鍏�;07.浜ら�氬叾浠栨帴鍏�;08.鍩庡競绠$悊鎺ュ叆;09.鍗敓鐜繚鎺ュ叆;10.鍟嗘娴峰叧鎺ュ叆;11.鏁欒偛閮ㄩ棬鎺ュ叆;]
+     */
     @Excel(name = "琛屼笟缂栫爜 [00.绀句細娌诲畨璺潰鎺ュ叆;01.绀句細娌诲畨绀惧尯鎺ュ叆;02.绀句細娌诲畨鍐呴儴鎺ュ叆;03.绀句細娌诲畨鍏朵粬鎺ュ叆;04.浜ら�氳矾闈㈡帴鍏�;05.浜ら�氬崱鍙f帴鍏�;06.浜ら�氬唴閮ㄦ帴鍏�;07.浜ら�氬叾浠栨帴鍏�;08.鍩庡競绠$悊鎺ュ叆;09.鍗敓鐜繚鎺ュ叆;10.鍟嗘娴峰叧鎺ュ叆;11.鏁欒偛閮ㄩ棬鎺ュ叆;]")
     private String hybm;
 
-    /** 绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;] */
+    /**
+     * 绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]
+     */
     @Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
     private Long lxbm;
 
@@ -147,376 +210,13 @@
     @Excel(name = "鏄惁鐢熸垚寮傚父宸ュ崟")
     private Long defaultOrder;
 
-    @Excel(name ="寮傚父鎭㈠鏍囪瘑")
+    @Excel(name = "寮傚父鎭㈠鏍囪瘑")
     private Long recovery;
 
     @Excel(name = "寮傚父鎭㈠鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recoveryTime;
 
+    private Long deptId;
     private String deptName;
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public Long getDefaultOrder() {
-        return defaultOrder;
-    }
-
-    public void setDefaultOrder(Long defaultOrder) {
-        this.defaultOrder = defaultOrder;
-    }
-
-    public void setInstalledTime(Date installedTime) {
-        this.installedTime = installedTime;
-    }
-
-    public Date getInstalledTime() {
-        return installedTime;
-    }
-
-    public Date getRecoveryTime() {
-        return recoveryTime;
-    }
-
-    public void setRecoveryTime(Date recoveryTime) {
-        this.recoveryTime = recoveryTime;
-    }
-
-    public Long getRecovery() {
-        return recovery;
-    }
-
-    public void setRecovery(Long recovery) {
-        this.recovery = recovery;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setSerialNumber(String serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getSerialNumber()
-    {
-        return serialNumber;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-    public void setSiteType(Long siteType)
-    {
-        this.siteType = siteType;
-    }
-
-    public Long getSiteType()
-    {
-        return siteType;
-    }
-    public void setMacAddr(String macAddr)
-    {
-        this.macAddr = macAddr;
-    }
-
-    public String getMacAddr()
-    {
-        return macAddr;
-    }
-    public void setIp(String ip)
-    {
-        this.ip = ip;
-    }
-
-    public String getIp()
-    {
-        return ip;
-    }
-    public void setCameraFunType(String cameraFunType)
-    {
-        this.cameraFunType = cameraFunType;
-    }
-
-    public String getCameraFunType()
-    {
-        return cameraFunType;
-    }
-    public void setLongitude(String longitude)
-    {
-        this.longitude = longitude;
-    }
-
-    public String getLongitude()
-    {
-        return longitude;
-    }
-    public void setLatitude(String latitude)
-    {
-        this.latitude = latitude;
-    }
-
-    public String getLatitude()
-    {
-        return latitude;
-    }
-    public void setCameraCaptureArea(String cameraCaptureArea)
-    {
-        this.cameraCaptureArea = cameraCaptureArea;
-    }
-
-    public String getCameraCaptureArea()
-    {
-        return cameraCaptureArea;
-    }
-    public void setOnState(Long onState)
-    {
-        this.onState = onState;
-    }
-
-    public Long getOnState()
-    {
-        return onState;
-    }
-    public void setCivilCode(String civilCode)
-    {
-        this.civilCode = civilCode;
-    }
-
-    public String getCivilCode()
-    {
-        return civilCode;
-    }
-    public void setIntegratedDevice(Long integratedDevice)
-    {
-        this.integratedDevice = integratedDevice;
-    }
-
-    public Long getIntegratedDevice()
-    {
-        return integratedDevice;
-    }
-    public void setCameraBrand(Long cameraBrand)
-    {
-        this.cameraBrand = cameraBrand;
-    }
-
-    public Long getCameraBrand()
-    {
-        return cameraBrand;
-    }
-    public void setAddress(String address)
-    {
-        this.address = address;
-    }
-
-    public String getAddress()
-    {
-        return address;
-    }
-    public void setNetWorking(Long netWorking)
-    {
-        this.netWorking = netWorking;
-    }
-
-    public Long getNetWorking()
-    {
-        return netWorking;
-    }
-    public void setPublicSecurity(String publicSecurity)
-    {
-        this.publicSecurity = publicSecurity;
-    }
-
-    public String getPublicSecurity()
-    {
-        return publicSecurity;
-    }
-
-    public void setManagementUnit(String managementUnit)
-    {
-        this.managementUnit = managementUnit;
-    }
-
-    public String getManagementUnit()
-    {
-        return managementUnit;
-    }
-    public void setMuContactInfo(String muContactInfo)
-    {
-        this.muContactInfo = muContactInfo;
-    }
-
-    public String getMuContactInfo()
-    {
-        return muContactInfo;
-    }
-    public void setStorageDays(Long storageDays)
-    {
-        this.storageDays = storageDays;
-    }
-
-    public Long getStorageDays()
-    {
-        return storageDays;
-    }
-    public void setMonitorAzimuth(Long monitorAzimuth)
-    {
-        this.monitorAzimuth = monitorAzimuth;
-    }
-
-    public Long getMonitorAzimuth()
-    {
-        return monitorAzimuth;
-    }
-    public void setScenePhotoAddr(String scenePhotoAddr)
-    {
-        this.scenePhotoAddr = scenePhotoAddr;
-    }
-
-    public String getScenePhotoAddr()
-    {
-        return scenePhotoAddr;
-    }
-    public void setModel(String model)
-    {
-        this.model = model;
-    }
-
-    public String getModel()
-    {
-        return model;
-    }
-    public void setSiteVulgo(String siteVulgo)
-    {
-        this.siteVulgo = siteVulgo;
-    }
-
-    public String getSiteVulgo()
-    {
-        return siteVulgo;
-    }
-    public void setCameraType(Long cameraType)
-    {
-        this.cameraType = cameraType;
-    }
-
-    public Long getCameraType()
-    {
-        return cameraType;
-    }
-    public void setCameraLightType(Long cameraLightType)
-    {
-        this.cameraLightType = cameraLightType;
-    }
-
-    public Long getCameraLightType()
-    {
-        return cameraLightType;
-    }
-    public void setEncodedFormat(Long encodedFormat)
-    {
-        this.encodedFormat = encodedFormat;
-    }
-
-    public Long getEncodedFormat()
-    {
-        return encodedFormat;
-    }
-    public void setCameraDept(String cameraDept)
-    {
-        this.cameraDept = cameraDept;
-    }
-
-    public String getCameraDept()
-    {
-        return cameraDept;
-    }
-    public void setHybm(String hybm)
-    {
-        this.hybm = hybm;
-    }
-
-    public String getHybm()
-    {
-        return hybm;
-    }
-    public void setLxbm(Long lxbm)
-    {
-        this.lxbm = lxbm;
-    }
-
-    public Long getLxbm()
-    {
-        return lxbm;
-    }
-
-    @Override
-    public String toString() {
-        return "TMonitorVO{" +
-                "id=" + id +
-                ", serialNumber='" + serialNumber + '\'' +
-                ", name='" + name + '\'' +
-                ", siteType=" + siteType +
-                ", macAddr='" + macAddr + '\'' +
-                ", ip='" + ip + '\'' +
-                ", cameraFunType='" + cameraFunType + '\'' +
-                ", longitude='" + longitude + '\'' +
-                ", latitude='" + latitude + '\'' +
-                ", cameraCaptureArea='" + cameraCaptureArea + '\'' +
-                ", onState=" + onState +
-                ", civilCode='" + civilCode + '\'' +
-                ", integratedDevice=" + integratedDevice +
-                ", cameraBrand=" + cameraBrand +
-                ", address='" + address + '\'' +
-                ", netWorking=" + netWorking +
-                ", publicSecurity='" + publicSecurity + '\'' +
-                ", installedTime=" + installedTime +
-                ", managementUnit='" + managementUnit + '\'' +
-                ", muContactInfo='" + muContactInfo + '\'' +
-                ", storageDays=" + storageDays +
-                ", monitorAzimuth=" + monitorAzimuth +
-                ", scenePhotoAddr='" + scenePhotoAddr + '\'' +
-                ", model='" + model + '\'' +
-                ", siteVulgo='" + siteVulgo + '\'' +
-                ", cameraType=" + cameraType +
-                ", cameraLightType=" + cameraLightType +
-                ", encodedFormat=" + encodedFormat +
-                ", cameraDept='" + cameraDept + '\'' +
-                ", hybm='" + hybm + '\'' +
-                ", lxbm=" + lxbm +
-                ", reason='" + reason + '\'' +
-                ", defaultOrder=" + defaultOrder +
-                ", recovery=" + recovery +
-                ", recoveryTime=" + recoveryTime +
-                ", deptName='" + deptName + '\'' +
-                '}';
-    }
 }
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
index 15ded93..df47586 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -3,9 +3,12 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexCar;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
 import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
@@ -38,7 +41,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -54,16 +57,15 @@
             return;
         }
 
-        //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (VehicleDeviceInspectionResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index 42c1c5d..375aca0 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -6,6 +6,7 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.CrossDetailResult;
 import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
@@ -34,7 +35,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -52,17 +53,15 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         //鑾峰彇閲嶇偣鐐逛綅闆嗗悎
         List<String> importantIds = getImportant();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (DataIntegrityMonitoringResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
             String deptId = monitor.getDeptId().toString();
             updateAreaStats(areaStatsMap, deptId, result, importantIds);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index 7222299..3db70da 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -5,7 +5,9 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
 import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ITMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +35,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -57,17 +59,15 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(VehicleDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VehicleDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         //鑾峰彇閲嶇偣鐐逛綅闆嗗悎
         List<String> importantIds = getImportant();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (VehicleDeviceSamplingResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
             String deptId = monitor.getDeptId().toString();
             updateAreaStats(areaStatsMap, deptId, result, importantIds);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
index f764ffe..e567bac 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -5,6 +5,8 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.CrossDetailResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
@@ -36,7 +38,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -52,16 +54,14 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(CrossDetailResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(CrossDetailResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
 
         for (CrossDetailResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index e701f1a..d58653c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -3,8 +3,11 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexCar;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.CrossDetailResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
@@ -37,7 +40,7 @@
     @Autowired
     private SysConfigMapper sysConfigMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -55,15 +58,14 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (SnapshotDataMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
index 4f52380..23dfe19 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -5,7 +5,9 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
 import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
@@ -36,7 +38,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -58,15 +60,14 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (SnapshotDelayMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
index 644d0b6..2da526d 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
@@ -5,7 +5,10 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
 import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
+import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ITMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +36,7 @@
     @Autowired
     private CheckIndexFaceMapper CheckIndexFaceMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
 
@@ -50,15 +53,14 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(FaceDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(FaceDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (FaceDeviceInspectionResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
index feddb69..c7e8bce 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -3,8 +3,11 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
 import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ITMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +34,7 @@
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
 
@@ -50,15 +53,13 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(FaceDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(FaceDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (FaceDeviceSamplingResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
             String deptId = monitor.getDeptId().toString();
             updateAreaStats(areaStatsMap, deptId, result);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
index 8282744..ce028fc 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -4,7 +4,9 @@
 import com.ycl.platform.domain.entity.CheckIndexCar;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
 import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
@@ -35,7 +37,7 @@
     @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
 
     //鍖哄煙杞﹁締淇℃伅閲囬泦鍑嗙‘鐜囩殑鍐呴儴绫�
     private static class AreaStats {
@@ -49,16 +51,14 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
 
         for (MonitoringDetailResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index cc07f33..e657f62 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -3,8 +3,11 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
@@ -40,7 +43,7 @@
     @Autowired
     private SysConfigMapper sysConfigMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
 
     //鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
     private static class AreaStats {
@@ -55,16 +58,15 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
 
         for (SnapshotDataMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
index beb1800..41d4ce9 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
@@ -3,8 +3,11 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
 import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
@@ -31,7 +34,7 @@
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
 
@@ -53,15 +56,14 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (SnapshotDelayMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index 7b82051..64a724b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -5,7 +5,9 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
 import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexVideoMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ICheckIndexVideoService;
 import com.ycl.platform.service.ITMonitorService;
@@ -36,7 +38,7 @@
     @Autowired
     private CheckIndexVideoMapper checkIndexVideoMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexVideoService checkIndexVideoService;
 
@@ -55,9 +57,8 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(QueryVqdResult::getDeviceId).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(QueryVqdResult::getDeviceId).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         //閲嶇偣鐐逛綅闆嗗悎
@@ -65,7 +66,7 @@
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (QueryVqdResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getDeviceId());
+            TMonitorVO monitor = monitorMap.get(result.getDeviceId());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index 954343f..dac89b9 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -5,7 +5,9 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
 import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexVideoMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexVideoService;
 import com.ycl.platform.service.ITMonitorService;
 import constant.ApiConstants;
@@ -34,7 +36,7 @@
     @Autowired
     private CheckIndexVideoMapper checkIndexVideoMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexVideoService checkIndexVideoService;
 
@@ -53,9 +55,8 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(RecordMetaDSumParam::getDeviceId).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(RecordMetaDSumParam::getDeviceId).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         //閲嶇偣鐐逛綅闆嗗悎
@@ -63,7 +64,7 @@
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (RecordMetaDSumParam result : list) {
-            TMonitor monitor = monitorMap.get(result.getDeviceId());
+            TMonitorVO monitor = monitorMap.get(result.getDeviceId());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 64d6023..2e9913c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -90,4 +90,6 @@
      * @return 鏁版嵁
      */
     List<Map<String, Object>> home(HomeQuery monitorQuery);
+
+    List<TMonitorVO> selectListByIds(List<String> list);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index 7a85691..73c3a31 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -26,7 +26,7 @@
      * @param workOrderList
      * @return
      */
-    Boolean innerAdd(List<WorkOrder> workOrderList) throws Exception;
+    Boolean innerAdd(List<WorkOrder> workOrderList);
 
     /**
      * 娣诲姞
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
index f7e87d5..8ae4d44 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
@@ -2,14 +2,17 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.entity.WorkOrder;
 import com.ycl.platform.domain.entity.YwThreshold;
 import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
 import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
 import com.ycl.platform.mapper.YwThresholdMapper;
 import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.service.WorkOrderService;
 import constant.YwThreadConstants;
 import enumeration.CompareType;
 import enumeration.general.BusinessTypeEnum;
+import enumeration.general.WorkOrderStatusEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,9 @@
 public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
     @Autowired
     private YwThresholdMapper ywThresholdMapper;
+
+    @Autowired
+    private WorkOrderService workOrderService;
 
     /**
      * 鏌ヨ杩愮淮闃堝��
@@ -120,9 +126,9 @@
     public void faceCheck(List<FaceDeviceInspectionResult> list) {
         Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.FACE.name());
         //鍑嗗涓嬪彂宸ュ崟闆嗗悎
-        List<FaceDeviceInspectionResult> distributeList = new ArrayList<>();
+        List<WorkOrder> distributeList = new ArrayList<>();
         //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
-        List<FaceDeviceInspectionResult> workOrderList = new ArrayList<>();
+        List<WorkOrder> workOrderList = new ArrayList<>();
         //澶勭悊鎺ュ彛鏁版嵁
         for (FaceDeviceInspectionResult result : list) {
             if (result == null) {
@@ -131,24 +137,26 @@
             }
             //妫�鏌ユ椂閽熷噯纭巼
             Float clockPercent = result.getSnapClock().getClockPercent();
-            check(YwThreadConstants.Face_ClockPercent, clockPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Face_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
             //妫�鏌ユ暟鎹強鏃剁巼
             Float timelyPercent = result.getSnapTimely().getTimelyPercent();
-            check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
             //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
             Integer continueNoDataCount = result.getContinueNoDataCount();
-            check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
             //妫�鏌ヤ笉鍞竴鏁版嵁閲�
             Integer nouniqueCount = result.getSnapUnique().getNouniqueCount();
-            check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
             //妫�鏌ヤ汉鑴镐綆璇勫垎鐜�
             Float lowScorePercent = result.getSnapValidity().getLowScorePercent();
-            check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
             //妫�鏌ュ缓妯″け璐ョ巼
             Float failPercent = result.getSnapValidity().getFailPercent();
-            check(YwThreadConstants.Face_FailPercent, failPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
         }
-        //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+        /** 娣诲姞宸ュ崟 */
+        workOrderService.innerAdd(workOrderList);
+        workOrderService.innerAdd(distributeList);
     }
 
     /**
@@ -160,9 +168,9 @@
     public void carCheck(List<VehicleDeviceInspectionResult> list) {
         Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.CAR.name());
         //鍑嗗涓嬪彂宸ュ崟闆嗗悎
-        List<VehicleDeviceInspectionResult> distributeList = new ArrayList<>();
+        List<WorkOrder> distributeList = new ArrayList<>();
         //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
-        List<VehicleDeviceInspectionResult> workOrderList = new ArrayList<>();
+        List<WorkOrder> workOrderList = new ArrayList<>();
         //澶勭悊鎺ュ彛鏁版嵁
         for (VehicleDeviceInspectionResult result : list) {
             if (result == null) {
@@ -171,24 +179,26 @@
             }
             //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
             Integer continueNoDataCount = result.getContinueNoDataCount();
-            check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
             //妫�鏌ユ椂閽熷噯纭巼
             Float clockPercent = result.getSnapClock().getClockPercent();
-            check(YwThreadConstants.Car_ClockPercent, clockPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Car_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
             //妫�鏌ユ暟鎹強鏃剁巼
             Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
-            check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+            check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
             //妫�鏌ヤ笉鍞竴鏁版嵁閲�
             Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
-            check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
             //妫�鏌ョ櫧澶╂湭璇嗗埆閲�
             Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
-            check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
             //杞﹁締鍏」灞炴�т笉瀹屾暣閲�
             Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
-            check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+            check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
         }
-        //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+        /** 娣诲姞宸ュ崟 */
+        workOrderService.innerAdd(workOrderList);
+        workOrderService.innerAdd(distributeList);
     }
 
     //灏佽闃堝�间负map
@@ -202,7 +212,7 @@
     }
 
     //妫�鏌ラ槇鍊�
-    private <T extends Comparable<T>> void check(String key, T value, Object result, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType) {
+    private <T extends Comparable<T>> void check(String key, T value, String serialNumber, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType,String errorType) {
         Optional.ofNullable(value).ifPresentOrElse(
                 v -> {
                     YwThreshold ywThreshold = thresholds.get(key);
@@ -212,13 +222,21 @@
                     //姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
                     if (compareType.compare(v, thresholdAutoValue)) {
                         //鑷姩涓嬪彂宸ュ崟
-                        workOrderList.add(result);
+                        WorkOrder workOrder = new WorkOrder();
+                        workOrder.setSerialNumber(serialNumber);
+                        workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+                        workOrder.setErrorType(errorType);
+                        workOrderList.add(workOrder);
                     } else if (compareType.compare(v, thresholdValue)) {
                         //杩涘叆宸ュ崟浠d笅鍙�
-                        distributeList.add(result);
+                        WorkOrder workOrder = new WorkOrder();
+                        workOrder.setSerialNumber(serialNumber);
+                        workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+                        workOrder.setErrorType(errorType);
+                        distributeList.add(workOrder);
                     }
                 },
-                () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), result)
+                () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), serialNumber)
         );
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java
index 27e3d98..66e5257 100644
--- a/ycl-server/src/main/java/com/ycl/task/CarTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java
@@ -97,6 +97,6 @@
 
     public void test() {
         Date yesterday = DateUtils.addDays(new Date(), -1);
-        //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 鍙杛edis
+        //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
     }
 }
diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java
index 6ceb524..125770d 100644
--- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java
@@ -82,6 +82,6 @@
 
     public void test() {
         Date yesterday = DateUtils.addDays(new Date(), -1);
-        //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 鍙杛edis
+        //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
     }
 }
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 38b6aad..be8a21a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -1,98 +1,146 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycl.platform.mapper.TMonitorMapper">
 
     <resultMap type="com.ycl.platform.domain.entity.TMonitor" id="TMonitorResult">
-        <result property="id"    column="id"    />
-        <result property="serialNumber"    column="serial_number"    />
-        <result property="name"    column="name"    />
-        <result property="siteType"    column="site_type"    />
-        <result property="macAddr"    column="mac_addr"    />
-        <result property="ip"    column="ip"    />
-        <result property="cameraFunType"    column="camera_fun_type"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="cameraCaptureArea"    column="camera_capture_area"    />
-        <result property="onState"    column="on_state"    />
-        <result property="civilCode"    column="civil_code"    />
-        <result property="integratedDevice"    column="integrated_device"    />
-        <result property="cameraBrand"    column="camera_brand"    />
-        <result property="address"    column="address"    />
-        <result property="netWorking"    column="net_working"    />
-        <result property="publicSecurity"    column="public_security"    />
-        <result property="installedTime"    column="installed_time"    />
-        <result property="managementUnit"    column="management_unit"    />
-        <result property="muContactInfo"    column="mu_contact_info"    />
-        <result property="storageDays"    column="storage_days"    />
-        <result property="monitorAzimuth"    column="monitor_azimuth"    />
-        <result property="scenePhotoAddr"    column="scene_photo_addr"    />
-        <result property="model"    column="model"    />
-        <result property="siteVulgo"    column="site_vulgo"    />
-        <result property="cameraType"    column="camera_type"    />
-        <result property="cameraLightType"    column="camera_light_type"    />
-        <result property="encodedFormat"    column="encoded_format"    />
-        <result property="cameraDept"    column="camera_dept"    />
-        <result property="hybm"    column="hybm"    />
-        <result property="lxbm"    column="lxbm"    />
-        <result property="reason"    column="reason"    />
-        <result property="recovery"    column="recovery"    />
-        <result property="recoveryTime"    column="recovery_time"    />
-        <result property="deptId"    column="dept_id"    />
+        <result property="id" column="id"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="name" column="name"/>
+        <result property="siteType" column="site_type"/>
+        <result property="macAddr" column="mac_addr"/>
+        <result property="ip" column="ip"/>
+        <result property="cameraFunType" column="camera_fun_type"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="cameraCaptureArea" column="camera_capture_area"/>
+        <result property="onState" column="on_state"/>
+        <result property="civilCode" column="civil_code"/>
+        <result property="integratedDevice" column="integrated_device"/>
+        <result property="cameraBrand" column="camera_brand"/>
+        <result property="address" column="address"/>
+        <result property="netWorking" column="net_working"/>
+        <result property="publicSecurity" column="public_security"/>
+        <result property="installedTime" column="installed_time"/>
+        <result property="managementUnit" column="management_unit"/>
+        <result property="muContactInfo" column="mu_contact_info"/>
+        <result property="storageDays" column="storage_days"/>
+        <result property="monitorAzimuth" column="monitor_azimuth"/>
+        <result property="scenePhotoAddr" column="scene_photo_addr"/>
+        <result property="model" column="model"/>
+        <result property="siteVulgo" column="site_vulgo"/>
+        <result property="cameraType" column="camera_type"/>
+        <result property="cameraLightType" column="camera_light_type"/>
+        <result property="encodedFormat" column="encoded_format"/>
+        <result property="cameraDept" column="camera_dept"/>
+        <result property="hybm" column="hybm"/>
+        <result property="lxbm" column="lxbm"/>
     </resultMap>
 
     <sql id="selectTMonitorVo">
-        select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm from t_monitor
+        select id,
+               serial_number,
+               name,
+               site_type,
+               mac_addr,
+               ip,
+               camera_fun_type,
+               longitude,
+               latitude,
+               camera_capture_area,
+               on_state,
+               civil_code,
+               integrated_device,
+               camera_brand,
+               address,
+               net_working,
+               public_security,
+               installed_time,
+               management_unit,
+               mu_contact_info,
+               storage_days,
+               monitor_azimuth,
+               scene_photo_addr,
+               model,
+               site_vulgo,
+               camera_type,
+               camera_light_type,
+               encoded_format,
+               camera_dept,
+               hybm,
+               lxbm
+        from t_monitor
     </sql>
 
+    <select id="selectListByIds" resultType="com.ycl.platform.domain.vo.TMonitorVO">
+        select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
+        camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
+        public_security, installed_time, management_unit, mu_contact_info, storage_days
+        , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
+        camera_dept, hybm, lxbm,d.dept_id, d.dept_name from t_monitor m
+        left join t_yw_point p on m.serial_number = p.serial_number
+        left join sys_dept d on p.dept_id = d.dept_id
+        where m.serial_number in
+        <foreach collection="list" separator="," item="id" open="(" close=")">
+            #{id}
+        </foreach>
+    </select>
     <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
-        select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
-        , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, d.dept_name from t_monitor m
+        select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
+        camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
+        public_security, installed_time, management_unit, mu_contact_info, storage_days
+        , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
+        camera_dept, hybm, lxbm,d.dept_id, d.dept_name from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id
         <where>
-            <if test="serialNumber != null  and serialNumber != ''"> and m.serial_number = #{serialNumber}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="siteType != null "> and site_type = #{siteType}</if>
-            <if test="macAddr != null  and macAddr != ''"> and mac_addr = #{macAddr}</if>
-            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
-            <if test="cameraFunType != null  and cameraFunType != ''"> and camera_fun_type like concat('%', #{cameraFunType}, '%')</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="cameraCaptureArea != null  and cameraCaptureArea != ''"> and camera_capture_area = #{cameraCaptureArea}</if>
-            <if test="onState != null "> and on_state = #{onState}</if>
-            <if test="civilCode != null  and civilCode != ''"> and civil_code = #{civilCode}</if>
-            <if test="integratedDevice != null "> and integrated_device = #{integratedDevice}</if>
-            <if test="cameraBrand != null "> and camera_brand = #{cameraBrand}</if>
-            <if test="address != null  and address != ''"> and address like concat('%',#{address},'%') </if>
-            <if test="netWorking != null "> and net_working = #{netWorking}</if>
-            <if test="publicSecurity != null  and publicSecurity != ''"> and public_security = #{publicSecurity}</if>
-            <if test="installedTime != null "> and installed_time = #{installedTime}</if>
-            <if test="managementUnit != null  and managementUnit != ''"> and management_unit = #{managementUnit}</if>
-            <if test="muContactInfo != null  and muContactInfo != ''"> and mu_contact_info = #{muContactInfo}</if>
-            <if test="storageDays != null "> and storage_days = #{storageDays}</if>
-            <if test="monitorAzimuth != null "> and monitor_azimuth = #{monitorAzimuth}</if>
-            <if test="scenePhotoAddr != null  and scenePhotoAddr != ''"> and scene_photo_addr = #{scenePhotoAddr}</if>
-            <if test="model != null  and model != ''"> and model = #{model}</if>
-            <if test="siteVulgo != null  and siteVulgo != ''"> and site_vulgo = #{siteVulgo}</if>
-            <if test="cameraType != null "> and camera_type = #{cameraType}</if>
-            <if test="cameraLightType != null "> and camera_light_type = #{cameraLightType}</if>
-            <if test="encodedFormat != null "> and encoded_format = #{encodedFormat}</if>
-            <if test="cameraDept != null  and cameraDept != ''"> and camera_dept = #{cameraDept}</if>
-            <if test="hybm != null  and hybm != ''"> and hybm = #{hybm}</if>
-            <if test="lxbm != null "> and lxbm = #{lxbm}</if>
-            <if test="recovery != null "> and p.recovery = #{recovery}</if>
+            <if test="serialNumber != null  and serialNumber != ''">and m.serial_number = #{serialNumber}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="siteType != null ">and site_type = #{siteType}</if>
+            <if test="macAddr != null  and macAddr != ''">and mac_addr = #{macAddr}</if>
+            <if test="ip != null  and ip != ''">and ip = #{ip}</if>
+            <if test="cameraFunType != null  and cameraFunType != ''">and camera_fun_type like concat('%',
+                #{cameraFunType}, '%')
+            </if>
+            <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
+            <if test="cameraCaptureArea != null  and cameraCaptureArea != ''">and camera_capture_area =
+                #{cameraCaptureArea}
+            </if>
+            <if test="onState != null ">and on_state = #{onState}</if>
+            <if test="civilCode != null  and civilCode != ''">and civil_code = #{civilCode}</if>
+            <if test="integratedDevice != null ">and integrated_device = #{integratedDevice}</if>
+            <if test="cameraBrand != null ">and camera_brand = #{cameraBrand}</if>
+            <if test="address != null  and address != ''">and address like concat('%',#{address},'%')</if>
+            <if test="netWorking != null ">and net_working = #{netWorking}</if>
+            <if test="publicSecurity != null  and publicSecurity != ''">and public_security = #{publicSecurity}</if>
+            <if test="installedTime != null ">and installed_time = #{installedTime}</if>
+            <if test="managementUnit != null  and managementUnit != ''">and management_unit = #{managementUnit}</if>
+            <if test="muContactInfo != null  and muContactInfo != ''">and mu_contact_info = #{muContactInfo}</if>
+            <if test="storageDays != null ">and storage_days = #{storageDays}</if>
+            <if test="monitorAzimuth != null ">and monitor_azimuth = #{monitorAzimuth}</if>
+            <if test="scenePhotoAddr != null  and scenePhotoAddr != ''">and scene_photo_addr = #{scenePhotoAddr}</if>
+            <if test="model != null  and model != ''">and model = #{model}</if>
+            <if test="siteVulgo != null  and siteVulgo != ''">and site_vulgo = #{siteVulgo}</if>
+            <if test="cameraType != null ">and camera_type = #{cameraType}</if>
+            <if test="cameraLightType != null ">and camera_light_type = #{cameraLightType}</if>
+            <if test="encodedFormat != null ">and encoded_format = #{encodedFormat}</if>
+            <if test="cameraDept != null  and cameraDept != ''">and camera_dept = #{cameraDept}</if>
+            <if test="hybm != null  and hybm != ''">and hybm = #{hybm}</if>
+            <if test="lxbm != null ">and lxbm = #{lxbm}</if>
+            <if test="recovery != null ">and p.recovery = #{recovery}</if>
         </where>
         ${params.dataScope}
     </select>
 
-    <select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
+    <select id="selectTMonitorById" parameterType="Long" resultType="com.ycl.platform.domain.vo.TMonitorVO">
         <include refid="selectTMonitorVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor" useGeneratedKeys="true"
+            keyProperty="id">
         insert into t_monitor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
@@ -125,7 +173,7 @@
             <if test="cameraDept != null">camera_dept,</if>
             <if test="hybm != null">hybm,</if>
             <if test="lxbm != null">lxbm,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
             <if test="name != null and name != ''">#{name},</if>
@@ -157,7 +205,7 @@
             <if test="cameraDept != null">#{cameraDept},</if>
             <if test="hybm != null">#{hybm},</if>
             <if test="lxbm != null">#{lxbm},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor">
@@ -171,7 +219,9 @@
             <if test="cameraFunType != null and cameraFunType != ''">camera_fun_type = #{cameraFunType},</if>
             <if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
             <if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
-            <if test="cameraCaptureArea != null and cameraCaptureArea != ''">camera_capture_area = #{cameraCaptureArea},</if>
+            <if test="cameraCaptureArea != null and cameraCaptureArea != ''">camera_capture_area =
+                #{cameraCaptureArea},
+            </if>
             <if test="onState != null">on_state = #{onState},</if>
             <if test="civilCode != null and civilCode != ''">civil_code = #{civilCode},</if>
             <if test="integratedDevice != null">integrated_device = #{integratedDevice},</if>
@@ -198,7 +248,9 @@
     </update>
 
     <delete id="deleteTMonitorById" parameterType="Long">
-        delete from t_monitor where id = #{id}
+        delete
+        from t_monitor
+        where id = #{id}
     </delete>
 
     <delete id="deleteTMonitorByIds" parameterType="String">
@@ -209,13 +261,13 @@
     </delete>
 
     <select id="getVideoCount" resultType="java.util.Map">
-        SELECT count(*)                                                          AS totalPosts,
-               IFNULL(SUM(IF(on_state = 1, 1, 0)), 0)                            AS totalMembers,
-               IFNULL(SUM(IF(on_state = 2, 1, 0)), 0)                            AS postsPercentage,
-               IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+        SELECT count(*) AS totalPosts,
+        IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
+        IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
+        IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
         FROM t_monitor m
-            left join t_yw_point p on m.serial_number = p.serial_number
-            left join sys_dept d on p.dept_id = d.dept_id
+        left join t_yw_point p on m.serial_number = p.serial_number
+        left join sys_dept d on p.dept_id = d.dept_id
         <where>
             camera_fun_type like concat('%', #{cameraFunType}, '%')
         </where>
@@ -229,35 +281,66 @@
                IFNULL(SUM(IF(on_state = 2, 1, 0)), 0)                            AS postsPercentage,
                IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
         FROM t_monitor t
-        LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
-        WHERE p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
+                 LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+        WHERE p.recovery = 1
+           OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
         ]]>
     </select>
 
     <select id="selectRecoveryMonitor" resultType="com.ycl.platform.domain.vo.TMonitorVO">
         <![CDATA[
-        SELECT t.id, p.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm
+        SELECT t.id,
+               p.serial_number,
+               name,
+               site_type,
+               mac_addr,
+               ip,
+               camera_fun_type,
+               longitude,
+               latitude,
+               camera_capture_area,
+               on_state,
+               civil_code,
+               integrated_device,
+               camera_brand,
+               address,
+               net_working,
+               public_security,
+               installed_time,
+               management_unit,
+               mu_contact_info,
+               storage_days,
+               monitor_azimuth,
+               scene_photo_addr,
+               model,
+               site_vulgo,
+               camera_type,
+               camera_light_type,
+               encoded_format,
+               camera_dept,
+               hybm,
+               lxbm
         FROM t_monitor t
-        LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+                 LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
         WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
         ]]>
     </select>
 
     <select id="home" resultType="java.util.Map">
         SELECT
-            u.unit_name AS name,
-            CONCAT(MONTH(w.create_time), '鏈�') AS months,
-            COUNT(w.id) AS num1,
-            COUNT(m.id) - COUNT(w.id) AS num2
+        u.unit_name AS name,
+        CONCAT(MONTH(w.create_time), '鏈�') AS months,
+        COUNT(w.id) AS num1,
+        COUNT(m.id) - COUNT(w.id) AS num2
         FROM
-            t_monitor m
-                LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
-                LEFT JOIN t_yw_unit u ON p.unit_id = u.id
-                LEFT JOIN t_work_order w ON p.id = w.point_id
+        t_monitor m
+        LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
+        LEFT JOIN t_yw_unit u ON p.unit_id = u.id
+        LEFT JOIN t_work_order w ON p.id = w.point_id
         WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
-          <if test="dateRange != null and dateRange.size > 0">
+        <if test="dateRange != null and dateRange.size > 0">
             AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
-          </if>
+        </if>
         GROUP BY months
         ORDER BY months
     </select>

--
Gitblit v1.8.0