From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java | 392 +------------------------------------------------------
1 files changed, 12 insertions(+), 380 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 f441a3d..00fbaa9 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,8 +1,11 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
import java.util.Date;
@@ -13,6 +16,7 @@
* @author ruoyi
* @date 2024-03-04
*/
+@Data
public class TMonitor extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -48,7 +52,7 @@
@Excel(name = "璁惧缁忓害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String longitude;
- /** 璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
+ /** 璁惧绾害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁� */
@Excel(name = "璁惧缁村害锛岃嚦灏戜繚鐣欏叚浣嶅皬鏁�")
private String latitude;
@@ -97,7 +101,7 @@
@Excel(name = "绠＄悊鍗曚綅鑱旂郴鏂瑰紡")
private String muContactInfo;
- /** 褰曡薄淇濆瓨澶╂暟 0 - 2147483647 */
+ /** 褰曞儚淇濆瓨澶╂暟 0 - 2147483647 */
@Excel(name = "褰曡薄淇濆瓨澶╂暟 0 - 2147483647")
private Long storageDays;
@@ -141,382 +145,10 @@
@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;
-
- private Long deptId;
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- 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 "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 +
- ", deptId=" + deptId +
- '}';
- }
+ /** 璁惧鍘傚晢锛� 0娴峰悍 1澶у崕 2瀹囪*/
+ private Integer deviceType;
+ @TableField(exist = false)
+ private String username;
+ @TableField(exist = false)
+ private String password;
}
--
Gitblit v1.8.0