소스 검색

修改为普通springboot服务

zhangqiankun 3 년 전
부모
커밋
1393f71306

+ 2 - 2
pom.xml

@@ -47,10 +47,10 @@
 	<!-- 服务依赖 -->
 	<dependencies>
 		<!-- 依赖集成自定义jar -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-config-client</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-db-spring-boot-starter</artifactId>

+ 1 - 4
src/main/java/com/persagy/transfer/handle/WDRwdObjectTransferHandler.java

@@ -172,10 +172,7 @@ public class WDRwdObjectTransferHandler {
     	for (WdfacilityRelPersagy wdfacilityRelPersagy : wdfacilityRelList) {
 			try {
 				// 保证一个信息点的异常,不影响其余信息点的录入
-				result = this.hydomcAssetspecService.saveHydomcAssetspec(wdfacilityRelPersagy, rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
-				if (!result) {
-					log.warn("万达设备参数信息从表数据同步失败,本方对象ID:{}, 项目ID:{}, 信息点编码:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId(), wdfacilityRelPersagy.getCode());
-				}
+				this.hydomcAssetspecService.saveHydomcAssetspec(wdfacilityRelPersagy, rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
 			} catch (Exception e) {
 				log.error("万达设备参数信息从表数据同步失败,本方对象ID:{}, 项目ID:{}, 信息点编码:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId(), wdfacilityRelPersagy.getCode());
 				log.error("失败原因", e);

+ 9 - 8
src/main/java/com/persagy/transfer/task/SycnEquDataToWdTask.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import com.persagy.transfer.service.IPersagyDbService;
+import com.persagy.transfer.handle.WDRwdObjectTransferHandler;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -17,22 +17,23 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 public class SycnEquDataToWdTask {
 
-    private int times;
-
-    @Autowired
-    private IPersagyDbService persagyDbService;
+    //@Autowired
+    //private IPersagyDbService persagyDbService;
+	
+	@Autowired
+	private WDRwdObjectTransferHandler rwdObjectTransferHandler;
 
     /**
      * 数据同步逻辑
      */
     @Scheduled(cron = "${sync.rwd-object.to-wd:0 0/1 * * * ?}")
     public void execute() {
-        log.debug("定时任务:开始同步设备信息到万达数据库,类限定名:com.persagy.transfer.task.SycnEquDataToWdTask,thread id:{},FixedPrintTask execute times:{}", Thread.currentThread().getId(), ++times);
+        log.info("定时任务:开始同步设备信息到万达中间表");
         try {
-            this.persagyDbService.syncData2WD();
+        	this.rwdObjectTransferHandler.syncRwdObject2WD();
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("定时任务:同步设备信息到万达数据库处理失败,类限定名:com.persagy.transfer.task.SycnEquDataToWdTask,thread id:{},msg:{},error:{}", Thread.currentThread().getId(), e.getMessage(), e.getStackTrace());
+            log.error("定时任务:同步设备信息到万达中间表处理失败", e);
         }
     }
 }

+ 17 - 12
src/main/resources/bootstrap.yml

@@ -1,6 +1,17 @@
 server:
   port: ${SERVER_PORT:8864}
 
+# 默认日志级别
+logback:
+  level: ${LOGBACK_LEVEL:INFO}
+  filesize: ${LOGBACK_FILESIZE:50MB}
+  totalsize: ${LOGBACK_TOTALSIZE:10GB}
+  filemaxday: ${LOGBACK_FILEMAXDAY:30}
+# mysql语句打印
+#logging:
+#  level:
+#    com.persagy: DEBUG
+
 spring: 
   application:
     name: ibms-switch
@@ -11,12 +22,9 @@ spring:
       strict: true   #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master_1:
-          url: jdbc:mysql://192.168.64.15:9934/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://192.168.18.105:3306/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://127.0.0.1:3306/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-          username: root
-          password: D56dLvRbSy5bMn
-#          password: 123456
+          url: jdbc:mysql://${MASTER_DATASOURCE_IP:192.168.64.15}:${MASTER_DATASOURCE_PORT:9934}/${MASTER_DATASOURCE_DATABASE:dmp_rwd}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          username: ${MASTER_DATASOURCE_USERNAME:root}
+          password: ${MASTER_DATASOURCE_USERNAME:D56dLvRbSy5bMn}
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: 
@@ -36,12 +44,9 @@ spring:
             time-between-eviction-runs-millis: 50000
             max-pool-prepared-statement-per-connection-size: 20  
         master_2:
-          url: jdbc:mysql://192.168.64.15:9934/ibms-switch?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://192.168.18.105:3306/fakewd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://127.0.0.1:3306/fakewd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-          username: root
-          password: D56dLvRbSy5bMn
-#          password: 123456
+          url: jdbc:mysql://${SLAVE_DATASOURCE_IP:192.168.64.15}:${SLAVE_DATASOURCE_PORT:9934}/${SLAVE_DATASOURCE_DATABASE:ibms-switch}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          username: ${SLAVE_DATASOURCE_USERNAME:root}
+          password: ${SLAVE_DATASOURCE_USERNAME:D56dLvRbSy5bMn}
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: