From c9768346fc8bc1cc6326e06125deaf57ff423eaf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 16:17:07 +0800
Subject: [PATCH] 修改三厂数字化使用原生jdbc连接
---
src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java b/src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java
index 76f1482..fb31a67 100644
--- a/src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java
+++ b/src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java
@@ -1,20 +1,19 @@
package com.ard.alarm.digitization.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
import com.ard.alarm.digitization.mapper.DataBridgeMapper;
import com.ard.alarm.digitization.model.DataBridge;
import com.ard.alarm.digitization.service.DataBridgeService;
-import com.ard.alarm.stealelec.domain.ArdAlarmStealelec;
+import com.ard.utils.jdbc.Query;
import com.ard.utils.mqtt.MqttConsumer;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
-import java.util.Map;
+
/**
* @Description:
@@ -23,29 +22,45 @@
* @Date: 2023骞�09鏈�18鏃�16:41:50
**/
@Service
-@Slf4j(topic = "alarm")
+@Slf4j(topic = "digitization3")
public class DataBridgeServiceImpl implements DataBridgeService {
+
+
@Resource
DataBridgeMapper databridgeMapper;
public static Date lastTime;
+ @Value("${spring.digitization3.enabled}")
+ private Boolean enabled;
@Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
+ List<DataBridge> dataBridgeList;
try {
- List<DataBridge> dataBridgeList = selectDatabridgeList(new DataBridge());
+ if(!enabled)
+ {
+ return;
+ }
+ if (lastTime == null) {
+ //鍒濇鏌ヨ锛屽彧鑾峰彇10鏉℃渶杩戞暟鎹��
+ dataBridgeList = Query.getAlarmData(null, 10);
+ if (dataBridgeList.size() > 0) {
+ lastTime = dataBridgeList.get(0).getDateTime();
+ }
+ } else {
+ //鏌ヨ澶т簬涓婃鏌ヨ鏈�鍚庝竴鏉℃暟鎹殑鏃堕棿
+ dataBridgeList = Query.getAlarmData(lastTime, null);
+ }
if (dataBridgeList.size() > 0) {
for (DataBridge data : dataBridgeList) {
String[] elem = data.getValue().split(";");
data.setWellNo(elem[0]);
data.setAlarmType(elem[1]);
data.setAlarmTime(elem[2]);
-
MqttConsumer.publish(2, false, "digitization3", JSON.toJSONString(data));
-
}
}
} catch (Exception ex) {
- log.error("3鍘傛暟瀛楀寲鎶ヨ鏁版嵁鎺ㄩ�佸紓甯革細" + ex.getMessage());
+ log.error("3鍘傛暟瀛楀寲鎶ヨ鏁版嵁澶勭悊寮傚父锛�" + ex.getMessage());
}
}
--
Gitblit v1.9.3