From c4dfbde4b685dba6fd541e5fe6b833cbd009229c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 18 Sep 2023 17:18:19 +0800
Subject: [PATCH] 增加三场数字化
---
src/main/resources/mapper/DatabridgeMapper.xml | 126 +++++++++++++++++++++
src/main/java/com/ard/alarm/digitization/service/impl/DatabridgeServiceImpl.java | 44 +++++++
src/main/java/com/ard/alarm/digitization/mapper/DatabridgeMapper.java | 25 ++++
src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java | 2
src/main/resources/GeneratorMapper.xml | 2
pom.xml | 5
src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java | 6
src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java | 2
src/main/java/com/ard/alarm/digitization/model/Databridge.java | 29 ++++
src/main/java/com/ard/alarm/digitization/service/DatabridgeService.java | 13 ++
src/main/resources/application-dev.yml | 64 +++++-----
src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java | 2
src/main/resources/application.yml | 3
13 files changed, 282 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 42e4c7d..88f7b55 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java b/src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java
index dfc62dc..76908d2 100644
--- a/src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java
+++ b/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
{
/**
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 24ab6da..9341b2a 100644
--- a/src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java
+++ b/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));
}
}
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..dcd91e1
--- /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/model/Databridge.java b/src/main/java/com/ard/alarm/digitization/model/Databridge.java
new file mode 100644
index 0000000..04f55db
--- /dev/null
+++ b/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;
+
+}
\ No newline at end of file
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..b0b0253
--- /dev/null
+++ b/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);
+
+}
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..1a8e3cd
--- /dev/null
+++ b/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);
+ }
+
+}
diff --git a/src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java b/src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java
index ddca367..f523f5d 100644
--- a/src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java
+++ b/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
{
/**
diff --git a/src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java b/src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java
index 86f93d9..dcfec83 100644
--- a/src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java
+++ b/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
{
/**
diff --git a/src/main/resources/GeneratorMapper.xml b/src/main/resources/GeneratorMapper.xml
index 7ed6e9f..74a7223 100644
--- a/src/main/resources/GeneratorMapper.xml
+++ b/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">
<!-- 抑制生成注释，由于生成的注释都是英文的，可以不让它生成 -->
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7abba08..a77be36 100644
--- a/src/main/resources/application-dev.yml
+++ b/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
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad9a171..caf4dfc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,3 @@
spring:
profiles:
- active: dev
-
+ active: dev
\ No newline at end of file
diff --git a/src/main/resources/mapper/DatabridgeMapper.xml b/src/main/resources/mapper/DatabridgeMapper.xml
new file mode 100644
index 0000000..0c31c9d
--- /dev/null
+++ b/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 < #{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>
\ No newline at end of file
--
Gitblit v1.9.3