fuliqi
2024-03-06 30b98cca1d3b26da8cfc81a17488d657aaf021ae
监控模块
2个文件已修改
172 ■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 +
                '}';
    }
}
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.TMonitorMapper">
    <resultMap type="TMonitor" id="TMonitorResult">
    <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"    />
@@ -36,13 +36,17 @@
        <result property="cameraDept"    column="camera_dept"    />
        <result property="hybm"    column="hybm"    />
        <result property="lxbm"    column="lxbm"    />
        <result property="reason"    column="reason"    />
        <result property="defaultOrder"    column="default_order"    />
        <result property="recovery"    column="recovery"    />
        <result property="recoveryTime"    column="recovery_time"    />
    </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, reason, default_order,recovery,recovery_time from t_monitor
    </sql>
    <select id="selectTMonitorList" parameterType="TMonitor" resultMap="TMonitorResult">
    <select id="selectTMonitorList" parameterType="com.ycl.platform.domain.entity.TMonitor" resultMap="TMonitorResult">
        <include refid="selectTMonitorVo"/>
        <where>
            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
@@ -58,7 +62,7 @@
            <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 = #{address}</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>
@@ -75,6 +79,10 @@
            <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="reason != null  and reason != ''"> and reason = #{reason}</if>
            <if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
            <if test="recovery != null "> and recovery = #{recovery}</if>
            <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
        </where>
    </select>
@@ -83,7 +91,7 @@
        where id = #{id}
    </select>
    <insert id="insertTMonitor" parameterType="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>
@@ -116,6 +124,10 @@
            <if test="cameraDept != null">camera_dept,</if>
            <if test="hybm != null">hybm,</if>
            <if test="lxbm != null">lxbm,</if>
            <if test="reason != null">reason,</if>
            <if test="defaultOrder != null">default_order,</if>
            <if test="recovery != null">recovery,</if>
            <if test="recoveryTime != null">recovery_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -148,10 +160,14 @@
            <if test="cameraDept != null">#{cameraDept},</if>
            <if test="hybm != null">#{hybm},</if>
            <if test="lxbm != null">#{lxbm},</if>
            <if test="reason != null">#{reason},</if>
            <if test="defaultOrder != null">#{defaultOrder},</if>
            <if test="recovery != null">#{recovery},</if>
            <if test="recoveryTime != null">#{recoveryTime},</if>
         </trim>
    </insert>
    <update id="updateTMonitor" parameterType="TMonitor">
    <update id="updateTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor">
        update t_monitor
        <trim prefix="SET" suffixOverrides=",">
            <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
@@ -184,6 +200,10 @@
            <if test="cameraDept != null">camera_dept = #{cameraDept},</if>
            <if test="hybm != null">hybm = #{hybm},</if>
            <if test="lxbm != null">lxbm = #{lxbm},</if>
            <if test="reason != null">reason = #{reason},</if>
            <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
            <if test="recovery != null">recovery = #{defaultOrder},</if>
            <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
        </trim>
        where id = #{id}
    </update>