diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDiscern.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDiscern.java new file mode 100644 index 0000000..31c2621 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDiscern.java @@ -0,0 +1,170 @@ +package com.ruoyi.common.core.domain.entity; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 雷达原始数据对象 sys_primary_radar_data + * + * @author ruoyi + */ +public class SysDiscern extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @Excel(name = "数据序号", cellType = ColumnType.NUMERIC) + private Long id; + /** + * 标签id号 + */ + @Excel(name = "标签id号") + private String tagId; + + /** + * 峰值4· + */ + @Excel(name = "峰值4") + private Integer value4; + + /** + * 天线号 + */ + @Excel(name = "天线号") + private Integer number; + /** + * 雷达位置 + */ + @Excel(name = "雷达位置") + private String radarLocation; + /**、 + * 车架号 + */ + @Excel(name = "车架号") + private String ladleNumber; + + private Integer count; + + /** + * 识别类型 + */ + private Integer type; + + /** + * 开始时间 + */ + private Date createTime; + + /** + * 结束时间 + */ + private Date updateTime; + + public SysDiscern() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTagId() { + return tagId; + } + + public void setTagId(String tagId) { + this.tagId = tagId; + } + + public Integer getValue4() { + return value4; + } + + public void setValue4(Integer value4) { + this.value4 = value4; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public String getRadarLocation() { + return radarLocation; + } + + public void setRadarLocation(String radarLocation) { + this.radarLocation = radarLocation; + } + + public String getLadleNumber() { + return ladleNumber; + } + + public void setLadleNumber(String ladleNumber) { + this.ladleNumber = ladleNumber; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public Date getUpdateTime() { + return updateTime; + } + + @Override + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("tagId",getTagId()) + .append("value4",getValue4()) + .append("number",getNumber()) + .append("type",getType()) + .append("count",getCount()) + .append("radarLocation",getRadarLocation()) + .append("ladleNumber",getLadleNumber()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketModel.java index f03d89d..5f8f2ee 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketModel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketModel.java @@ -11,4 +11,8 @@ public class SocketModel { private String radarLocation; private Socket socket; + + private int readCount; + + private long lastReceiveTimestamp; } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java index 0ffa144..4636c75 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.entity.RadarTableVO; import java.util.List; /** - * 用户表 数据层 + * 原始数据表 数据层 * * @author ruoyi */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDiscernMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDiscernMapper.java new file mode 100644 index 0000000..c4a20e1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDiscernMapper.java @@ -0,0 +1,19 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.common.core.domain.entity.PrimaryRadarData; +import com.ruoyi.common.core.domain.entity.SysDiscern; + +import java.util.List; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +public interface SysDiscernMapper +{ + + List selectDiscernList(SysDiscern sysDiscern); + + int insertDiscern(SysDiscern sysDiscern); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDiscernService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDiscernService.java new file mode 100644 index 0000000..c38138f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDiscernService.java @@ -0,0 +1,19 @@ +package com.ruoyi.system.service; + +import com.ruoyi.common.core.domain.entity.PrimaryRadarData; +import com.ruoyi.common.core.domain.entity.SysDiscern; + +import java.util.List; + +/** + *高温标识器 业务层 + * + * @author ruoyi + */ +public interface ISysDiscernService +{ + List selectDiscernList(SysDiscern sysDiscern); + + int insertDiscern(SysDiscern sysDiscern); + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDiscernServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDiscernServiceImpl.java new file mode 100644 index 0000000..5ba8baa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDiscernServiceImpl.java @@ -0,0 +1,43 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.domain.entity.PrimaryRadarData; +import com.ruoyi.common.core.domain.entity.SysDiscern; +import com.ruoyi.system.mapper.PrimaryRadarDataMapper; +import com.ruoyi.system.mapper.SysDiscernMapper; +import com.ruoyi.system.service.ISysDiscernService; +import com.ruoyi.system.service.PrimaryRadarDataService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.validation.Validator; +import java.util.List; + +/** + * 雷达 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysDiscernServiceImpl implements ISysDiscernService +{ + private static final Logger log = LoggerFactory.getLogger(SysDiscernServiceImpl.class); + + @Autowired + private SysDiscernMapper sysDiscernMapper; + + @Autowired + protected Validator validator; + + + @Override + public List selectDiscernList(SysDiscern sysDiscern) { + return sysDiscernMapper.selectDiscernList(sysDiscern); + } + + @Override + public int insertDiscern(SysDiscern sysDiscern) { + return sysDiscernMapper.insertDiscern(sysDiscern); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDiscernMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDiscernMapper.xml new file mode 100644 index 0000000..629eb0c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysDiscernMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + insert into sys_primary_radar_data( + id, + tag_id, + value1, + value2, + value3, + value4, + value5, + base_line, + query_fre, + number, + radar_location, + ladle_number, + radar_ip, + create_by, + remark, + create_time, + update_time + )values( + #{id}, + #{tagId}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{baseLine}, + #{queryFre}, + #{number}, + #{radarLocation}, + #{ladleNumber}, + #{radarIp}, + #{createBy}, + #{remark}, + sysdate(), + sysdate() + ) + + + + + + + + insert into sys_discern( + id, + tag_id, + ladle_number, + radar_location, + count, + type, + value4, + number, + create_time, + update_time, + )values( + #{id}, + #{tagId}, + #{ladleNumber}, + #{radarLocation}, + #{count}, + #{type}, + #{value4}, + #{number}, + #{createTime}, + #{updateTime}, + ) + + + \ No newline at end of file