增加三场数字化

‘liusuyi’

2023-09-18 c4dfbde4b685dba6fd541e5fe6b833cbd009229c

增加三场数字化

 pom.xml

@@ -72,6 +72,11 @@
            <artifactId>ojdbc8</artifactId>
            <version>19.3.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.oracle.database.nls</groupId>
            <artifactId>orai18n</artifactId>
            <version>21.1.0.0</version>
        </dependency>
        <!--minio依赖-->
        <dependency>
            <groupId>io.minio</groupId>

 src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java

@@ -12,7 +12,7 @@
 * @date 2023-02-11
 */
@Mapper
@DS("postgres")
@DS("master")
public interface ArdCamerasMapper 
{
    /**

 src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java

@@ -2,6 +2,7 @@

import com.ard.alarm.digitization.mapper.DatabridgeMapper;
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;
@@ -20,11 +21,10 @@
public class DatabridgeController {

    @Resource
    DatabridgeMapper databridgeMapper;

    DatabridgeService databridgeService;

    @GetMapping("/list")
    public AjaxResult list(Databridge databridge) {
        return AjaxResult.success(databridgeMapper.selectDatabridgeList(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/model/Databridge.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.ard.alarm.digitization.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;
@Data
public class Databridge {
    private String id;

    private String xmmc;

    private String fKey;

    private String fName;

    private String value;

    @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss")
    private Date dateTime;

    private String DB_BZ;

    private String wellNo;
    private String alarmType;
    private String alarmTime;
    private Integer rowNum;

}

 src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
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);

}

 src/main/java/com/ard/alarm/digitization/service/impl/DatabridgeServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
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);
    }

}

 src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java

@@ -13,7 +13,7 @@
 * @date 2023-03-13
 */
@Mapper
@DS("postgres")
@DS("master")
public interface ArdEquipExternalMapper 
{
    /**

 src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java

@@ -12,7 +12,7 @@
 * @date 2023-03-11
 */
@Mapper
@DS("postgres")
@DS("master")
public interface ArdEquipRadarMapper 
{
    /**

 src/main/resources/GeneratorMapper.xml

@@ -5,7 +5,7 @@
<generatorConfiguration>
    <!-- æŒ‡å®šè¿žæŽ¥æ•°æ®åº“çš„ JDBC é©±åŠ¨åŒ…所在位置，指定到你本机的完整路径 -->
    <classPathEntry location="D:\ENV\repository\com\oracle\ojdbc\ojdbc8\19.3.0.0\ojdbc8-19.3.0.0.jar"/>
    <classPathEntry location="F:\desktop\orai18n-19.7.0.0.jar"/>
    <classPathEntry location="C:\Users\Administrator\Downloads\orai18n-19.7.0.0.jar"/>
    <!-- é…ç½® table è¡¨ä¿¡æ¯å†…容体，targetRuntime æŒ‡å®šé‡‡ç”¨ MyBatis3 çš„版本 -->
    <context id="tables" targetRuntime="MyBatis3">
        <!-- æŠ‘制生成注释，由于生成的注释都是英文的，可以不让它生成 -->

 src/main/resources/application-dev.yml

@@ -36,6 +36,34 @@
        # é€šè¿‡connectProperties属性来打开mergeSql功能；慢SQL记录
        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:postgresql://192.168.2.15:5432/ry-vue
          username: postgres
          password: postgres
          driver-class-name: org.postgresql.Driver
          druid: # é…ç½®multi-datasource1 æ•°æ®æºè¿žæŽ¥æ± å‚æ•°
            # è¿žæŽ¥æ± çš„配置信息
            # åˆå§‹åŒ–大小，最小，最大
            initial-size: 2
            min-idle: 2
            maxActive: 2
            # é…ç½®èŽ·å–连接等待超时的时间
            maxWait: 600000
            # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
            validationQuery: SELECT 1
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
            # æ‰“å¼€PSCache，并且指定每个连接上PSCache的大小
            poolPreparedStatements: true
            maxPoolPreparedStatementPerConnectionSize: 20
            # é…ç½®ç›‘控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
            filters: stat,wall,slf4j
            # é€šè¿‡connectProperties属性来打开mergeSql功能；慢SQL记录
            connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
        oracle:
          url: jdbc:oracle:thin:@//112.98.126.2:21521/orcl
          username: c##ard_user
@@ -64,34 +92,6 @@
            filters: stat,wall,slf4j
            # é€šè¿‡connectProperties属性来打开mergeSql功能；慢SQL记录
            connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
        postgres:
          url: jdbc:postgresql://192.168.1.55:5432/ry-vue
          username: postgres
          password: postgres
          driver-class-name: org.postgresql.Driver
          druid: # é…ç½®multi-datasource1 æ•°æ®æºè¿žæŽ¥æ± å‚æ•°
            # è¿žæŽ¥æ± çš„配置信息
            # åˆå§‹åŒ–大小，最小，最大
            initial-size: 2
            min-idle: 2
            maxActive: 2
            # é…ç½®èŽ·å–连接等待超时的时间
            maxWait: 600000
            # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
            validationQuery: SELECT 1
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
            # æ‰“å¼€PSCache，并且指定每个连接上PSCache的大小
            poolPreparedStatements: true
            maxPoolPreparedStatementPerConnectionSize: 20
            # é…ç½®ç›‘控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
            filters: stat,wall,slf4j
            # é€šè¿‡connectProperties属性来打开mergeSql功能；慢SQL记录
            connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000

  # netty配置
  netty:
@@ -102,10 +102,10 @@
      enabled: false
  # mqtt配置
  mqtt:
    host: tcp://192.168.1.55:1883
    host: tcp://192.168.2.15:1883
    clientId: cc3
    username: admin
    password: xzx12345
    password: admin
    topic: tube
    timeout: 100
    keepalive: 60
@@ -115,7 +115,7 @@
    url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil
  # minio配置
  minio:
    endpoint: http://192.168.1.15:9001
    endpoint: http://192.168.2.15:9001
    accessKey: admin
    secretKey: xzx12345
# mybatis配置
@@ -127,7 +127,7 @@
  level:
    hikSdk: info
    mqtt: debug
    netty: info
    netty: debug
    external: info
    camera: info
    tube: info

 src/main/resources/application.yml

@@ -1,4 +1,3 @@
spring:
  profiles:
    active: dev

    active: dev

 src/main/resources/mapper/DatabridgeMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
<?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">
    <id column="DB_GUID" jdbcType="NVARCHAR" property="id" />
    <result column="DB_XMMC" jdbcType="VARCHAR" property="xmmc" />
    <result column="DB_FKEY" jdbcType="VARCHAR" property="fKey" />
    <result column="DB_FNAME" jdbcType="VARCHAR" property="fName" />
    <result column="DB_VALUE" jdbcType="VARCHAR" property="value" />
    <result column="DB_DATETIME" jdbcType="DATE" property="dateTime" />
    <result column="DB_BZ" jdbcType="VARCHAR" property="DB_BZ" />
  </resultMap>
  <sql id="Base_Column_List">
    DB_GUID, DB_XMMC, DB_FKEY, DB_FNAME, DB_VALUE, DB_DATETIME, DB_BZ
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
    select 
    <include refid="Base_Column_List" />
    from DATABRIDGE
    where DB_GUID = #{id,jdbcType=NVARCHAR}
  </select>
  <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 )
    <where>
      <if test="dateTime != null "> and DB_DATETIME > cast(#{dateTime,jdbcType=DATE} as date)</if>
      <if test="rowNum != null  ">and rownum &lt; #{rowNum}</if>
    </where>
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
    delete from DATABRIDGE
    where DB_GUID = #{id,jdbcType=NVARCHAR}
  </delete>
  <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)
    values (#{id,jdbcType=NVARCHAR}, #{xmmc,jdbcType=VARCHAR}, #{fKey,jdbcType=VARCHAR}, 
      #{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 into DATABRIDGE
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        DB_GUID,
      </if>
      <if test="xmmc != null">
        DB_XMMC,
      </if>
      <if test="fKey != null">
        DB_FKEY,
      </if>
      <if test="fName != null">
        DB_FNAME,
      </if>
      <if test="value != null">
        DB_VALUE,
      </if>
      <if test="dateTime != null">
        DB_DATETIME,
      </if>
      <if test="DB_BZ != null">
        DB_BZ,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=NVARCHAR},
      </if>
      <if test="xmmc != null">
        #{xmmc,jdbcType=VARCHAR},
      </if>
      <if test="fKey != null">
        #{fKey,jdbcType=VARCHAR},
      </if>
      <if test="fName != null">
        #{fName,jdbcType=VARCHAR},
      </if>
      <if test="value != null">
        #{value,jdbcType=VARCHAR},
      </if>
      <if test="dateTime != null">
        #{dateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="DB_BZ != null">
        #{DB_BZ,jdbcType=VARCHAR},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ard.alarm.digitization.model.Databridge">
    update DATABRIDGE
    <set>
      <if test="xmmc != null">
        DB_XMMC = #{xmmc,jdbcType=VARCHAR},
      </if>
      <if test="fKey != null">
        DB_FKEY = #{fKey,jdbcType=VARCHAR},
      </if>
      <if test="fName != null">
        DB_FNAME = #{fName,jdbcType=VARCHAR},
      </if>
      <if test="value != null">
        DB_VALUE = #{value,jdbcType=VARCHAR},
      </if>
      <if test="dateTime != null">
        DB_DATETIME = #{dateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="DB_BZ != null">
        DB_BZ = #{DB_BZ,jdbcType=VARCHAR},
      </if>
    </set>
    where DB_GUID = #{id,jdbcType=NVARCHAR}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ard.alarm.digitization.model.Databridge">
    update DATABRIDGE
    set DB_XMMC = #{xmmc,jdbcType=VARCHAR},
      DB_FKEY = #{fKey,jdbcType=VARCHAR},
      DB_FNAME = #{fName,jdbcType=VARCHAR},
      DB_VALUE = #{value,jdbcType=VARCHAR},
      DB_DATETIME = #{dateTime,jdbcType=TIMESTAMP},
      DB_BZ = #{DB_BZ,jdbcType=VARCHAR}
    where DB_GUID = #{id,jdbcType=NVARCHAR}
  </update>
</mapper>