From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 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..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
@@ -1,12 +1,12 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
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
@@ -49,7 +49,7 @@
@Excel(name = "璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String longitude;
- /** 璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
+ /** 璁惧绾害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
@Excel(name = "璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String latitude;
@@ -86,8 +86,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;
/** 绠＄悊鍗曚綅 */
@@ -98,7 +98,7 @@
@Excel(name = "绠＄悊鍗曚綅鑱旂郴鏂瑰紡")
private String muContactInfo;
- /** 褰曡薄淇濆瓨澶╂暟 0 - 2147483647 */
+ /** 褰曞儚淇濆瓨澶╂暟 0 - 2147483647 */
@Excel(name = "褰曡薄淇濆瓨澶╂暟 0 - 2147483647")
private Long storageDays;
@@ -141,6 +141,14 @@
/** 绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;] */
@Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
private Long lxbm;
+
+ public void setInstalledTime(Date installedTime) {
+ this.installedTime = installedTime;
+ }
+
+ public Date getInstalledTime() {
+ return installedTime;
+ }
public void setId(Long id)
{
@@ -295,15 +303,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 +424,38 @@
@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 +
+ '}';
}
}
--
Gitblit v1.8.0