xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

装置新增页面增加规约 工作时间 信号 投产日期 网络类型等各种编号

Browse Source
dev
liuguijing 2 years ago
parent fe76b6e6f7
commit d9504c393e
7 changed files with 75 additions and 8 deletions
Show Stats Download Patch File Download Diff File

7
xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.shxy.xymanager_common.dto;
import lombok.Data;
import org.omg.CORBA.INTERNAL;
import java.io.Serializable;
import java.math.BigInteger;
@ -27,7 +28,7 @@ public class TerminalsAndStatusDto implements Serializable {
private String essentialInfoVersion;
private Byte hasPan;
private Integer hasPan;
private String bsManufacturer;
@ -53,6 +54,10 @@ public class TerminalsAndStatusDto implements Serializable {
private BigInteger lastHeartbeat;
private String sim;
private Date workingDate;
private Integer netType;
private static final long serialVersionUID = 1L;
}

8
xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java
Unescape Escape View File

@ -26,12 +26,16 @@ public class Terminals implements Serializable {
private String essentialInfoVersion;
private Byte hasPan;
private Integer hasPan;
private String bsManufacturer;
private String sim;
private Date bsProductionDate;
private Date workingDate;
private String bsIdentifier;
private Double latitude;
@ -46,6 +50,8 @@ public class Terminals implements Serializable {
private Integer onlinestatus;
private Integer netType;
private Integer protocol;
/*展示名字 等价与displayname 用于方便*/

17
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java
Unescape Escape View File

@ -32,6 +32,12 @@ public class TerminalListModel implements Serializable {
@ApiModelProperty(value = "设备编号", example = "123456")
private Integer id;
@ApiModelProperty(value = "电压编号", example = "123456")
private Integer dyId;
@ApiModelProperty(value = "电压名称", example = "123456")
private String dyName;
@ApiModelProperty(value = "线路编号", example = "123456")
private Integer lineId;
@ -44,6 +50,15 @@ public class TerminalListModel implements Serializable {
@ApiModelProperty(value = "杆塔名称", example = "123456")
private String towerName;
@ApiModelProperty(value = "sim卡号", example = "123456")
private String sim;
@ApiModelProperty(value = "网络类型", example = "网络类型")
private Integer netType;
@ApiModelProperty(value = "投运日期", example = "2022-06-12")
private Date workingDate;
@ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678")
private String cmdId;
@ -63,7 +78,7 @@ public class TerminalListModel implements Serializable {
private String essentialInfoVersion;
@ApiModelProperty(value = "是否带云台", example = " 0： 不带云台 1：带云台")
private Byte hasPan;
private Integer hasPan;
@ApiModelProperty(value = "生产厂家", example = "生产厂家")
private String bsManufacturer;

11
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java
Unescape Escape View File

@ -45,11 +45,20 @@ public class TerminalVo {
private String essentialInfoVersion;
@ApiModelProperty(value = "是否带云台", example = " 0： 不带云台 1：带云台")
private Byte hasPan;
private Integer hasPan;
@ApiModelProperty(value = "生产厂家", example = "生产厂家")
private String bsManufacturer;
@ApiModelProperty(value = "规约版本", example = "规约版本")
private Integer protocol;
@ApiModelProperty(value = "网络类型", example = "网络类型")
private Integer netType;
@ApiModelProperty(value = "投运日期", example = "2022-06-12")
private Date workingDate;
@ApiModelProperty(value = "生产日期", example = "2022-06-12")
private Date bsProductionDate;

11
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java
Unescape Escape View File

@ -50,11 +50,20 @@ public class UpdateTerminalVo {
private String essentialInfoVersion;
@ApiModelProperty(value = "是否带云台", example = " 0： 不带云台 1：带云台")
private Byte hasPan;
private Integer hasPan;
@ApiModelProperty(value = "生产厂家", example = "生产厂家")
private String bsManufacturer;
@ApiModelProperty(value = "规约版本", example = "规约版本")
private Integer protocol;
@ApiModelProperty(value = "网络类型", example = "网络类型")
private Integer netType;
@ApiModelProperty(value = "投运日期", example = "2022-06-12")
private Date workingDate;
@ApiModelProperty(value = "生产日期", example = "2022-06-12")
private Date bsProductionDate;

13
xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
Unescape Escape View File

@ -15,10 +15,13 @@
<result column="has_pan" jdbcType="TINYINT" property="hasPan"/>
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
<result column="bs_production_date" jdbcType="DATE" property="bsProductionDate"/>
<result column="working_date" jdbcType="DATE" property="working_date"/>
<result column="bs_identifier" jdbcType="VARCHAR" property="bsIdentifier"/>
<result column="sim" jdbcType="VARCHAR" property="sim"/>
<result column="latitude" jdbcType="DOUBLE" property="latitude"/>
<result column="longitude" jdbcType="DOUBLE" property="longitude"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="net_type" jdbcType="INTEGER" property="netType"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
@ -33,7 +36,7 @@
<result column="display_name" jdbcType="VARCHAR" property="displayName"/>
<result column="model" jdbcType="VARCHAR" property="model"/>
<result column="essential_info_version" jdbcType="VARCHAR" property="essentialInfoVersion"/>
<result column="has_pan" jdbcType="TINYINT" property="hasPan"/>
<result column="has_pan" jdbcType="INTEGER" property="hasPan"/>
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
<result column="bs_production_date" jdbcType="DATE" property="bsProductionDate"/>
<result column="bs_identifier" jdbcType="VARCHAR" property="bsIdentifier"/>
@ -46,6 +49,9 @@
<result column="battery_capacity" jdbcType="REAL" property="batteryCapacity"/>
<result column="battery_voltage" jdbcType="REAL" property="batteryVoltage"/>
<result column="last_heartbeat" jdbcType="BIGINT" property="lastHeartbeat"/>
<result column="sim" jdbcType="VARCHAR" property="sim"/>
<result column="working_date" jdbcType="DATE" property="workingDate"/>
<result column="net_type" jdbcType="INTEGER" property="netType"/>
</resultMap>
<resultMap id="ChannelAndTerm" type="com.shxy.xymanager_common.dto.ChannelAndTermDto">
@ -86,7 +92,7 @@
<sql id="Base_Column_List">
id, line_id,tower_id,cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan,
bs_manufacturer, bs_production_date, bs_identifier, latitude, longitude, create_time,
update_time
update_time,sim,working_date,net_type
</sql>
<select id="selectAll" resultMap="BaseResultMap">
@ -149,6 +155,9 @@
d.longitude as longitude,
d.status as status,
d.protocol as protocol,
d.sim as sim,
d.working_date as working_date,
d.net_type as net_type,
e.last_heartbeat as last_heartbeat,
e.signal_strength_4g as signal_strength_4g,
e.boot_time as boot_time,

16
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
Unescape Escape View File

@ -86,6 +86,7 @@ public class TerminalServiceImpl implements TerminalService {
@Override
public ServiceBody<TerminalListModel> getTerminalList(TerminalSelectVo vo) {
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TermAndChannelDto> termAndChannelMap = cacheService.getTermAndChannelMap();
Map<Integer, Protocols> protocolMap = cacheService.getProtocolMap();
Integer dyid = vo.getDyId();
@ -115,9 +116,18 @@ public class TerminalServiceImpl implements TerminalService {
TowerDto towerDto = towerMap.get(towerid);
if (BeanUtil.isNotEmpty(towerDto)) {
terminalsBean.setTowerName(towerDto.getName());
terminalsBean.setLineId(towerDto.getLineId());
Integer lineId = towerDto.getLineId();
terminalsBean.setLineId(lineId);
terminalsBean.setLineName(towerDto.getLineName());
if (BeanUtil.isNotEmpty(lineMap)) {
LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineId);
if (BeanUtil.isNotEmpty(lineAndDyNameDto)) {
terminalsBean.setDyId(lineAndDyNameDto.getDyLevelId());
terminalsBean.setDyName(lineAndDyNameDto.getDyLevelName());
}
}
}
if (protocolMap != null) {
Integer protocol = item.getProtocol();
if (protocol != null) {
@ -128,6 +138,10 @@ public class TerminalServiceImpl implements TerminalService {
}
}
}
terminalsBean.setSim(item.getSim());
terminalsBean.setWorkingDate(item.getWorkingDate());
terminalsBean.setNetType(item.getNetType());
terminalsBean.setCmdId(item.getCmdid());
terminalsBean.setOrgId(item.getOrgId());
terminalsBean.setEquipName(item.getEquipName());

Write Preview
Loading…
Cancel
Save