From c16ca04b474d445cde54332045db19458863709e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:11 +0800
Subject: [PATCH] 设备增加厂商类型
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java | 319 ----------------------------------------------------
ycl-common/src/main/java/enumeration/DeviceType.java | 28 ++++
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 7 +
3 files changed, 38 insertions(+), 316 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/DeviceType.java b/ycl-common/src/main/java/enumeration/DeviceType.java
new file mode 100644
index 0000000..a88d626
--- /dev/null
+++ b/ycl-common/src/main/java/enumeration/DeviceType.java
@@ -0,0 +1,28 @@
+package enumeration;
+
+import lombok.Getter;
+
+/**
+ * 璁惧鍘傚晢
+ *
+ * @author锛歺p
+ * @date锛�2024/8/26 19:37
+ */
+@Getter
+public enum DeviceType {
+
+ HK(0, "娴峰悍"),
+ DH(1, "澶у崕"),
+ YS(2, "瀹囪"),
+ ;
+
+ private final Integer type;
+
+ private final String desc;
+
+
+ DeviceType(Integer type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+}
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 eb49977..4b6c13f 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
import java.util.Date;
@@ -14,6 +15,7 @@
* @author ruoyi
* @date 2024-03-04
*/
+@Data
public class TMonitor extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -142,320 +144,7 @@
@Excel(name = "绫诲瀷缂栫爜 : [131.鎽勫儚鏈虹紪鐮�;132.缃戠粶鎽勫儚鏈虹紪鐮�;]")
private Long lxbm;
- public void setInstalledTime(Date installedTime) {
- this.installedTime = installedTime;
- }
+ /** 璁惧鍘傚晢锛� 0娴峰悍 1澶у崕 2瀹囪*/
+ private Integer deviceType;
- public Date getInstalledTime() {
- return installedTime;
- }
-
- 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 +
- '}';
- }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 14b8c34..bffff72 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -36,6 +36,7 @@
<result property="cameraDept" column="camera_dept"/>
<result property="hybm" column="hybm"/>
<result property="lxbm" column="lxbm"/>
+ <result property="deviceType" column="device_type"/>
</resultMap>
<sql id="selectTMonitorVo">
@@ -69,7 +70,8 @@
encoded_format,
camera_dept,
hybm,
- lxbm
+ lxbm,
+ device_type
from t_monitor
</sql>
@@ -184,6 +186,7 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
+ <if test="deviceType != null">device_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -216,6 +219,7 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
+ <if test="deviceType != null">#{deviceType},</if>
</trim>
</insert>
@@ -254,6 +258,7 @@
<if test="cameraDept != null">camera_dept = #{cameraDept},</if>
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
+ <if test="deviceType != null">device_type = #{deviceType},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.8.0