From 745d5b90be7d8cdb8873b18d18b286fdc4b6913b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 十二月 2023 10:13:57 +0800
Subject: [PATCH] 配置文件全部更改为配置类 优化包路径
---
src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 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 fb31a67..db27647 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,15 +1,16 @@
package com.ard.alarm.digitization.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.ard.alarm.digitization.mapper.DataBridgeMapper;
+import com.ard.alarm.digitization.config.Digit3Configuration;
import com.ard.alarm.digitization.model.DataBridge;
import com.ard.alarm.digitization.service.DataBridgeService;
import com.ard.utils.jdbc.Query;
-import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.mqtt.MqttProducer;
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;
@@ -25,18 +26,15 @@
@Slf4j(topic = "digitization3")
public class DataBridgeServiceImpl implements DataBridgeService {
-
- @Resource
- DataBridgeMapper databridgeMapper;
public static Date lastTime;
- @Value("${spring.digitization3.enabled}")
- private Boolean enabled;
+ @Resource
+ Digit3Configuration digit3Config;
@Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
List<DataBridge> dataBridgeList;
try {
- if(!enabled)
+ if(!digit3Config.getEnabled())
{
return;
}
@@ -56,27 +54,12 @@
data.setWellNo(elem[0]);
data.setAlarmType(elem[1]);
data.setAlarmTime(elem[2]);
- MqttConsumer.publish(2, false, "digitization3", JSON.toJSONString(data));
+ MqttProducer.publish(2, false, "digitization3", JSON.toJSONString(data));
}
}
} catch (Exception ex) {
log.error("3鍘傛暟瀛楀寲鎶ヨ鏁版嵁澶勭悊寮傚父锛�" + ex.getMessage());
}
- }
-
- @Override
- public List<DataBridge> selectDatabridgeList(DataBridge row) {
- List<DataBridge> dataBridgeList;
- if (lastTime == null) {
- lastTime = new Date();
- row.setRowNum(10);
- dataBridgeList = databridgeMapper.selectDatabridgeList(row);
- lastTime = dataBridgeList.get(0).getDateTime();
- } else {
- row.setDateTime(lastTime);
- dataBridgeList = databridgeMapper.selectDatabridgeList(row);
- }
- return dataBridgeList;
}
}
--
Gitblit v1.9.3