From 71c283248325a343170b6befc64afb4a0e4fe1da Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 19 八月 2025 11:02:57 +0800
Subject: [PATCH] 增加本地日志
---
/dev/null | 43 --------
blade-service/blade-mdm/src/test/java/org/springblade/mdm/utils/CustomBinaryReaderTest.java | 3
blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java | 40 ++++++--
blade-service/blade-mdm/src/main/resources/log/logback-dev.xml | 155 ++++++------------------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTest2Controller.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java | 6
7 files changed, 73 insertions(+), 180 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
index 3c10f6f..a14df6a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
@@ -5,12 +5,16 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricActivityInstance;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
@@ -27,6 +31,8 @@
import java.io.OutputStream;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.*;
/**
@@ -42,6 +48,7 @@
private final ApproveRecordService approveRecordService;
private final NcNodeService ncNodeService;
private final MachineService machineService;
+ private final HistoryService historyService;
private static final String UNCHECK_BOX = "鈽�";
private static final String CHECKED_BOX = "鈽�";
static Chunk square = new Chunk("o", new Font(Font.FontFamily.ZAPFDINGBATS, 12)); // 绌烘柟妗�
@@ -69,11 +76,17 @@
List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getProcessInstanceId, processInstanceId).orderByAsc(ApproveRecord::getCreateTime).list();
for(int i=0;i<records.size();i++){
+
ApproveRecord record = records.get(i);
if(record.getNcNodeId() ==null){
- continue;
+ //continue;
}
- printStep(document,bfChinese,record);
+
+ HistoricProcessInstance ins = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
+ List<HistoricActivityInstance> activitiys = historyService.createHistoricActivityInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .list();
+ printStep(document,bfChinese,record,ins);
if(i<records.size()-1){
document.newPage();
}
@@ -82,12 +95,16 @@
document.close();
}
- void printStep(Document document,BaseFont bfChinese,ApproveRecord record) throws DocumentException, IOException {
+ void printStep(Document document,BaseFont bfChinese,ApproveRecord record,HistoricProcessInstance ins) throws DocumentException, IOException {
NcNode programPackageNode;
Machine machine;
+ Map<String,Object> vars = ins.getProcessVariables();
+ //activitiy.stream().filter(HistoricActivityInstance::get)
if(record.getNcNodeId() !=null ) {
- programPackageNode = ncNodeService.getById(record.getNcNodeId());
- machine = machineService.getByCode(programPackageNode.getMachineCode());
+ //programPackageNode = ncNodeService.getById(record.getNcNodeId());
+ String machineCode = String.valueOf(vars.get(FlowContants.MACHINE_CODE));
+ //machine = machineService.getByCode(programPackageNode.getMachineCode());
+ machine = machineService.getByCode(machineCode);
}else{
programPackageNode = new NcNode();
machine = new Machine();
@@ -124,10 +141,12 @@
//PdfPCell cell12 = new PdfPCell();
//cell12.setColspan(2);
//cell12.addElement(new Phrase(ncProgram.getDrawingNo()));
- table.addCell(getCell(programPackageNode.getDrawingNo(),ft));//闆剁粍浠跺彿
-
- table.addCell(getCell(programPackageNode.getProcessNo(),ft));//宸ュ簭鍙�
- table.addCell(getCell(programPackageNode.getCraftEdition(),ft));//宸ヨ壓鐗堟
+ String drawingNo = vars.get(FlowContants.DRAWING_NO)+"";
+ table.addCell(getCell(drawingNo,ft));//闆剁粍浠跺彿
+ String processNo = vars.get(FlowContants.PROCESS_NO)+"";
+ table.addCell(getCell(processNo,ft));//宸ュ簭鍙�
+ String craftEdition = vars.get(FlowContants.CRAFT_EDITION)+"";
+ table.addCell(getCell(craftEdition,ft));//宸ヨ壓鐗堟
table.addCell(getCell(machine.getName(),ft));//鏈哄簥鍨嬪彿
table.addCell("");//璐熻矗浜猴紝宸ユ璐熻矗浜烘淳鍑烘椂闂�
@@ -210,7 +229,8 @@
PdfPCell cell2 = new PdfPCell();
cell2.setColspan(2);
- cell2.addElement(new Phrase(programPackageNode.getProgramNo(),ft));//鏁版帶绋嬪簭缂栧彿
+ //cell2.addElement(new Phrase(programPackageNode.getProgramNo(),ft));//鏁版帶绋嬪簭缂栧彿
+ cell2.addElement(new Phrase("00001",ft));
table.addCell(cell2);
String pDateStr = " ";
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTest2Controller.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTest2Controller.java
index 12b5447..98fcd3c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTest2Controller.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTest2Controller.java
@@ -4,6 +4,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
+import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
@@ -33,10 +34,11 @@
@Autowired
private IDictBizClient bizDictClient;
+ @ApiLog
@GetMapping("/dict-biz")
@Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
public R<List<DictBiz>> giz(String code) throws IOException {
-
+ log.info("pure涓殑鏃ュ織");
return this.bizDictClient.getList(code);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
index 5d0d65d..d878699 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
@@ -96,10 +96,10 @@
}
@GetMapping("/dict-biz")
- @Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
+ @Operation(summary = "biz", description = "test鎵弿")
public R<List<DictBiz>> giz(String code) throws IOException {
-
- return this.bizDictClient.getList(code);
+ log.info("mytset涓殑鏃ュ織");
+ return this.bizDictClient.getList (code);
}
}
diff --git a/blade-service/blade-mdm/src/main/resources/log/logback-dev.xml b/blade-service/blade-mdm/src/main/resources/log/logback-dev.xml
index 58a6e3f..d7987bd 100644
--- a/blade-service/blade-mdm/src/main/resources/log/logback-dev.xml
+++ b/blade-service/blade-mdm/src/main/resources/log/logback-dev.xml
@@ -1,140 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds">
- <!--鍖呭惈etl tool 鐨刲ogback鏂囦欢-->
- <include resource="logback/logback.xml"/>
+ <!-- 鏃ュ織鏂囦欢杈撳嚭鐩綍 -->
+ <property name="LOG_DIR" value="D:/mdmnew/devlogs" />
+ <property name="APP_NAME" value="mdm-appdev" />
- <!-- 鑷畾涔夊弬鏁扮洃鍚� -->
- <contextListener class="org.springblade.core.log.listener.LoggerStartupListener"/>
- <springProperty scope="context" name="springAppName" source="spring.application.name"/>
-
- <!-- 褰╄壊鏃ュ織渚濊禆鐨勬覆鏌撶被 -->
- <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
- <conversionRule conversionWord="wex"
- converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
- <conversionRule conversionWord="wEx"
- converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
- <!-- 褰╄壊鏃ュ織鏍煎紡 -->
- <property name="CONSOLE_LOG_PATTERN"
- value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>${CONSOLE_LOG_PATTERN}</pattern>
- <charset>utf8</charset>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg%n</pattern>
</encoder>
</appender>
+
+ <!-- 涓绘棩蹇楁枃浠� -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_FILE}</file>
+ <file>${LOG_DIR}/${APP_NAME}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_DIR}/${APP_NAME}.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
- <!-- 婊氬姩绛栫暐 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!-- 鎸夋棩鏈熷拰澶у皬婊氬姩 -->
- <fileNamePattern>${LOG_PATH}/mdm-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <!-- 鍗曚釜鏂囦欢鏈�澶уぇ灏� -->
- <maxFileSize>100MB</maxFileSize>
- <!-- 淇濈暀鏈�澶�30澶╃殑鏃ュ織 -->
- <maxHistory>30</maxHistory>
- <!-- 鎵�鏈夋棩蹇楁枃浠舵�诲ぇ灏忛檺鍒� -->
- <totalSizeCap>2GB</totalSizeCap>
- </rollingPolicy>
</appender>
- <if condition='property("ELK_MODE").toUpperCase().contains("TRUE")'>
- <then>
- <!-- 鎺ㄩ�佹棩蹇楄嚦elk -->
- <appender name="STDOUT_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
- <destination>${DESTINATION}</destination>
- <!-- 鏃ュ織杈撳嚭缂栫爜 -->
- <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
- <providers>
- <timestamp>
- <timeZone>UTC</timeZone>
- </timestamp>
- <pattern>
- <pattern>
- {
- "traceId": "%X{traceId}",
- "requestId": "%X{requestId}",
- "accountId": "%X{accountId}",
- "tenantId": "%X{tenantId}",
- "logLevel": "%level",
- "serviceName": "${springAppName:-SpringApp}",
- "pid": "${PID:-}",
- "thread": "%thread",
- "class": "%logger{40}",
- "line":"%L",
- "message": "%message"
- }
- </pattern>
- </pattern>
- <mdc/>
- <stackTrace/>
- </providers>
- </encoder>
- </appender>
- </then>
- </if>
- <!-- 鏃ュ織杈撳嚭绾у埆 -->
+ <!-- 涓撻棬璁板綍org.springblade.mdm鍖呯殑鏃ュ織 -->
+ <appender name="MDM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${LOG_DIR}/mdmdev-core.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_DIR}/mdm-coredev.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 鏍规棩蹇楃骇鍒� -->
<root level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="FILE"/>
-
- <appender-ref ref="${STDOUT_APPENDER}"/>
+ <appender-ref ref="CONSOLE" />
+ <appender-ref ref="FILE" />
</root>
- <logger name="net.sf.ehcache" level="INFO"/>
- <logger name="druid.sql" level="INFO"/>
-
-
- <!-- MyBatis log configure -->
- <logger name="com.apache.ibatis" level="INFO"/>
- <logger name="org.mybatis.spring" level="INFO"/>
- <logger name="java.sql.Connection" level="INFO"/>
- <logger name="java.sql.Statement" level="INFO"/>
- <logger name="java.sql.PreparedStatement" level="INFO"/>
-
- <!-- 鍑忓皯閮ㄥ垎debug鏃ュ織 -->
- <logger name="druid.sql" level="INFO"/>
- <logger name="org.apache.shiro" level="INFO"/>
- <logger name="org.mybatis.spring" level="INFO"/>
- <logger name="org.springframework" level="INFO"/>
- <logger name="org.springframework.context" level="WARN"/>
- <logger name="org.springframework.beans" level="WARN"/>
- <logger name="com.baomidou.mybatisplus" level="INFO"/>
- <logger name="org.apache.ibatis.io" level="INFO"/>
- <logger name="org.apache.velocity" level="INFO"/>
- <logger name="org.eclipse.jetty" level="INFO"/>
- <logger name="io.undertow" level="INFO"/>
- <logger name="org.xnio.nio" level="INFO"/>
- <logger name="org.thymeleaf" level="INFO"/>
- <logger name="springfox.documentation" level="INFO"/>
- <logger name="org.hibernate.validator" level="INFO"/>
- <logger name="com.netflix.loadbalancer" level="INFO"/>
- <logger name="com.netflix.hystrix" level="INFO"/>
- <logger name="com.netflix.zuul" level="INFO"/>
- <logger name="de.codecentric" level="INFO"/>
- <!-- cache INFO -->
- <logger name="net.sf.ehcache" level="INFO"/>
- <logger name="org.springframework.cache" level="INFO"/>
- <!-- cloud -->
- <logger name="org.apache.http" level="INFO"/>
- <logger name="com.netflix.discovery" level="INFO"/>
- <logger name="com.netflix.eureka" level="INFO"/>
- <!-- 涓氬姟鏃ュ織 -->
- <Logger name="org.springblade.mdm" level="INFO"/>
- <Logger name="org.springblade.core.tenant" level="INFO"/>
- <Logger name="org.springblade.core.version" level="INFO"/>
-
- <!-- 鍑忓皯nacos鏃ュ織 -->
- <logger name="com.alibaba.nacos" level="ERROR"/>
-
-
-
- <logger name="RocketmqClient" additivity="false">
- <level value="ERROR" />
- <appender-ref ref="STDOUT"/>
+ <!-- 涓撻棬閰嶇疆org.springblade.mdm鍖呯殑鏃ュ織 -->
+ <logger name="org.springblade.mdm" level="DEBUG" additivity="false">
+ <appender-ref ref="MDM_FILE" />
+ <appender-ref ref="CONSOLE" />
</logger>
</configuration>
diff --git a/blade-service/blade-mdm/src/main/resources/logback-spring.xml b/blade-service/blade-mdm/src/main/resources/logback-spring.xml
deleted file mode 100644
index 50ace4e..0000000
--- a/blade-service/blade-mdm/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-
- <!-- 瀹氫箟搴旂敤鍚嶇О锛岀敤浜庢棩蹇楁枃浠跺悕 -->
- <property name="APP_NAME" value="mdm"/>
-
- <!-- 瀹氫箟鏃ュ織鏂囦欢瀛樺偍璺緞 -->
- <property name="LOG_PATH" value="d:/mdmnew/logs/${APP_NAME}"/>
- <property name="LOG_FILE" value="${LOG_PATH}/mdm.log"/>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
- <!-- 鏂囦欢杈撳嚭appender -->
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_FILE}</file>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- <!-- 婊氬姩绛栫暐 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!-- 鎸夋棩鏈熷拰澶у皬婊氬姩 -->
- <fileNamePattern>${LOG_PATH}/mdm-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <!-- 鍗曚釜鏂囦欢鏈�澶уぇ灏� -->
- <maxFileSize>100MB</maxFileSize>
- <!-- 淇濈暀鏈�澶�30澶╃殑鏃ュ織 -->
- <maxHistory>30</maxHistory>
- <!-- 鎵�鏈夋棩蹇楁枃浠舵�诲ぇ灏忛檺鍒� -->
- <totalSizeCap>2GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <!-- 璁剧疆鏃ュ織绾у埆 -->
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-<!--
- <logger name="org.spingblade.mdm" level="INFO"/>-->
-</configuration>
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java
index df464e0..beb3b56 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java
@@ -11,7 +11,7 @@
public class ApproveTableServiceTest {
@Test
public void test(){
- ApproveTableService s = new ApproveTableService(null,null,null,null);
+ ApproveTableService s = new ApproveTableService(null,null,null,null,null);
try {
//s.exportApproveTable("1",new FileOutputStream("d:/t.pdf"));
} catch (Exception e) {
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/utils/CustomBinaryReaderTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/utils/CustomBinaryReaderTest.java
index a2b9f7b..4867562 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/utils/CustomBinaryReaderTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/utils/CustomBinaryReaderTest.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.utils;
import org.junit.jupiter.api.Test;
+import org.springblade.core.log.listener.LoggerStartupListener;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -13,5 +14,7 @@
FileOutputStream fos = new FileOutputStream("d:/ddddreadout.zip");
CustomBinaryReader.read(fis,fos);
+
+ LoggerStartupListener j;
}
}
--
Gitblit v1.9.3