pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ard/config/DruidConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/GeneratorMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -65,6 +65,13 @@ <artifactId>mybatis-spring-boot-starter</artifactId> <version>2.2.2</version> </dependency> <!--Oracle jdbc--> <!--è¿é注æï¼æäºojdbcççæ¬ä¸æ¯æjdk1.8ï¼éå°è¿ï¼ç½ä¸è¯´è¿ä¸ªojdbc8æ¯æï¼æä»¥è¿é使ç¨å®--> <dependency> <groupId>com.oracle.ojdbc</groupId> <artifactId>ojdbc8</artifactId> <version>19.3.0.0</version> </dependency> <!--minioä¾èµ--> <dependency> <groupId>io.minio</groupId> @@ -86,6 +93,12 @@ <groupId>com.alibaba</groupId> <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> @@ -124,6 +137,17 @@ </buildArgs> </configuration> </plugin> <plugin> <groupId>org.mybatis.generator</groupId> <artifactId>mybatis-generator-maven-plugin</artifactId> <version>1.4.1</version> <configuration> <!--é ç½®æä»¶ä½ç½®--> <configurationFile>src/main/resources/GeneratorMapper.xml</configurationFile> <verbose>true</verbose> <overwrite>true</overwrite> </configuration> </plugin> </plugins> </build> src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java
@@ -20,6 +20,7 @@ public class ArdAlarmApponekeyController { @Resource private IArdAlarmApponekeyService ardAlarmApponekeyService; /** * æ°å¢appä¸é®æ¥è¦ */ src/main/java/com/ard/alarm/camera/mapper/ArdCamerasMapper.java
@@ -2,6 +2,7 @@ import java.util.List; import com.ard.alarm.camera.domain.ArdCameras; import com.baomidou.dynamic.datasource.annotation.DS; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +12,7 @@ * @date 2023-02-11 */ @Mapper @DS("postgres") public interface ArdCamerasMapper { /** src/main/java/com/ard/alarm/digitization/controller/DatabridgeController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,30 @@ package com.ard.alarm.digitization.controller; import com.ard.alarm.digitization.mapper.DatabridgeMapper; import com.ard.alarm.digitization.model.Databridge; import com.ard.utils.http.AjaxResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * @ClassName DatabridgeController * @Description: * @Author åèä¹ * @Date 2023/9/17 23:11 * @Version 1.0 */ @RestController @RequestMapping("/alarm/digitization") public class DatabridgeController { @Resource DatabridgeMapper databridgeMapper; @GetMapping("/list") public AjaxResult list(Databridge databridge) { return AjaxResult.success(databridgeMapper.selectDatabridgeList(databridge)); } } src/main/java/com/ard/alarm/external/mapper/ArdEquipExternalMapper.java
@@ -2,6 +2,7 @@ import java.util.List; import com.ard.alarm.external.domain.ArdEquipExternal; import com.baomidou.dynamic.datasource.annotation.DS; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,7 @@ * @date 2023-03-13 */ @Mapper @DS("postgres") public interface ArdEquipExternalMapper { /** src/main/java/com/ard/alarm/radar/mapper/ArdEquipRadarMapper.java
@@ -2,6 +2,7 @@ import java.util.List; import com.ard.alarm.radar.domain.ArdEquipRadar; import com.baomidou.dynamic.datasource.annotation.DS; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +12,7 @@ * @date 2023-03-11 */ @Mapper @DS("postgres") public interface ArdEquipRadarMapper { /** src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
@@ -39,7 +39,7 @@ * @ä¿®æ¹äººåå ¶å®ä¿¡æ¯ */ @Async("alarm") @Scheduled(cron="0/5 * * * * ?") // @Scheduled(cron="0/5 * * * * ?") public void alarmHandler() { try { String allAlarmData = restTemplate.getForObject(stealElecUrl, String.class); src/main/java/com/ard/config/DruidConfig.java
@@ -15,17 +15,17 @@ * @Date: 2023å¹´07æ04æ¥15:29 * @Version: 1.0 **/ @Configuration public class DruidConfig { //è¿ä¸ªæ³¨è§£è¯»åé ç½®æä»¶åç¼ä¸ºprefixçé ç½®ï¼å°å¤é¨çé ç½®æä»¶ä¸è¿éç»å® @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(initMethod = "init",destroyMethod = "close") // public DruidDataSource dataSource(){ // DruidDataSource dataSource=new DruidDataSource(); // dataSource.setProxyFilters(Lists.newArrayList(statFilter())); // return dataSource; // } //beanæ³¨è§£ï¼æä¸ºspringçbeanï¼å©ç¨filterå°æ ¢sqlçæ¥å¿æå°åºæ¥ @Bean public Filter statFilter(){ src/main/resources/GeneratorMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,57 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd"> <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"/> <!-- é ç½® table 表信æ¯å 容ä½ï¼targetRuntime æå®éç¨ MyBatis3 ççæ¬ --> <context id="tables" targetRuntime="MyBatis3"> <!-- æå¶çææ³¨éï¼ç±äºçæç注é齿¯è±æçï¼å¯ä»¥ä¸è®©å®çæ --> <commentGenerator> <property name="suppressAllComments" value="true"/> </commentGenerator> <!-- é ç½®æ°æ®åºè¿æ¥ä¿¡æ¯ --> <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@//112.98.126.2:21521/orcl" userId="c##ard_user" password="123456"> </jdbcConnection> <!-- çæ model ç±»ï¼targetPackage æå® model ç±»çå åï¼ targetProject æå® çæç model æ¾å¨ eclipse çåªä¸ªå·¥ç¨ä¸é¢--> <javaModelGenerator targetPackage="com.ard.alarm.digitization.model" targetProject="src/main/java"> <property name="enableSubPackages" value="false"/> <property name="trimStrings" value="false"/> </javaModelGenerator> <!-- çæ MyBatis ç Mapper.xml æä»¶ï¼targetPackage æå® mapper.xml æä»¶ç å åï¼ targetProject æå®çæç mapper.xml æ¾å¨ eclipse çåªä¸ªå·¥ç¨ä¸é¢ --> <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"> <property name="enableSubPackages" value="false"/> </sqlMapGenerator> <!-- çæ MyBatis ç Mapper æ¥å£ç±»æä»¶,targetPackage æå® Mapper æ¥å£ç±»çå åï¼ targetProject æå®çæç Mapper æ¥å£æ¾å¨ eclipse çåªä¸ªå·¥ç¨ä¸é¢ --> <javaClientGenerator type="XMLMAPPER" targetPackage="com.ard.alarm.digitization.mapper" targetProject="src/main/java"> <property name="enableSubPackages" value="false"/> </javaClientGenerator> <!-- æ°æ®åºè¡¨åå对åºç Java 模åç±»å --> <table tableName="DATABRIDGE" domainObjectName="Databridge" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"> <!--使ç¨å®é çåæ®µå--> <property name="useActualColumnNames" value="true"/> <columnOverride column="DB_GUID" property="id"/> <columnOverride column="DB_XMMC" property="xmmc"/> <columnOverride column="DB_FKEY" property="fKey"/> <columnOverride column="DB_FNAME" property="fName"/> <columnOverride column="DB_VALUE" property="value"/> <columnOverride column="DB_DATETIME" property="dateTime"/> </table> </context> </generatorConfiguration> src/main/resources/application-dev.yml
@@ -9,37 +9,100 @@ max-file-size: 30MB max-request-size: 30MB datasource: # 使ç¨druidæ°æ®åºè¿æ¥æ± druid: #å¼å¯druidçæ§web stat-view-servlet: enabled: true driver-class-name: org.postgresql.Driver url: jdbc:postgresql://192.168.1.15:5432/ry-vue?stringtype=unspecified username: postgres password: postgres #æå¤§è¿æ¥æ° maxActive: 30 #æå°è¿æ¥æ° minIdle: 5 #è·åè¿æ¥çæå¤§çå¾ æ¶é´ maxWait: 10000 #è§£å³mysql8å°æ¶çé®é¢ validation-query: SELECT 'X' #空é²è¿æ¥çæ£æ¥æ¶é´é´é timeBetweenEvictionRunsMillis: 60000 #空é²è¿æ¥æå°ç©ºé²æ¶é´ minEvictableIdleTimeMillis: 300000 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 # é ç½®çæ§ç»è®¡æ¦æªçfiltersï¼å»æåçæ§çé¢sqlæ æ³ç»è®¡ï¼'wall'ç¨äºé²ç«å¢ filters: stat,wall,slf4j # éè¿connectProperties屿§æ¥æå¼mergeSqlåè½ï¼æ ¢SQLè®°å½ connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: 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 # é ç½®çæ§ç»è®¡æ¦æªçfiltersï¼å»æåçæ§çé¢sqlæ æ³ç»è®¡ï¼'wall'ç¨äºé²ç«å¢ 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: udp: port: 40000 enabled: true tcp: enabled: true enabled: false # mqtté ç½® mqtt: host: tcp://192.168.1.15:1883 host: tcp://192.168.1.55:1883 clientId: cc3 username: admin password: xzx12345 @@ -62,8 +125,8 @@ # æ¥å¿ç级é ç½® logging: level: hikSdk: debug mqtt: info hikSdk: info mqtt: debug netty: info external: info camera: info src/main/resources/application.yml
@@ -1,4 +1,4 @@ spring: profiles: active: prod active: dev