‘liusuyi’
2023-09-19 893c1ef4c42b9e158d95c22172d332d328efd829
增加三场数字化推送mqtt
已添加3个文件
已重命名2个文件
已修改1个文件
已删除3个文件
213 ■■■■ 文件已修改
src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/model/DataBridge.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/service/DataBridgeService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ard/alarm/digitization/service/impl/DatabridgeServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DataBridgeMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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));
    }
}
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);
}
src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java
ÎļþÒÑɾ³ý
src/main/java/com/ard/alarm/digitization/model/DataBridge.java
ÎļþÃû´Ó 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;
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);
}
src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java
ÎļþÒÑɾ³ý
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;
    }
}
src/main/java/com/ard/alarm/digitization/service/impl/DatabridgeServiceImpl.java
ÎļþÒÑɾ³ý
src/main/resources/mapper/DataBridgeMapper.xml
ÎļþÃû´Ó 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},