diff --git a/src/main/java/org/well/well/domain/Pressure.java b/src/main/java/org/well/well/domain/Pressure.java index b625539..6c3724d 100644 --- a/src/main/java/org/well/well/domain/Pressure.java +++ b/src/main/java/org/well/well/domain/Pressure.java @@ -139,7 +139,7 @@ public Pressure() { } - public Pressure(String devCode, String wellCode, String dataValue, String cell, Timestamp uptime, Timestamp logtime) { + public Pressure(String devCode, String wellCode, String dataValue, String cell, Timestamp uptime, Timestamp logtime,String snr,String pci,String rsrp) { this.dbId = SnowFlakeUtil.getId(); this.devCode = devCode; this.wellCode = wellCode; @@ -147,6 +147,9 @@ this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } diff --git a/src/main/java/org/well/well/domain/Pressure.java b/src/main/java/org/well/well/domain/Pressure.java index b625539..6c3724d 100644 --- a/src/main/java/org/well/well/domain/Pressure.java +++ b/src/main/java/org/well/well/domain/Pressure.java @@ -139,7 +139,7 @@ public Pressure() { } - public Pressure(String devCode, String wellCode, String dataValue, String cell, Timestamp uptime, Timestamp logtime) { + public Pressure(String devCode, String wellCode, String dataValue, String cell, Timestamp uptime, Timestamp logtime,String snr,String pci,String rsrp) { this.dbId = SnowFlakeUtil.getId(); this.devCode = devCode; this.wellCode = wellCode; @@ -147,6 +147,9 @@ this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } diff --git a/src/main/java/org/well/well/manager/PressureManager.java b/src/main/java/org/well/well/manager/PressureManager.java index 1b19c8c..28b977f 100644 --- a/src/main/java/org/well/well/manager/PressureManager.java +++ b/src/main/java/org/well/well/manager/PressureManager.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -46,14 +47,15 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String devcode, String wellCode, - String dataValue, String cell, String uptime) { + String dataValue, String cell, String uptime, String snr, String pci, String rsrp) { Map resultMap = new HashMap(); + String timeFormat = StringUtils.isEmpty(uptime) ? "" : DateUtils.DateFormat(uptime); try { - String timeFormat = DateUtils.DateFormat(uptime); + SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Pressure pressure = new Pressure(devcode, wellCode, dataValue, cell, - new Timestamp(StringUtils.isNotBlank(timeFormat) ? DateUtils.sdf4.parse(timeFormat).getTime() : null), - new Timestamp((new Date()).getTime())); + new Timestamp(StringUtils.isNotBlank(timeFormat) ? sdf4.parse(timeFormat).getTime() : null), + new Timestamp((new Date()).getTime()), snr, pci, rsrp); save(pressure); } catch (Exception e) { e.printStackTrace(); @@ -73,9 +75,13 @@ try { String dataValue = ((JSONObject) jsonArray.get(i)).getString("dataValue"); String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String snr = ((JSONObject) jsonArray.get(i)).getString("snr"); + String pci = ((JSONObject) jsonArray.get(i)).getString("pci"); + String rsrp = ((JSONObject) jsonArray.get(i)).getString("rsrp"); + dataValue = String.format("%.4f", Double.valueOf(dataValue)); //1.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), dataValue, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), dataValue, cell, upTime, snr, pci, rsrp);//存储采集数据 //2.有无超限处理流程(判断最后一条数据) if (i < jsonArray.size() - 1) { continue;