diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index 7941644..f8c4e1d 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -23,6 +23,9 @@ private String fireGas; private String descn; private String isOpen; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -130,7 +133,32 @@ public void setDescn(String descn) { this.descn = descn; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public WasteGas(String devCode, String wellCode, Date upTime, String CO, String O2,String H2S, String CH4,Boolean isOpen) { this.devId = devCode; diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index 7941644..f8c4e1d 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -23,6 +23,9 @@ private String fireGas; private String descn; private String isOpen; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -130,7 +133,32 @@ public void setDescn(String descn) { this.descn = descn; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public WasteGas(String devCode, String wellCode, Date upTime, String CO, String O2,String H2S, String CH4,Boolean isOpen) { this.devId = devCode; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index de6f374..3c8fe61 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -114,7 +114,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index 7941644..f8c4e1d 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -23,6 +23,9 @@ private String fireGas; private String descn; private String isOpen; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -130,7 +133,32 @@ public void setDescn(String descn) { this.descn = descn; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public WasteGas(String devCode, String wellCode, Date upTime, String CO, String O2,String H2S, String CH4,Boolean isOpen) { this.devId = devCode; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index de6f374..3c8fe61 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -114,7 +114,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 38c1f6a..47ed13e 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -142,7 +142,7 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); + ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index 7941644..f8c4e1d 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -23,6 +23,9 @@ private String fireGas; private String descn; private String isOpen; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -130,7 +133,32 @@ public void setDescn(String descn) { this.descn = descn; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public WasteGas(String devCode, String wellCode, Date upTime, String CO, String O2,String H2S, String CH4,Boolean isOpen) { this.devId = devCode; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index de6f374..3c8fe61 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -114,7 +114,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 38c1f6a..47ed13e 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -142,7 +142,7 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); + ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); } } else {//未超限 diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 0c87ab4..ec07427 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +sendURL= http://139.198.0.132:20010/job/updateSinkJob #sendURL =http://localhost:14537/job/updateSinkJob diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..876293e 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,7 +18,10 @@ private String cell; private Date uptime; private Date logtime; - + private String pci; + private String rsrp; + private String snr; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..22a7f0c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,6 +97,33 @@ this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..247bc76 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -21,6 +21,9 @@ private String descn; //状态描述 private Date uptime; //采集时间 private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; @Id @@ -105,6 +108,32 @@ public void setLogtime(Date logtime) { this.logtime = logtime; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { this.devCode = devId; diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..47e29ba 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -21,6 +21,9 @@ private String humidity; private String descn; private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -105,6 +108,33 @@ this.wellCode = wellCode; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + public TempHumi(String devCode, String wellCode,Date upTime, String temperature, String humidity, String cell) { this.devCode = devCode; diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index 7941644..f8c4e1d 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -23,6 +23,9 @@ private String fireGas; private String descn; private String isOpen; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -130,7 +133,32 @@ public void setDescn(String descn) { this.descn = descn; } + @Column(name = "PCI") + public String getPci() { + return pci; + } + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } public WasteGas(String devCode, String wellCode, Date upTime, String CO, String O2,String H2S, String CH4,Boolean isOpen) { this.devId = devCode; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index de6f374..3c8fe61 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -114,7 +114,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 38c1f6a..47ed13e 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -142,7 +142,7 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); + ThreadUtil.excuteMsg(alarmJob == null ? null : alarmJob.getId(), alarmContent,busWell != null ? busWell.getWellCode() : ""); } } else {//未超限 diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 0c87ab4..ec07427 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +sendURL= http://139.198.0.132:20010/job/updateSinkJob #sendURL =http://localhost:14537/job/updateSinkJob diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 4be2373..0c87ab4 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -20,7 +20,7 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://139.198.17.115:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://139.198.17.115:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=root ### ============================================================================