bf

yiming
1 parent 5370daa9
Showing 5 changed files with 83 additions and 34 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/application-druid.yml
bsthLineProfiles/src/main/resources/application.yml
bsthLineProfiles/src/main/resources/logback.xml
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
@@ -308,21 +308,26 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	@Override
 	public void sendKFK(BsthTLineKFK bsthTLine){
-		Map<String, Object> map = new HashMap<>();
-		map.put("datatype", "PDGJ_XLDA");
-		map.put("datas", bsthTLine);
-		JSON j=new cn.hutool.json.JSONObject(map);
-		String json =j.toString();
-		ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("XLJC", json);
-		future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-			@Override
-			public void onSuccess(SendResult<String, String> result) {
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				logger.error("kafka发送线路数据异常", ex);
-			}
-		});
+		try {
+			Map<String, Object> map = new HashMap<>();
+			map.put("datatype", "XLJC");
+			map.put("datas", bsthTLine);
+			JSON j=new cn.hutool.json.JSONObject(map);
+			String json =j.toString();
+			ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("PDGJ_XLDA", json);
+			future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
+				@Override
+				public void onSuccess(SendResult<String, String> result) {
+				}
+				@Override
+				public void onFailure(Throwable ex) {
+					logger.error("kafka发送线路数据异常", ex);
+				}
+			});
+		} catch (Exception e) {
+			System.out.println("111");
+			e.printStackTrace();
+		}
 	}
 	@Override
@@ -5,15 +5,15 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.101.111:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: xldasys
+                password: bsth@pj2021
+            # 主库数据源
 #            master:
-#                url: jdbc:mysql://localhost:3306/linedata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
-#                password: Aa123456
-            # 主库数据源
-            master:
-                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: 1995627a
+#                password: 1995627a
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -102,6 +102,19 @@ spring:
     # 令牌有效期（默认30分钟）
     expireTime: 30
+  kafka:
+    bootstrap-servers: 47.106.82.232:9092
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+      buffer-memory: 33554432
+      acks: all
+    consumer:
+      enable-auto-commit: true
+      group-id: test
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+
 # MyBatis
 mybatis:
   # 搜索指定包别名
@@ -179,15 +192,4 @@ gen:
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
   tablePrefix: sys_
-kafka:
-  bootstrap-servers: 47.106.82.232:9092
-  producer:
-    key-serializer: org.apache.kafka.common.serialization.StringSerializer
-    value-serializer: org.apache.kafka.common.serialization.StringSerializer
-    buffer-memory: 33554432
-    acks: all
-  consumer:
-    enable-auto-commit: true
-    group-id: test
-    key-serializer: org.apache.kafka.common.serialization.StringSerializer
-    value-serializer: org.apache.kafka.common.serialization.StringSerializer
+
@@ -34,6 +34,29 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-debug.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>DEBUG</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
@@ -379,6 +379,11 @@
 			yes: function () {
 				var url=prefix+'/examine'
 				var data={'id':id,'examineType':examineType,'examineStatus':'2'}
+				layer.msg('正在处理中，请稍后...', {
+					icon: 16
+					,shade: 0.3
+					,time: false
+				});
 				$.post(url, data, function(result) {
 					if (result.code == web_status.SUCCESS) {
 						$.modal.closeAll();
@@ -392,6 +397,11 @@
 			btn2:function () {
 				var url=prefix+'/examine'
 				var data={'id':id,'examineType':examineType,'examineStatus':'3'}
+				layer.msg('正在处理中，请稍后...', {
+					icon: 16
+					,shade: 0.3
+					,time: false
+				});
 				$.post(url, data, function(result) {
 					if (result.code == web_status.SUCCESS) {
 						$.table.refresh();
@@ -404,6 +414,15 @@
 		});
 		layer.full(index);
 	}
+		/*beforeSend: function () {
+			$.modal.loading("正在处理中，请稍后...");
+		},
+		success: function(result) {
+			if (typeof callback == "function") {
+				callback(result);
+			}
+			$.operate.ajaxSuccess(result);
+		}*/
 	$("input[name='createTimeStr']").datetimepicker({
 		format: "yyyy-mm-dd",