From c9768346fc8bc1cc6326e06125deaf57ff423eaf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 16:17:07 +0800
Subject: [PATCH] 修改三厂数字化使用原生jdbc连接
---
src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java | 2
src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java | 18 +
src/main/resources/logback-spring.xml | 105 +++++++----
src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java | 2
src/main/java/com/ard/utils/jdbc/Query.java | 72 ++++++++
src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java | 33 ++-
src/main/resources/application-prod.yml | 7
pom.xml | 6
/dev/null | 49 -----
src/main/java/com/ard/utils/jdbc/Conn.java | 103 +++++++++++
src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java | 2
src/main/resources/application-dev.yml | 114 +++---------
src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java | 2
13 files changed, 308 insertions(+), 207 deletions(-)
diff --git a/pom.xml b/pom.xml
index 88f7b55..fd515f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,12 +99,6 @@
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.2.14</version>
</dependency>
- <!-- 鍔ㄦ�佹暟鎹簮 -->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.5.0</version>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
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 76908d2..c75f1df 100644
--- a/src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java
+++ b/src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java
@@ -2,7 +2,6 @@
import java.util.List;
import com.ard.alarm.camera.domain.ArdCameras;
-import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -12,7 +11,6 @@
* @date 2023-02-11
*/
@Mapper
-@DS("master")
public interface ArdCamerasMapper
{
/**
diff --git a/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java b/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java
index f21b1cb..498665e 100644
--- a/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java
+++ b/src/main/java/com/ard/alarm/digitization/mapper/DataBridgeMapper.java
@@ -1,11 +1,9 @@
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 {
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 76f1482..fb31a67 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,20 +1,19 @@
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.jdbc.Query;
import com.ard.utils.mqtt.MqttConsumer;
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;
-import java.util.Map;
+
/**
* @Description:
@@ -23,29 +22,45 @@
* @Date: 2023骞�09鏈�18鏃�16:41:50
**/
@Service
-@Slf4j(topic = "alarm")
+@Slf4j(topic = "digitization3")
public class DataBridgeServiceImpl implements DataBridgeService {
+
+
@Resource
DataBridgeMapper databridgeMapper;
public static Date lastTime;
+ @Value("${spring.digitization3.enabled}")
+ private Boolean enabled;
@Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
+ List<DataBridge> dataBridgeList;
try {
- List<DataBridge> dataBridgeList = selectDatabridgeList(new DataBridge());
+ if(!enabled)
+ {
+ return;
+ }
+ if (lastTime == null) {
+ //鍒濇鏌ヨ锛屽彧鑾峰彇10鏉℃渶杩戞暟鎹��
+ dataBridgeList = Query.getAlarmData(null, 10);
+ if (dataBridgeList.size() > 0) {
+ lastTime = dataBridgeList.get(0).getDateTime();
+ }
+ } else {
+ //鏌ヨ澶т簬涓婃鏌ヨ鏈�鍚庝竴鏉℃暟鎹殑鏃堕棿
+ dataBridgeList = Query.getAlarmData(lastTime, null);
+ }
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());
+ log.error("3鍘傛暟瀛楀寲鎶ヨ鏁版嵁澶勭悊寮傚父锛�" + ex.getMessage());
}
}
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 f523f5d..e5b3a23 100644
--- a/src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java
+++ b/src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java
@@ -2,7 +2,6 @@
import java.util.List;
import com.ard.alarm.external.domain.ArdEquipExternal;
-import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +12,6 @@
* @date 2023-03-13
*/
@Mapper
-@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 dcfec83..2d5755c 100644
--- a/src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java
+++ b/src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java
@@ -2,7 +2,6 @@
import java.util.List;
import com.ard.alarm.radar.domain.ArdEquipRadar;
-import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -12,7 +11,6 @@
* @date 2023-03-11
*/
@Mapper
-@DS("master")
public interface ArdEquipRadarMapper
{
/**
diff --git a/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java b/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
index 1cc832e..84bf9d4 100644
--- a/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
+++ b/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
@@ -10,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -24,12 +25,15 @@
*/
@Slf4j(topic = "stealAlarm")
@Service
-public class StealElecAlarmService{
+public class StealElecAlarmService {
@Resource
RestTemplate restTemplate;
@Value("${spring.stealelec.url}")
private String stealElecUrl;
- List<String> tempList=new ArrayList<>();
+ @Value("${spring.stealelec.enabled}")
+ private Boolean enabled;
+ List<String> tempList = new ArrayList<>();
+
/**
* @鎻忚堪 鑾峰彇api鏁版嵁鎺ㄩ�乵qtt
* @鍙傛暟 []
@@ -39,9 +43,12 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Async("alarm")
- // @Scheduled(cron="0/5 * * * * ?")
+ @Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
try {
+ if (!enabled) {
+ return;
+ }
String allAlarmData = restTemplate.getForObject(stealElecUrl, String.class);
//鍓旈櫎鎵�鏈塡绗﹀彿
String message = allAlarmData.replaceAll("\\\\", "");
@@ -60,11 +67,10 @@
String JSONStr = JSON.toJSONString(object);
//杞垚瀹炰綋瀵硅薄
ArdAlarmStealelec wd = JSON.parseObject(JSONStr, ArdAlarmStealelec.class);
- if(tempList.contains(wd.getId()))
- {
+ if (tempList.contains(wd.getId())) {
continue;
}
- MqttConsumer.publish(2,false,"stealelec", JSON.toJSONString(wd));
+ MqttConsumer.publish(2, false, "stealelec", JSON.toJSONString(wd));
tempList.add(wd.getId());
}
}
diff --git a/src/main/java/com/ard/config/DruidConfig.java b/src/main/java/com/ard/config/DruidConfig.java
deleted file mode 100644
index 70619ee..0000000
--- a/src/main/java/com/ard/config/DruidConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ard.config;
-import com.alibaba.druid.filter.Filter;
-import com.alibaba.druid.filter.stat.StatFilter;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.google.common.collect.Lists;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-/**
- * @Description: druid杩炴帴姹犵殑閰嶇疆,閰嶇疆濡備綍澶勭悊鎱ql锛�
- * @ClassName: DruidConfig
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�07鏈�04鏃�15:29
- * @Version: 1.0
- **/
-
-public class DruidConfig {
- //杩欎釜娉ㄨВ璇诲彇閰嶇疆鏂囦欢鍓嶇紑涓簆refix鐨勯厤缃紝灏嗗閮ㄧ殑閰嶇疆鏂囦欢涓庤繖閲岀粦瀹�
- @ConfigurationProperties(prefix = "spring.datasource.druid")
- //瀹瑰櫒鐨勫紑鍚笌鍏抽棴
-// @Bean(initMethod = "init",destroyMethod = "close")
-// public DruidDataSource dataSource(){
-// DruidDataSource dataSource=new DruidDataSource();
-// dataSource.setProxyFilters(Lists.newArrayList(statFilter()));
-// return dataSource;
-// }
- //bean娉ㄨВ锛屾垚涓簊pring鐨刡ean锛屽埄鐢╢ilter灏嗘參sql鐨勬棩蹇楁墦鍗板嚭鏉�
- @Bean
- public Filter statFilter(){
- StatFilter statFilter=new StatFilter();
- //澶氶暱鏃堕棿瀹氫箟涓烘參sql锛岃繖閲屽畾涔変负5s
- statFilter.setSlowSqlMillis(5000);
- //鏄惁鎵撳嵃鍑烘參鏃ュ織
- statFilter.setLogSlowSql(true);
- //鏄惁灏嗘棩蹇楀悎骞惰捣鏉�
- statFilter.setMergeSql(true);
- return statFilter;
- }
- //杩欐槸閰嶇疆druid鐨勭洃鎺�
- //杩欐槸閰嶇疆druid鐨勭洃鎺т笌閰嶇疆鏂囦欢涓姛鑳戒竴鏍�
- //#stat-view-servlet:
- // #enabled:true
-// @Bean
-// public ServletRegistrationBean servletRegistrationBean(){
-// return new ServletRegistrationBean(new StatViewServlet(),"/druid/*");
-// }
-}
\ No newline at end of file
diff --git a/src/main/java/com/ard/utils/jdbc/Conn.java b/src/main/java/com/ard/utils/jdbc/Conn.java
new file mode 100644
index 0000000..d1d4dd5
--- /dev/null
+++ b/src/main/java/com/ard/utils/jdbc/Conn.java
@@ -0,0 +1,103 @@
+package com.ard.utils.jdbc;
+
+/**
+ * @Description:
+ * @ClassName: GetConn
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�09鏈�19鏃�13:12:38
+ **/
+
+import org.springframework.core.io.ClassPathResource;
+
+import javax.annotation.Resource;
+import java.sql.*;
+import java.util.Properties;
+
+public class Conn {
+ //jdbc杩炴帴闇�瑕佺敤鍒扮殑涓変釜鍙傛暟
+ private String url="jdbc:oracle:thin:@//112.98.126.2:21521/orcl";
+ private String user="c##ard_user";
+ private String pwd="123456";
+
+ //鍒涘缓涓�涓璞� 璁剧疆涓洪潤鎬佺鏈� 锛堝崟渚嬫ā寮忥級
+ private static Conn gc=null;
+
+ //灏嗘瀯閫犲嚱鏁拌涓簆rivate鍨� 闃叉澶栭儴瀹炰緥鍖栧璞� 锛堥�氳繃鍙嶅皠鎴栧弽搴忓垪鍖栧彲浠ョ牬瑙ｅ崟渚嬶級
+ private Conn(){};
+
+ //闈欐�佷唬鐮佸潡锛屽湪绫诲姞杞借繘鍐呭瓨鏃跺氨瀹屾垚瀵瑰璞＄殑鐗规畩鐨勫垵濮嬪寲锛堣繖涓姩浣滃彂鐢熷湪绫荤殑鏋勯�犲櫒鎵ц涔嬪墠锛屼篃灏辨槸鍦ㄦ病鏈夊璞″瓨鍦ㄧ殑鎯呭喌涓嬶紝闈欐�佷唬鐮佸氨宸茬粡瀹屾垚浜嗗瀵硅薄鐨勭壒娈婄殑澶勭悊 锛夛紝姝ゅ鐨勪綔鐢ㄦ槸锛屽綋jdbc鐨勯┍鍔ㄥ櫒鍔犺浇鏃讹紝灏辫嚜鍔ㄥ垱寤轰竴涓嚜宸便��
+ static{
+ try {
+ //娉ㄥ唽椹卞姩
+ Class.forName("oracle.jdbc.driver.OracleDriver");
+ } catch (ClassNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ //鍒ゆ柇GetConn瀹炰緥鍖栫殑瀵硅薄鏄惁瀛樺湪 涓嶅瓨鍦ㄥ氨瀹炰緥鍖栦竴涓�
+ //synchronized 绾跨▼閿� 闃叉澶氫釜绾跨▼鎶㈠崰璧勬簮 闃叉姝婚攣
+ public static Conn getGc(){
+ if(gc==null){
+ synchronized (Conn.class) {
+ if(gc==null){
+ gc=new Conn();
+ }
+ }
+ }
+ return gc;
+ }
+
+ //杩斿洖涓�涓狢onnection杩炴帴
+ public Connection getCon() throws SQLException{
+ return DriverManager.getConnection(url, user, pwd);
+ }
+ //閲婃斁璧勬簮
+ public void closeAll(ResultSet rs, Statement st, Connection con){
+ if(rs!=null){
+ try {
+ rs.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }finally{
+ if(st!=null){
+ try {
+ st.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }finally{
+ if(con!=null){
+ try {
+ con.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ }
+ if(st!=null){
+ try {
+ st.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }finally{
+ if(con!=null){
+ try {
+ con.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ard/utils/jdbc/Query.java b/src/main/java/com/ard/utils/jdbc/Query.java
new file mode 100644
index 0000000..9134a2f
--- /dev/null
+++ b/src/main/java/com/ard/utils/jdbc/Query.java
@@ -0,0 +1,72 @@
+package com.ard.utils.jdbc;
+
+/**
+ * @Description:
+ * @ClassName: Query
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�09鏈�19鏃�13:01:28
+ **/
+
+import com.ard.alarm.digitization.model.DataBridge;
+import lombok.extern.slf4j.Slf4j;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j(topic = "digitization3")
+public class Query {
+ static Connection conn = null;
+ static Statement st = null;
+ static ResultSet rs = null;
+
+ public static List<DataBridge> getAlarmData(Date alarmTime, Integer rowNum) {
+ List<DataBridge> dataBridgeList = new ArrayList<>();
+ try {
+ //1銆佽幏鍙栬繛鎺ュ璞�
+ conn = Conn.getGc().getCon();
+ //2銆佸垱寤簊tatement绫诲璞★紝鐢ㄦ潵鎵цSQL璇彞
+ st = conn.createStatement();
+ //3銆佸垱寤簊ql鏌ヨ璇彞
+ StringBuilder sbd = new StringBuilder();
+ String sql = "select * from (select * from DATABRIDGE order by DB_DATETIME desc ) where 1=1 ";
+ sbd.append(sql);
+ if (rowNum != null) {
+ sbd.append(" and rownum <" + rowNum);
+ }
+ if (alarmTime != null) {
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ String Time = fmt.format(alarmTime);
+ sbd.append(" and DB_DATETIME > to_date('" + Time + "','yyyy/mm/dd hh24:mi:ss')");
+ }
+ //4銆佹墽琛宻ql璇彞骞朵笖鎹㈠洖涓�涓煡璇㈢殑缁撴灉闆�
+ rs = st.executeQuery(sbd.toString());
+ while (rs.next()) { //寰幆閬嶅巻缁撴灉闆�
+ DataBridge dataBridge = new DataBridge();
+ dataBridge.setId(rs.getString("DB_GUID"));
+ dataBridge.setXmmc(rs.getString("DB_XMMC"));
+ dataBridge.setFKey(rs.getString("DB_FKEY"));
+ dataBridge.setFName(rs.getString("DB_FNAME"));
+ dataBridge.setValue(rs.getString("DB_VALUE"));
+ dataBridge.setDateTime(rs.getTimestamp("DB_DATETIME"));
+ dataBridgeList.add(dataBridge);
+ }
+ return dataBridgeList;
+ } catch (Exception e) {
+ log.error("涓夊巶鏁板瓧鍖栨姤璀︽煡璇㈠紓甯�:" + e.getMessage());
+ return dataBridgeList;
+ } finally {
+ try {
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a77be36..ed3593e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,90 +9,26 @@
max-file-size: 30MB
max-request-size: 30MB
datasource:
- dynamic:
- primary: postgres #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�
- strict: false #涓ユ牸鍖归厤鏁版嵁婧�,榛樿false. true鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鎶涘紓甯�,false浣跨敤榛樿鏁版嵁婧�
- druid: # 鍏ㄥ眬druid鍙傛暟锛屽崟鐙暟鎹簮閰嶇疆涓虹┖鏃跺彇鍏ㄥ眬閰嶇疆
- # 杩炴帴姹犵殑閰嶇疆淇℃伅
- # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
- initial-size: 1
- min-idle: 2
- maxActive: 8
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
- poolPreparedStatements: true
- maxPoolPreparedStatementPerConnectionSize: 20
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
- filters: stat,wall,slf4j
- # 閫氳繃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
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰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
- password: 123456
- driver-class-name: oracle.jdbc.driver.OracleDriver
- druid: #閰嶇疆mysql 榛樿杩炴帴姹犲弬鏁�
- # 杩炴帴姹犵殑閰嶇疆淇℃伅
- # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
- initial-size: 3
- min-idle: 3
- maxActive: 8
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 600000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
- poolPreparedStatements: true
- maxPoolPreparedStatementPerConnectionSize: 20
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
- filters: stat,wall,slf4j
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-
+ druid:
+ #寮�鍚痙ruid鐩戞帶web
+ stat-view-servlet:
+ enabled: true
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://192.168.2.15:5432/ry-vue
+ username: postgres
+ password: postgres
+ #鏈�澶ц繛鎺ユ暟
+ maxActive: 30
+ #鏈�灏忚繛鎺ユ暟
+ minIdle: 5
+ #鑾峰彇杩炴帴鐨勬渶澶х瓑寰呮椂闂�
+ maxWait: 10000
+ #瑙ｅ喅mysql8灏忔椂鐨勯棶棰�
+ validation-query: SELECT 'X'
+ #绌洪棽杩炴帴鐨勬鏌ユ椂闂撮棿闅�
+ timeBetweenEvictionRunsMillis: 60000
+ #绌洪棽杩炴帴鏈�灏忕┖闂叉椂闂�
+ minEvictableIdleTimeMillis: 300000
# netty閰嶇疆
netty:
udp:
@@ -112,7 +48,11 @@
enabled: true
# 鐩楃數鎺ュ彛鍦板潃
stealelec:
+ enabled: false
url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil
+ # 涓夊巶鏁板瓧鍖栧湴鍧�
+ digitization3:
+ enabled: true
# minio閰嶇疆
minio:
endpoint: http://192.168.2.15:9001
@@ -126,8 +66,10 @@
logging:
level:
hikSdk: info
- mqtt: debug
- netty: debug
+ mqtt: info
+ netty: info
external: info
camera: info
tube: info
+ digitization3: debug
+ stealAlarm: info
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index c74b5f0..0a5e94c 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -49,8 +49,13 @@
timeout: 100
keepalive: 60
enabled: true
+ # 鐩楃數鎺ュ彛鍦板潃
stealelec:
+ enabled: false
url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil
+ # 涓夊巶鏁板瓧鍖栧湴鍧�
+ digitization3:
+ enabled: false
mybatis:
typeAliasesPackage: com.ard.alarm.**.domain
mapperLocations: classpath:/mapper/*.xml
@@ -60,7 +65,7 @@
logging:
level:
hikSdk: debug
- mqtt: info
+ mqtt: debug
netty: info
external: info
camera: info
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 1278df6..1df85d7 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!--鏃ュ織瀛樻斁璺緞-->
- <property name="log.path" value="./alarmLogs"/>
+ <property name="log.path" value="./logs"/>
<!--鏃ュ織杈撳嚭鏍煎紡-->
<property name="log.pattern" value="%d{HH:mm:ss.SSS}[%thread]%-5level%logger{20}-[%method,%line]-%msg%n"/>
<!--鎺у埗鍙拌緭鍑�-->
@@ -45,14 +45,6 @@
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!--杩囨护鐨勭骇鍒�-->
- <level>INFO</level>
- <!--鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛�-->
- <onMatch>ACCEPT</onMatch>
- <!--涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛�-->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
<!--閫氱敤鍏夌數鎶ヨ鏃ュ織杈撳嚭-->
<appender name="camera" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -67,14 +59,6 @@
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!--杩囨护鐨勭骇鍒�-->
- <level>INFO</level>
- <!--鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛�-->
- <onMatch>ACCEPT</onMatch>
- <!--涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛�-->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
<!--澶栬仈璁惧鎶ヨ鏃ュ織杈撳嚭-->
<appender name="external" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -89,14 +73,6 @@
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!--杩囨护鐨勭骇鍒�-->
- <level>INFO</level>
- <!--鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛�-->
- <onMatch>ACCEPT</onMatch>
- <!--涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛�-->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
<!--Netty鏃ュ織杈撳嚭-->
<appender name="netty" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -111,16 +87,8 @@
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!--杩囨护鐨勭骇鍒�-->
- <level>INFO</level>
- <!--鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛�-->
- <onMatch>ACCEPT</onMatch>
- <!--涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛�-->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
- <!--Mqtt鏃ュ織杈撳嚭-->
+ <!--mqtt鏃ュ織杈撳嚭-->
<appender name="mqtt" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/mqtt.log</file>
<!--寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠�-->
@@ -133,14 +101,6 @@
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!--杩囨护鐨勭骇鍒�-->
- <level>INFO</level>
- <!--鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛�-->
- <onMatch>ACCEPT</onMatch>
- <!--涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛�-->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
<!--hikSdk鏃ュ織杈撳嚭-->
<appender name="hikSdk" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -155,6 +115,33 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
+ <!--stealAlarm鏃ュ織杈撳嚭-->
+ <appender name="stealAlarm" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/stealAlarm.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--鎸夊ぉ鍥炴粴daily-->
+ <fileNamePattern>${log.path}/stealAlarm.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!--鏃ュ織鏈�澶х殑鍘嗗彶60澶�-->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+ <!--digitization3鏃ュ織杈撳嚭-->
+ <appender name="digitization3" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/digitization3.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--鎸夊ぉ鍥炴粴daily-->
+ <fileNamePattern>${log.path}/digitization3.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!--鏃ュ織鏈�澶х殑鍘嗗彶60澶�-->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
<root level="DEBUG">
<appender-ref ref="console"/>
</root>
@@ -162,5 +149,39 @@
<root level="INFO">
<appender-ref ref="sys-info"/>
</root>
+
+ <!--tube鎿嶄綔鏃ュ織-->
+ <logger name="tube" level="INFO">
+ <appender-ref ref="tube"/>
+ </logger>
+ <!--camera鎿嶄綔鏃ュ織-->
+ <logger name="camera" level="INFO">
+ <appender-ref ref="camera"/>
+ </logger>
+ <!--external鎿嶄綔鏃ュ織-->
+ <logger name="external" level="INFO">
+ <appender-ref ref="external"/>
+ </logger>
+ <!--netty鎿嶄綔鏃ュ織-->
+ <logger name="netty" level="INFO">
+ <appender-ref ref="netty"/>
+ </logger>
+ <!--mqtt鎿嶄綔鏃ュ織-->
+ <logger name="mqtt" level="DEBUG">
+ <appender-ref ref="mqtt"/>
+ </logger>
+ <!--hikSdk鎿嶄綔鏃ュ織-->
+ <logger name="hikSdk" level="INFO">
+ <appender-ref ref="hikSdk"/>
+ </logger>
+ <!--digitization3鎿嶄綔鏃ュ織-->
+ <logger name="digitization3" level="INFO">
+ <appender-ref ref="digitization3"/>
+ </logger>
+ <!--stealAlarm鎿嶄綔鏃ュ織-->
+ <logger name="stealAlarm" level="INFO">
+ <appender-ref ref="stealAlarm"/>
+ </logger>
+
</configuration>
--
Gitblit v1.9.3