From 905e36243c5332ab9d19035ba63a4fd63256a359 Mon Sep 17 00:00:00 2001 From: gx_ma <1773945958@qq.com> Date: Tue, 22 Apr 2025 15:18:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=AD=97=E6=AE=B5=E8=A7=84=E8=8C=83):?= =?UTF-8?q?=20sip=5Fdevice=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fastbee/sip/domain/SipDevice.java | 203 +----------------- .../sip/handler/req/RegisterReqHandler.java | 6 +- .../notify/cmdType/KeepaliveHandler.java | 6 +- .../response/cmdType/DeviceInfoHandler.java | 4 +- .../fastbee/sip/model/SipDeviceSummary.java | 4 +- .../sip/server/ReqMsgHeaderBuilder.java | 6 +- .../fastbee/sip/server/impl/SipCmdImpl.java | 2 +- .../main/resources/mapper/SipDeviceMapper.xml | 56 ++--- springboot/sql/dameng/fastbee-v2.1.sql | 22 +- springboot/sql/fastbee.sql | 8 +- springboot/sql/postgres/fastbee-v2.1.sql | 30 +-- springboot/sql/sqlserver/fastbee-v2.1.sql | 20 +- 12 files changed, 91 insertions(+), 276 deletions(-) diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/domain/SipDevice.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/domain/SipDevice.java index d185c171..3206b42d 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/domain/SipDevice.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/domain/SipDevice.java @@ -5,6 +5,8 @@ import com.fastbee.common.annotation.Excel; import com.fastbee.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -16,6 +18,8 @@ import java.util.Date; * @author zhuangpeng.li * @date 2023-02-24 */ +@EqualsAndHashCode(callSuper = true) +@Data @ApiModel(value = "SipDevice", description = "监控设备对象 sip_device") public class SipDevice extends BaseEntity { @@ -68,7 +72,7 @@ public class SipDevice extends BaseEntity /** 流模式 */ @ApiModelProperty("流模式") @Excel(name = "流模式") - private String streammode; + private String streamMode; /** 在线状态 */ @ApiModelProperty("在线状态") @@ -79,13 +83,13 @@ public class SipDevice extends BaseEntity @ApiModelProperty("注册时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "注册时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date registertime; + private Date registerTime; /** 最后上线时间 */ @ApiModelProperty("最后上线时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最后上线时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date lastconnecttime; + private Date lastConnectTime; /** 激活时间 */ @ApiModelProperty("激活时间") @@ -106,203 +110,12 @@ public class SipDevice extends BaseEntity /** 设备地址 */ @ApiModelProperty("设备地址") @Excel(name = "设备地址") - private String hostaddress; + private String hostAddress; /** 删除标志（0代表存在 2代表删除） */ @ApiModelProperty("删除标志") private String delFlag; - public void setDeviceId(Long deviceId) - { - this.deviceId = deviceId; - } - - public Long getDeviceId() - { - return deviceId; - } - public void setProductId(Long productId) - { - this.productId = productId; - } - - public Long getProductId() - { - return productId; - } - public void setProductName(String productName) - { - this.productName = productName; - } - - public String getProductName() - { - return productName; - } - public void setDeviceSipId(String deviceSipId) - { - this.deviceSipId = deviceSipId; - } - - public String getDeviceSipId() - { - return deviceSipId; - } - public void setDeviceName(String deviceName) - { - this.deviceName = deviceName; - } - - public String getDeviceName() - { - return deviceName; - } - public void setManufacturer(String manufacturer) - { - this.manufacturer = manufacturer; - } - - public String getManufacturer() - { - return manufacturer; - } - public void setModel(String model) - { - this.model = model; - } - - public String getModel() - { - return model; - } - public void setFirmware(String firmware) - { - this.firmware = firmware; - } - - public String getFirmware() - { - return firmware; - } - public void setTransport(String transport) - { - this.transport = transport; - } - - public String getTransport() - { - return transport; - } - public void setStreammode(String streammode) - { - this.streammode = streammode; - } - - public String getStreammode() - { - return streammode; - } - public void setOnline(String online) - { - this.online = online; - } - - public String getOnline() - { - return online; - } - public void setRegistertime(Date registertime) - { - this.registertime = registertime; - } - - public Date getRegistertime() - { - return registertime; - } - public void setLastconnecttime(Date lastconnecttime) - { - this.lastconnecttime = lastconnecttime; - } - - public Date getLastconnecttime() - { - return lastconnecttime; - } - public void setActiveTime(Date activeTime) - { - this.activeTime = activeTime; - } - - public Date getActiveTime() - { - return activeTime; - } - public void setIp(String ip) - { - this.ip = ip; - } - - public String getIp() - { - return ip; - } - public void setPort(Integer port) - { - this.port = port; - } - - public Integer getPort() - { - return port; - } - public void setHostaddress(String hostaddress) - { - this.hostaddress = hostaddress; - } - - public String getHostaddress() - { - return hostaddress; - } - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getDelFlag() - { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deviceId", getDeviceId()) - .append("productId", getProductId()) - .append("productName", getProductName()) - .append("deviceSipId", getDeviceSipId()) - .append("deviceName", getDeviceName()) - .append("manufacturer", getManufacturer()) - .append("model", getModel()) - .append("firmware", getFirmware()) - .append("transport", getTransport()) - .append("streammode", getStreammode()) - .append("online", getOnline()) - .append("registertime", getRegistertime()) - .append("lastconnecttime", getLastconnecttime()) - .append("activeTime", getActiveTime()) - .append("ip", getIp()) - .append("port", getPort()) - .append("hostaddress", getHostaddress()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } public String getHostAndPort() { return getIp() + ":" + getPort(); diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/RegisterReqHandler.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/RegisterReqHandler.java index b9ad500a..618cf018 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/RegisterReqHandler.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/RegisterReqHandler.java @@ -124,11 +124,11 @@ public class RegisterReqHandler extends ReqAbstractHandler implements Initializi } SipDevice device = new SipDevice(); ; - device.setStreammode("UDP"); + device.setStreamMode("UDP"); device.setDeviceSipId(sipId); device.setIp(received); device.setPort(rPort); - device.setHostaddress(received.concat(":").concat(String.valueOf(rPort))); + device.setHostAddress(received.concat(":").concat(String.valueOf(rPort))); // 注销成功 if (expiresHeader != null && expiresHeader.getExpires() == 0) { registerFlag = 2; @@ -147,7 +147,7 @@ public class RegisterReqHandler extends ReqAbstractHandler implements Initializi // 注册成功 if (registerFlag == 1) { log.info("注册成功! sipId:" + device.getDeviceSipId()); - device.setRegistertime(DateUtils.getNowDate()); + device.setRegisterTime(DateUtils.getNowDate()); sipDeviceService.updateDevice(device); List channels = sipDeviceChannelService.selectSipDeviceChannelByDeviceSipId(device.getDeviceSipId()); if (channels.size() > 0) { diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/notify/cmdType/KeepaliveHandler.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/notify/cmdType/KeepaliveHandler.java index aa6aef7d..2b2d6d4d 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/notify/cmdType/KeepaliveHandler.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/notify/cmdType/KeepaliveHandler.java @@ -52,11 +52,11 @@ public class KeepaliveHandler extends ReqAbstractHandler implements Initializing received = viaHeader.getHost(); rPort = viaHeader.getPort(); } - device.setLastconnecttime(DateUtils.getNowDate()); + device.setLastConnectTime(DateUtils.getNowDate()); device.setIp(received); device.setPort(rPort); - device.setHostaddress(received.concat(":").concat(String.valueOf(rPort))); - log.info("设备:{} 心跳上报时间:{}",deviceId,device.getLastconnecttime()); + device.setHostAddress(received.concat(":").concat(String.valueOf(rPort))); + log.info("设备:{} 心跳上报时间:{}",deviceId,device.getLastConnectTime()); //log.warn("设备:{} 心跳上报时间:{}",deviceId,device.getLastconnecttime()); // 更新在线状态 sipDeviceService.updateSipDeviceStatus(device); diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/response/cmdType/DeviceInfoHandler.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/response/cmdType/DeviceInfoHandler.java index 78aaa40b..655cb4f2 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/response/cmdType/DeviceInfoHandler.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/handler/req/message/response/cmdType/DeviceInfoHandler.java @@ -38,8 +38,8 @@ public class DeviceInfoHandler extends ReqAbstractHandler implements Initializin device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer")); device.setModel(XmlUtil.getText(rootElement, "Model")); device.setFirmware(XmlUtil.getText(rootElement, "Firmware")); - if (StringUtils.isEmpty(device.getStreammode())) { - device.setStreammode("UDP"); + if (StringUtils.isEmpty(device.getStreamMode())) { + device.setStreamMode("UDP"); } // 更新到数据库 sipDeviceService.updateDevice(device); diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/model/SipDeviceSummary.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/model/SipDeviceSummary.java index ba9f9b22..bb731174 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/model/SipDeviceSummary.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/model/SipDeviceSummary.java @@ -9,9 +9,9 @@ public class SipDeviceSummary { this.manufacturer = device.getManufacturer(); this.firmware = device.getFirmware(); this.transport = device.getTransport(); - this.streammode = device.getStreammode(); + this.streammode = device.getStreamMode(); this.port = device.getPort(); - this.hostaddress = device.getHostaddress(); + this.hostaddress = device.getHostAddress(); } public SipDeviceSummary() { diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/ReqMsgHeaderBuilder.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/ReqMsgHeaderBuilder.java index c33b409c..c2292834 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/ReqMsgHeaderBuilder.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/ReqMsgHeaderBuilder.java @@ -33,7 +33,7 @@ public class ReqMsgHeaderBuilder { public Request createInviteRequest(SipDevice device, SipConfig sipConfig, String channelId, String content, String ssrc, String fromTag) throws ParseException, InvalidArgumentException, PeerUnavailableException { Request request = null; // 请求行 - SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, device.getHostaddress()); + SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, device.getHostAddress()); // via ArrayList viaHeaders = new ArrayList(); ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getIp(), device.getPort(), @@ -78,7 +78,7 @@ public class ReqMsgHeaderBuilder { public Request createByeRequest(SipDevice device, SipConfig sipConfig, String channelId, InviteInfo invite) throws ParseException, InvalidArgumentException, PeerUnavailableException { Request request = null; //请求行 - SipURI requestLine = SipFactory.getInstance().createAddressFactory().createSipURI(channelId, device.getHostaddress()); + SipURI requestLine = SipFactory.getInstance().createAddressFactory().createSipURI(channelId, device.getHostAddress()); // via ArrayList viaHeaders = new ArrayList(); ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getIp(), device.getPort(), @@ -90,7 +90,7 @@ public class ReqMsgHeaderBuilder { Address fromAddress = SipFactory.getInstance().createAddressFactory().createAddress(fromSipURI); FromHeader fromHeader = SipFactory.getInstance().createHeaderFactory().createFromHeader(fromAddress, invite.getFromTag()); //to - SipURI toSipURI = SipFactory.getInstance().createAddressFactory().createSipURI(channelId, device.getHostaddress()); + SipURI toSipURI = SipFactory.getInstance().createAddressFactory().createSipURI(channelId, device.getHostAddress()); Address toAddress = SipFactory.getInstance().createAddressFactory().createAddress(toSipURI); ToHeader toHeader = SipFactory.getInstance().createHeaderFactory().createToHeader(toAddress, SipUtil.getNewTag()); //Forwards diff --git a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/impl/SipCmdImpl.java b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/impl/SipCmdImpl.java index 8d92c949..0090e75f 100644 --- a/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/impl/SipCmdImpl.java +++ b/springboot/fastbee-server/sip-server/src/main/java/com/fastbee/sip/server/impl/SipCmdImpl.java @@ -75,7 +75,7 @@ public class SipCmdImpl implements ISipCmd { .mediaServerId(mediaInfo.getServerId()) .deviceId(device.getDeviceSipId()) .channelId(channelId) - .streamMode(device.getStreammode().toUpperCase()) + .streamMode(device.getStreamMode().toUpperCase()) .build(); String fromTag; if (record) { diff --git a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceMapper.xml b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceMapper.xml index 208f1d13..b5ea9588 100644 --- a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceMapper.xml +++ b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceMapper.xml @@ -14,14 +14,14 @@ - + - - + + - + @@ -40,14 +40,14 @@ model, firmware, transport, - streamMode, + stream_mode, online, - registerTime, - lastConnectTime, + register_time, + last_connect_time, active_time, ip, port, - hostAddress, + host_address, del_flag, create_by, create_time, @@ -71,14 +71,14 @@ and model = #{model} and firmware = #{firmware} and transport = #{transport} - and streamMode = #{streammode} + and stream_mode = #{streamMode} and online = #{online} - and registerTime = #{registertime} - and lastConnectTime = #{lastconnecttime} + and register_time = #{registerTime} + and last_connect_time = #{lastConnectTime} and active_time = #{activeTime} and ip = #{ip} and port = #{port} - and hostAddress = #{hostaddress} + and host_address = #{hostAddress} @@ -98,14 +98,14 @@ model, firmware, transport, - streamMode, + stream_mode, online, - registerTime, - lastConnectTime, + register_time, + last_connect_time, active_time, ip, port, - hostAddress, + host_address, del_flag, create_by, create_time, @@ -122,14 +122,14 @@ #{model}, #{firmware}, #{transport}, - #{streammode}, + #{streamMode}, #{online}, - #{registertime}, - #{lastconnecttime}, + #{registerTime}, + #{lastConnectTime}, #{activeTime}, #{ip}, #{port}, - #{hostaddress}, + #{hostAddress}, #{delFlag}, #{createBy}, #{createTime}, @@ -150,14 +150,14 @@ model = #{model}, firmware = #{firmware}, transport = #{transport}, - streamMode = #{streammode}, + stream_mode = #{streamMode}, online = #{online}, - registerTime = #{registertime}, - lastConnectTime = #{lastconnecttime}, + register_time = #{registerTime}, + last_connect_time = #{lastConnectTime}, active_time = #{activeTime}, ip = #{ip}, port = #{port}, - hostAddress = #{hostaddress}, + host_address = #{hostAddress}, del_flag = #{delFlag}, create_by = #{createBy}, create_time = #{createTime}, @@ -185,18 +185,20 @@ update sip_device online = #{online}, - lastConnectTime = #{lastconnecttime}, + last_connect_time = #{lastConnectTime}, active_time = #{activeTime}, ip = #{ip}, port = #{port}, - hostaddress = #{hostaddress}, + hostaddress = #{hostAddress}, where device_sip_id = #{deviceSipId}