diff --git a/src/main/java/com/bonus/emergencyrap/mapper/LogsMapper.java b/src/main/java/com/bonus/emergencyrap/mapper/LogsMapper.java
new file mode 100644
index 0000000..f2b18b1
--- /dev/null
+++ b/src/main/java/com/bonus/emergencyrap/mapper/LogsMapper.java
@@ -0,0 +1,14 @@
+package com.bonus.emergencyrap.mapper;
+
+import com.bonus.emergencyrap.vo.TaskMessageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LogsMapper {
+
+ /**
+ * 添加日志数据
+ * @param logs
+ */
+ void addLogs(TaskMessageVo logs);
+}
diff --git a/src/main/java/com/bonus/emergencyrap/service/LogsUtils.java b/src/main/java/com/bonus/emergencyrap/service/LogsUtils.java
index 4113b71..3135589 100644
--- a/src/main/java/com/bonus/emergencyrap/service/LogsUtils.java
+++ b/src/main/java/com/bonus/emergencyrap/service/LogsUtils.java
@@ -2,6 +2,7 @@ package com.bonus.emergencyrap.service;
import com.alibaba.fastjson2.JSON;
import com.bonus.emergencyrap.constant.TextConstants;
+import com.bonus.emergencyrap.mapper.LogsMapper;
import com.bonus.emergencyrap.utils.DateTimeHelper;
import com.bonus.emergencyrap.utils.TextFileUtils;
import com.bonus.emergencyrap.utils.UploadFile;
@@ -9,6 +10,7 @@ import com.bonus.emergencyrap.vo.TaskMessageVo;
import com.bonus.emergencyrap.vo.TaskProcessVo;
import com.bonus.emergencyrap.vo.TaskVo;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@@ -17,48 +19,36 @@ import java.util.UUID;
@Slf4j
public class LogsUtils {
+ @Autowired
+ private LogsMapper mapper;
+
+ public final static String SUCCESS="1";
+
+ public final static String FAIL="0";
/**
* 执行日志添加
* @param vo
* @param processVo
- * @param success
+ * @param success 1成功 2失败
* @param message
*/
public void addLogs(TaskVo vo, TaskProcessVo processVo,String success,String message) {
try{
- String day=DateTimeHelper.getNowYMD();
- String filePtah= UploadFile.getFilePath(TextConstants.LOGS+day);
- boolean isCz=TextFileUtils.exists(filePtah);
TaskMessageVo logs=new TaskMessageVo();
- String uuid=UUID.randomUUID().toString();
logs.setTaskId(vo.getTaskId());
- logs.setId(uuid);
- logs.setTaskName(vo.getTaskName());
- logs.setDay(day);
+ logs.setId(UUID.randomUUID().toString());
logs.setCreateTime(DateTimeHelper.getNowTime());
+ //记录失败的 操作元素
+ if(FAIL.equals(success)){
+ logs.setErrId(processVo.getId());
+ }
+ logs.setStatus(success);
logs.setMessage(message);
- appendToFile(filePtah, JSON.toJSONString(logs),uuid,!isCz);
+ mapper.addLogs(logs);
}catch (Exception e){
log.error(e.getMessage(),e);
}
}
- /**
- * 添加数据
- * @param filePath
- * @param content
- * @param id
- * @param append
- */
- public void appendToFile(String filePath,String content,String id,boolean append){
- if(append){
- TextFileUtils.createFile(filePath);
- }else{
- TextFileUtils.appendToFile(filePath,"\n");
- }
- TextFileUtils.appendToFile(filePath,id);
- TextFileUtils.appendToFile(filePath,"=");
- TextFileUtils.appendToFile(filePath,content);
- }
}
diff --git a/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java b/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java
index 7486b10..600200f 100644
--- a/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java
+++ b/src/main/java/com/bonus/emergencyrap/vo/TaskProcessVo.java
@@ -4,9 +4,13 @@ import lombok.Data;
@Data
public class TaskProcessVo {
-
+ /**
+ * 任务id
+ */
private String taskId;
-
+ /**
+ * id
+ */
private String id;
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a17489..b03633e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,9 +21,7 @@ server:
# 日志配置
logging:
- level:
- com.bonus: debug
- org.springframework: warn
+ config: classpath:logback-spring.xml
# Spring配置
@@ -75,6 +73,7 @@ task:
seconds: 60
+
mybatis:
mapper-locations: classpath:mapper/*Mapper.xml
diff --git a/src/main/resources/db/emergency_rpa.db b/src/main/resources/db/emergency_rpa.db
index 15a8046..2796257 100644
Binary files a/src/main/resources/db/emergency_rpa.db and b/src/main/resources/db/emergency_rpa.db differ
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..23faeba
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+ ${LOG_CONTEXT_NAME}
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n
+ utf-8
+
+
+ INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INFO
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+ true
+
+
+ ${LOG_HOME}/%d{yyyy-MM-dd}/info/info.%d{yyyy-MM-dd-HH}.%i.log
+
+ 30
+
+
+ 10MB
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n
+ utf-8
+
+
+
+ INFO
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ true
+
+
+ ${LOG_HOME}/%d{yyyy-MM-dd}/error/error.%d{yyyy-MM-dd}.%i.log
+
+ 30
+
+
+ 10MB
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n
+ utf-8
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+ true
+
+ ${LOG_HOME}/%d{yyyy-MM-dd}/warn/warn.%d{yyyy-MM-dd}.%i.log
+
+ 30
+
+
+ 10MB
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n
+ utf-8
+
+
+
+ WARN
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/mapper/LogsMapper.xml b/src/main/resources/mapper/LogsMapper.xml
new file mode 100644
index 0000000..e15e4e0
--- /dev/null
+++ b/src/main/resources/mapper/LogsMapper.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ insert into tb_logs(id,task_id,status,err_reason,err_id,create_time )values
+ (#{id},#{taskId},#{status},#{message},#{errId},#{createTime})
+
+