diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 31bbc64..c21a55c 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -31,6 +31,7 @@ deviceAlarmMap.put(DeviceTypeEnum.WasteGas.toString(), "YHCX"); deviceAlarmMap.put(DeviceTypeEnum.TempHumi.toString(), "WSCX"); deviceAlarmMap.put(DeviceTypeEnum.Meter.toString(), "SZCX"); + deviceAlarmMap.put(DeviceTypeEnum.LG.toString(), "RYCX"); } public Criteria getCriteria() { @@ -71,11 +72,13 @@ public String produceJobCode(String devTypeName) { String pre = deviceAlarmMap.get(devTypeName); String dataStr = DateUtils.sdf6.format(new Date()); - String fix = getAlarmJob(pre + dataStr); - if (StringUtils.isNotBlank(fix)) { - return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); - } else - return pre + dataStr + "0001"; +// String fix = getAlarmJob(pre + dataStr); +// if (StringUtils.isNotBlank(fix)) { +// return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); +// } else +// return pre + dataStr + "0001"; + + return pre + dataStr +System.currentTimeMillis(); } diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 31bbc64..c21a55c 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -31,6 +31,7 @@ deviceAlarmMap.put(DeviceTypeEnum.WasteGas.toString(), "YHCX"); deviceAlarmMap.put(DeviceTypeEnum.TempHumi.toString(), "WSCX"); deviceAlarmMap.put(DeviceTypeEnum.Meter.toString(), "SZCX"); + deviceAlarmMap.put(DeviceTypeEnum.LG.toString(), "RYCX"); } public Criteria getCriteria() { @@ -71,11 +72,13 @@ public String produceJobCode(String devTypeName) { String pre = deviceAlarmMap.get(devTypeName); String dataStr = DateUtils.sdf6.format(new Date()); - String fix = getAlarmJob(pre + dataStr); - if (StringUtils.isNotBlank(fix)) { - return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); - } else - return pre + dataStr + "0001"; +// String fix = getAlarmJob(pre + dataStr); +// if (StringUtils.isNotBlank(fix)) { +// return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); +// } else +// return pre + dataStr + "0001"; + + return pre + dataStr +System.currentTimeMillis(); } diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 74c2cbd..de53fd0 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.AlarmEnumDTO.MethaneAlarmEnum; import org.well.well.base.DeviceTypeEnum; @@ -61,6 +62,7 @@ } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 31bbc64..c21a55c 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -31,6 +31,7 @@ deviceAlarmMap.put(DeviceTypeEnum.WasteGas.toString(), "YHCX"); deviceAlarmMap.put(DeviceTypeEnum.TempHumi.toString(), "WSCX"); deviceAlarmMap.put(DeviceTypeEnum.Meter.toString(), "SZCX"); + deviceAlarmMap.put(DeviceTypeEnum.LG.toString(), "RYCX"); } public Criteria getCriteria() { @@ -71,11 +72,13 @@ public String produceJobCode(String devTypeName) { String pre = deviceAlarmMap.get(devTypeName); String dataStr = DateUtils.sdf6.format(new Date()); - String fix = getAlarmJob(pre + dataStr); - if (StringUtils.isNotBlank(fix)) { - return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); - } else - return pre + dataStr + "0001"; +// String fix = getAlarmJob(pre + dataStr); +// if (StringUtils.isNotBlank(fix)) { +// return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); +// } else +// return pre + dataStr + "0001"; + + return pre + dataStr +System.currentTimeMillis(); } diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 74c2cbd..de53fd0 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.AlarmEnumDTO.MethaneAlarmEnum; import org.well.well.base.DeviceTypeEnum; @@ -61,6 +62,7 @@ } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 882dc4b..ac6ba1c 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.base.DeviceTypeEnum; import org.well.well.core.hibernate.HibernateEntityDao; @@ -72,6 +73,7 @@ return resultMap; } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 31bbc64..c21a55c 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -31,6 +31,7 @@ deviceAlarmMap.put(DeviceTypeEnum.WasteGas.toString(), "YHCX"); deviceAlarmMap.put(DeviceTypeEnum.TempHumi.toString(), "WSCX"); deviceAlarmMap.put(DeviceTypeEnum.Meter.toString(), "SZCX"); + deviceAlarmMap.put(DeviceTypeEnum.LG.toString(), "RYCX"); } public Criteria getCriteria() { @@ -71,11 +72,13 @@ public String produceJobCode(String devTypeName) { String pre = deviceAlarmMap.get(devTypeName); String dataStr = DateUtils.sdf6.format(new Date()); - String fix = getAlarmJob(pre + dataStr); - if (StringUtils.isNotBlank(fix)) { - return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); - } else - return pre + dataStr + "0001"; +// String fix = getAlarmJob(pre + dataStr); +// if (StringUtils.isNotBlank(fix)) { +// return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); +// } else +// return pre + dataStr + "0001"; + + return pre + dataStr +System.currentTimeMillis(); } diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 74c2cbd..de53fd0 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.AlarmEnumDTO.MethaneAlarmEnum; import org.well.well.base.DeviceTypeEnum; @@ -61,6 +62,7 @@ } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 882dc4b..ac6ba1c 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.base.DeviceTypeEnum; import org.well.well.core.hibernate.HibernateEntityDao; @@ -72,6 +73,7 @@ return resultMap; } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ee90c14..6fc2bcc 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -63,7 +63,7 @@ } - @Transactional(rollbackFor = Exception.class) + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/domain/AlarmRecord.java b/src/main/java/org/well/well/domain/AlarmRecord.java index 5b77c6e..7ffc8eb 100644 --- a/src/main/java/org/well/well/domain/AlarmRecord.java +++ b/src/main/java/org/well/well/domain/AlarmRecord.java @@ -46,7 +46,7 @@ public AlarmRecord(Long jobId, String alarmType,Integer alarmLevel, String alarmContent, String alarmValue, Device device, String deviceCode, String wellCode, Date alarmTime,String alarmMsg) { this.id= SnowFlakeUtil.getId(); - this.jobId = SnowFlakeUtil.getId(); + this.jobId = jobId; this.alarmType = alarmType; this.alarmLevel = alarmLevel; this.alarmContent = alarmContent; diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 31bbc64..c21a55c 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -31,6 +31,7 @@ deviceAlarmMap.put(DeviceTypeEnum.WasteGas.toString(), "YHCX"); deviceAlarmMap.put(DeviceTypeEnum.TempHumi.toString(), "WSCX"); deviceAlarmMap.put(DeviceTypeEnum.Meter.toString(), "SZCX"); + deviceAlarmMap.put(DeviceTypeEnum.LG.toString(), "RYCX"); } public Criteria getCriteria() { @@ -71,11 +72,13 @@ public String produceJobCode(String devTypeName) { String pre = deviceAlarmMap.get(devTypeName); String dataStr = DateUtils.sdf6.format(new Date()); - String fix = getAlarmJob(pre + dataStr); - if (StringUtils.isNotBlank(fix)) { - return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); - } else - return pre + dataStr + "0001"; +// String fix = getAlarmJob(pre + dataStr); +// if (StringUtils.isNotBlank(fix)) { +// return pre + dataStr + String.format("%04d", Long.valueOf(fix) + 1); +// } else +// return pre + dataStr + "0001"; + + return pre + dataStr +System.currentTimeMillis(); } diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 74c2cbd..de53fd0 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.AlarmEnumDTO.MethaneAlarmEnum; import org.well.well.base.DeviceTypeEnum; @@ -61,6 +62,7 @@ } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 882dc4b..ac6ba1c 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.well.well.AlarmEnumDTO.GasLiquidAlarmEnum; import org.well.well.base.DeviceTypeEnum; import org.well.well.core.hibernate.HibernateEntityDao; @@ -72,6 +73,7 @@ return resultMap; } + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ee90c14..6fc2bcc 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -63,7 +63,7 @@ } - @Transactional(rollbackFor = Exception.class) + @Transactional public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.getString("cell"); JSONArray jsonArray = jsonObject.getJSONArray("datas"); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 61ea57f..3002c44 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/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://111.198.10.15:11102/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_br_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=Casic203! ### ============================================================================