From 893c1ef4c42b9e158d95c22172d332d328efd829 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 10:10:13 +0800
Subject: [PATCH] 增加三场数字化推送mqtt
---
/dev/null | 44 --------------
src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java | 25 ++++++++
src/main/java/com/ard/alarm/digitization/service/DataBridgeService.java | 10 +++
src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java | 67 ++++++++++++++++++++++
src/main/resources/mapper/DataBridgeMapper.xml | 14 ++--
src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java | 9 +-
src/main/java/com/ard/alarm/digitization/model/DataBridge.java | 6 +
7 files changed, 117 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java b/src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java
index 9341b2a..2014deb 100644
--- a/src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java
+++ b/src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java
@@ -1,8 +1,7 @@
package com.ard.alarm.digitization.controller;
-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.digitization.model.DataBridge;
+import com.ard.alarm.digitization.service.DataBridgeService;
import com.ard.utils.http.AjaxResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,10 +20,10 @@
public class DatabridgeController {
@Resource
- DatabridgeService databridgeService;
+ DataBridgeService databridgeService;
@GetMapping("/list")
- public AjaxResult list(Databridge databridge) {
+ public AjaxResult list(DataBridge databridge) {
return AjaxResult.success(databridgeService.selectDatabridgeList(databridge));
}
}
diff --git a/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java b/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java
new file mode 100644
index 0000000..f21b1cb
--- /dev/null
+++ b/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java
@@ -0,0 +1,25 @@
+package com.ard.alarm.digitization.mapper;
+
+import com.ard.alarm.digitization.model.DataBridge;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@DS("oracle")
+@Mapper
+public interface DataBridgeMapper {
+
+ List<DataBridge> selectDatabridgeList(DataBridge row);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(DataBridge row);
+
+ int insertSelective(DataBridge row);
+
+ DataBridge selectByPrimaryKey(String id);
+
+ int updateByPrimaryKeySelective(DataBridge row);
+
+ int updateByPrimaryKey(DataBridge row);
+}
\ No newline at end of file
diff --git a/src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java b/src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java
deleted file mode 100644
index dcd91e1..0000000
--- a/src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ard.alarm.digitization.mapper;
-
-import com.ard.alarm.digitization.model.Databridge;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-@DS("oracle")
-@Mapper
-public interface DatabridgeMapper {
-
- List<Databridge> selectDatabridgeList(Databridge row);
-
- int deleteByPrimaryKey(String id);
-
- int insert(Databridge row);
-
- int insertSelective(Databridge row);
-
- Databridge selectByPrimaryKey(String id);
-
- int updateByPrimaryKeySelective(Databridge row);
-
- int updateByPrimaryKey(Databridge row);
-}
\ No newline at end of file
diff --git a/src/main/java/com/ard/alarm/digitization/model/Databridge.java b/src/main/java/com/ard/alarm/digitization/model/DataBridge.java
similarity index 78%
rename from src/main/java/com/ard/alarm/digitization/model/Databridge.java
rename to src/main/java/com/ard/alarm/digitization/model/DataBridge.java
index 04f55db..e3099f7 100644
--- a/src/main/java/com/ard/alarm/digitization/model/Databridge.java
+++ b/src/main/java/com/ard/alarm/digitization/model/DataBridge.java
@@ -1,17 +1,19 @@
package com.ard.alarm.digitization.model;
+import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
-public class Databridge {
+public class DataBridge {
private String id;
private String xmmc;
+ @JSONField(name="fKey")
private String fKey;
-
+ @JSONField(name="fName")
private String fName;
private String value;
diff --git a/src/main/java/com/ard/alarm/digitization/service/DataBridgeService.java b/src/main/java/com/ard/alarm/digitization/service/DataBridgeService.java
new file mode 100644
index 0000000..527dfe8
--- /dev/null
+++ b/src/main/java/com/ard/alarm/digitization/service/DataBridgeService.java
@@ -0,0 +1,10 @@
+package com.ard.alarm.digitization.service;
+
+import com.ard.alarm.digitization.model.DataBridge;
+
+import java.util.List;
+
+public interface DataBridgeService {
+
+ List<DataBridge> selectDatabridgeList(DataBridge row);
+}
diff --git a/src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java b/src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java
deleted file mode 100644
index b0b0253..0000000
--- a/src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ard.alarm.digitization.service;
-
-import com.ard.alarm.digitization.model.Databridge;
-
-import java.util.List;
-
-public interface DatabridgeService {
-
- List<Databridge> selectDatabridgeList(Databridge row);
-
- Databridge selectByPrimaryKey(String id);
-
-}
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
new file mode 100644
index 0000000..76f1482
--- /dev/null
+++ b/src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java
@@ -0,0 +1,67 @@
+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.mqtt.MqttConsumer;
+import lombok.extern.slf4j.Slf4j;
+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:
+ * @ClassName: DatabridgeServiceImpl
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�09鏈�18鏃�16:41:50
+ **/
+@Service
+@Slf4j(topic = "alarm")
+public class DataBridgeServiceImpl implements DataBridgeService {
+ @Resource
+ DataBridgeMapper databridgeMapper;
+ public static Date lastTime;
+
+ @Scheduled(cron = "0/5 * * * * ?")
+ public void alarmHandler() {
+ try {
+ List<DataBridge> dataBridgeList = selectDatabridgeList(new DataBridge());
+ 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());
+ }
+ }
+
+ @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;
+ }
+
+}
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
deleted file mode 100644
index 1a8e3cd..0000000
--- a/src/main/java/com/ard/alarm/digitization/service/impl/DatabridgeServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ard.alarm.digitization.service.impl;
-
-import com.ard.alarm.digitization.mapper.DatabridgeMapper;
-import com.ard.alarm.digitization.model.Databridge;
-import com.ard.alarm.digitization.service.DatabridgeService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @ClassName: DatabridgeServiceImpl
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�09鏈�18鏃�16:41:50
- **/
-@Service
-public class DatabridgeServiceImpl implements DatabridgeService {
- @Resource
- DatabridgeMapper databridgeMapper;
- public static Date lastTime;
-
- @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;
- }
-
- @Override
- public Databridge selectByPrimaryKey(String id) {
- return databridgeMapper.selectByPrimaryKey(id);
- }
-
-}
diff --git a/src/main/resources/mapper/DatabridgeMapper.xml b/src/main/resources/mapper/DataBridgeMapper.xml
similarity index 94%
rename from src/main/resources/mapper/DatabridgeMapper.xml
rename to src/main/resources/mapper/DataBridgeMapper.xml
index 0c31c9d..31b642f 100644
--- a/src/main/resources/mapper/DatabridgeMapper.xml
+++ b/src/main/resources/mapper/DataBridgeMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.alarm.digitization.mapper.DatabridgeMapper">
- <resultMap id="BaseResultMap" type="com.ard.alarm.digitization.model.Databridge">
+<mapper namespace="com.ard.alarm.digitization.mapper.DataBridgeMapper">
+ <resultMap id="BaseResultMap" type="com.ard.alarm.digitization.model.DataBridge">
<id column="DB_GUID" jdbcType="NVARCHAR" property="id" />
<result column="DB_XMMC" jdbcType="VARCHAR" property="xmmc" />
<result column="DB_FKEY" jdbcType="VARCHAR" property="fKey" />
@@ -19,7 +19,7 @@
from DATABRIDGE
where DB_GUID = #{id,jdbcType=NVARCHAR}
</select>
- <select id="selectDatabridgeList" parameterType="com.ard.alarm.digitization.model.Databridge" resultMap="BaseResultMap">
+ <select id="selectDatabridgeList" parameterType="com.ard.alarm.digitization.model.DataBridge" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from (select * from DATABRIDGE order by DB_DATETIME desc )
@@ -32,7 +32,7 @@
delete from DATABRIDGE
where DB_GUID = #{id,jdbcType=NVARCHAR}
</delete>
- <insert id="insert" parameterType="com.ard.alarm.digitization.model.Databridge">
+ <insert id="insert" parameterType="com.ard.alarm.digitization.model.DataBridge">
insert into DATABRIDGE (DB_GUID, DB_XMMC, DB_FKEY,
DB_FNAME, DB_VALUE, DB_DATETIME,
DB_BZ)
@@ -40,7 +40,7 @@
#{fName,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, #{dateTime,jdbcType=TIMESTAMP},
#{DB_BZ,jdbcType=VARCHAR})
</insert>
- <insert id="insertSelective" parameterType="com.ard.alarm.digitization.model.Databridge">
+ <insert id="insertSelective" parameterType="com.ard.alarm.digitization.model.DataBridge">
insert into DATABRIDGE
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -89,7 +89,7 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.ard.alarm.digitization.model.Databridge">
+ <update id="updateByPrimaryKeySelective" parameterType="com.ard.alarm.digitization.model.DataBridge">
update DATABRIDGE
<set>
<if test="xmmc != null">
@@ -113,7 +113,7 @@
</set>
where DB_GUID = #{id,jdbcType=NVARCHAR}
</update>
- <update id="updateByPrimaryKey" parameterType="com.ard.alarm.digitization.model.Databridge">
+ <update id="updateByPrimaryKey" parameterType="com.ard.alarm.digitization.model.DataBridge">
update DATABRIDGE
set DB_XMMC = #{xmmc,jdbcType=VARCHAR},
DB_FKEY = #{fKey,jdbcType=VARCHAR},
--
Gitblit v1.9.3