From 30b98cca1d3b26da8cfc81a17488d657aaf021ae Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 三月 2024 14:29:24 +0800
Subject: [PATCH] 监控模块

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java |  140 +++++++++++++++++++++++++++++++---------------
 1 files changed, 95 insertions(+), 45 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 7803250..b60c3a5 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
@@ -3,10 +3,9 @@
 import annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.util.Date;
+
 
 /**
  * 璁惧璧勪骇瀵硅薄 t_monitor
@@ -86,8 +85,8 @@
     private String publicSecurity;
 
     /** 瀹夎鏃堕棿 yyyy-MM-dd HH:mm:ss */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "瀹夎鏃堕棿 yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    @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;
 
     /** 绠$悊鍗曚綅 */
@@ -141,6 +140,61 @@
     /** 绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;] */
     @Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
     private Long lxbm;
+
+    @Excel(name = "寮傚父鍘熷洜")
+    private String reason;
+
+    @Excel(name = "鏄惁鐢熸垚寮傚父宸ュ崟")
+    private Long defaultOrder;
+
+    @Excel(name ="寮傚父鎭㈠鏍囪瘑")
+    private Long recovery;
+
+    @Excel(name = "寮傚父鎭㈠鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recoveryTime;
+
+    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)
     {
@@ -295,15 +349,7 @@
     {
         return publicSecurity;
     }
-    public void setInstalledTime(Date installedTime)
-    {
-        this.installedTime = installedTime;
-    }
 
-    public Date getInstalledTime()
-    {
-        return installedTime;
-    }
     public void setManagementUnit(String managementUnit)
     {
         this.managementUnit = managementUnit;
@@ -424,38 +470,42 @@
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("serialNumber", getSerialNumber())
-            .append("name", getName())
-            .append("siteType", getSiteType())
-            .append("macAddr", getMacAddr())
-            .append("ip", getIp())
-            .append("cameraFunType", getCameraFunType())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("cameraCaptureArea", getCameraCaptureArea())
-            .append("onState", getOnState())
-            .append("civilCode", getCivilCode())
-            .append("integratedDevice", getIntegratedDevice())
-            .append("cameraBrand", getCameraBrand())
-            .append("address", getAddress())
-            .append("netWorking", getNetWorking())
-            .append("publicSecurity", getPublicSecurity())
-            .append("installedTime", getInstalledTime())
-            .append("managementUnit", getManagementUnit())
-            .append("muContactInfo", getMuContactInfo())
-            .append("storageDays", getStorageDays())
-            .append("monitorAzimuth", getMonitorAzimuth())
-            .append("scenePhotoAddr", getScenePhotoAddr())
-            .append("model", getModel())
-            .append("siteVulgo", getSiteVulgo())
-            .append("cameraType", getCameraType())
-            .append("cameraLightType", getCameraLightType())
-            .append("encodedFormat", getEncodedFormat())
-            .append("cameraDept", getCameraDept())
-            .append("hybm", getHybm())
-            .append("lxbm", getLxbm())
-            .toString();
+        return "TMonitor{" +
+                "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 +
+                '}';
     }
 }

--
Gitblit v1.8.0