root/shanghaikaineng_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：增加日志

Browse Source
This commit is contained in:
liuxy
2024-10-24 15:07:45 +08:00
parent ec85796a21
commit 2227ac3041
16 changed files with 152 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
View File

@@ -1,6 +1,7 @@
package org.nl.acs.agv.server;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -61,7 +62,7 @@ public class AgvWaitUtil {
if (flag) {
JSONObject result = new JSONObject();
result.put("status", 200);
result.put("status", HttpStatus.HTTP_OK);
result.put("message", "允许取货！");
log.info("允许仙工AGV取货，设备号 - {}", deviceCode);
return result;
@@ -101,7 +102,7 @@ public class AgvWaitUtil {
if (flag) {
JSONObject result = new JSONObject();
result.put("status", 200);
result.put("status", HttpStatus.HTTP_OK);
result.put("message", "允许取货后离开！");
log.info("允许仙工AGV取货后离开，设备号 - {}", deviceCode);
return result;
@@ -147,7 +148,7 @@ public class AgvWaitUtil {
if (flag) {
JSONObject result = new JSONObject();
result.put("status", 200);
result.put("status", HttpStatus.HTTP_OK);
result.put("message", "允许放货！");
log.info("允许仙工AGV放货，设备号 - {}", deviceCode);
return result;
@@ -188,7 +189,7 @@ public class AgvWaitUtil {
if (flag) {
JSONObject result = new JSONObject();
result.put("status", 200);
result.put("status", HttpStatus.HTTP_OK);
result.put("message", "允许放货后离开！");
log.info("允许仙工AGV放货后离开，设备号 - {}", deviceCode);
return result;

13
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.acs.agv.server.impl;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -157,14 +158,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
// 记录车号
driver.setCar_no(reqParam.getString("robot_name"));
result.put("code", 200);
result.put("code", HttpStatus.HTTP_OK);
result.put("message", "ok");
} else {
result.put("code", 400);
result.put("code", HttpStatus.HTTP_BAD_REQUEST);
result.put("message", "ok");
}
} else {
result.put("code", 400);
result.put("code", HttpStatus.HTTP_BAD_REQUEST);
result.put("message", "ok");
}
log.info("getBlockGroup反馈AGV输出参数:{}", result.toString());
@@ -197,14 +198,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
if (device.getExtraValue().get("is_clean").toString().equals("1")) {
driver.setCar_no("");
}
result.put("code", 200);
result.put("code", HttpStatus.HTTP_OK);
result.put("message", "ok");
} else {
result.put("code", 400);
result.put("code", HttpStatus.HTTP_BAD_REQUEST);
result.put("message", "ok");
}
} else {
result.put("code", 400);
result.put("code", HttpStatus.HTTP_BAD_REQUEST);
result.put("message", "ok");
}
log.info("releaseBlockGroup反馈AGV输出参数:{}", result.toString());

6
acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsHttpUtil.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.config.AcsConfig;
import org.nl.acs.ext.RequestAdapter;
import org.nl.acs.ext.ResponseAdapter;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Component;
* @Date 2024/4/22
*/
@Component
@Slf4j
public class LmsHttpUtil {
private static final RequestAdapter REQUEST_ADAPTER = new LmsRequestAdapter();
@@ -29,6 +31,7 @@ public class LmsHttpUtil {
@ToOthersInterfaceLog("ACS->LMS")
public <T, W> UnifiedResponse<T> sendPostRequest(String path, W requestParam, Class<T> type) {
log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + requestParam.toString());
if (!StrUtil.equals(paramService.findByCode(AcsConfig.HAS_WMS).getValue(), "1")) {
return new UnifiedResponse<>(false, "未开启连接该系统！");
}
@@ -39,6 +42,7 @@ public class LmsHttpUtil {
.body(JSON.toJSONString(requestParam))
.execute()
.body();
log.info("acs向lms反馈任务状态，输出参数：--------------------------------------" + RESPONSE_ADAPTER.adapt(body, type).toString());
return RESPONSE_ADAPTER.adapt(body, type);
} catch (Exception e) {
return new UnifiedResponse<>(false, e.getMessage());
@@ -47,6 +51,7 @@ public class LmsHttpUtil {
@ToOthersInterfaceLog("ACS->LMS")
public <T, W> UnifiedResponse<T> sendPostRequest(String path, W requestParam) {
log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + requestParam.toString());
if (!StrUtil.equals(paramService.findByCode(AcsConfig.HAS_WMS).getValue(),"1")) {
return new UnifiedResponse<>(false, "未开启连接该系统！");
}
@@ -59,6 +64,7 @@ public class LmsHttpUtil {
.body(JSON.toJSONString(array))
.execute()
.body();
log.info("acs向lms反馈任务状态，输出参数：--------------------------------------" + RESPONSE_ADAPTER.adapt(body, null).toString());
return RESPONSE_ADAPTER.adapt(body, null);
} catch (Exception e) {
return new UnifiedResponse<>(false, e.getMessage());

2
acs2/nladmin-system/src/main/resources/config/application-dev2.yml
View File

@@ -140,7 +140,7 @@ file:
avatarMaxSize: 5
logging:
file:
path: /Users/onepiece/myFile/acs
path: C:\log\ACS
config: classpath:logback-spring.xml
# Sa-Token配置

2
acs2/nladmin-system/src/main/resources/config/application.yml
View File

@@ -44,7 +44,7 @@ rsa:
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
logging:
file:
path: C:\log\ACS
path: C:\logs\ACS
config: classpath:logback-spring.xml
# sa-token白名单配置
security:

5
acs2/nladmin-system/src/main/resources/log/AcsToWms.xml
View File

@@ -22,12 +22,13 @@
</appender>
<appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
<discardingThreshold>2</discardingThreshold>
<appender-ref ref="AcsToWmsServiceImpl"/>
<!-- 设置队列大小，根据您的需求调整 -->
<queueSize>512</queueSize>
</appender>
<logger name="org.nl.acs.ext.wms.LmsUtil" level="info" additivity="true">
<logger name="org.nl.acs.ext.wms.LmsHttpUtil" level="info" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</included>

33
acs2/nladmin-system/src/main/resources/log/XgToAcs.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<property name="LOG_HOME" value="${logPath}"/>
<!-- 按照每天生成日志文件 -->
<appender name="XianGongAgvServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/XG请求ACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来-->
<maxFileSize>200MB</maxFileSize>
<!--所有日志最多占多大容量-->
<totalSizeCap>2GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>
<appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="XianGongAgvServiceImpl"/>
<!-- 设置队列大小，根据您的需求调整 -->
<queueSize>512</queueSize>
</appender>
<logger name="org.nl.acs.agv.server.impl.XianGongAgvServiceImpl" level="info" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</included>

35
acs2/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -15,24 +15,28 @@ https://juejin.cn/post/6844903775631572999
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<!-- <springProperty scope="context" name="lokiUrl" source="loki.url"/>-->
<springProperty scope="context" name="systemName" source="loki.systemName"/>
<!-- <springProperty scope="context" name="systemName" source="loki.systemName"/>-->
<!-- <property name="LOKI_URL" value="${lokiUrl}"/>-->
<property name="SYSTEM_NAME" value="${systemName}"/>
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="${logPath}"/>
<!-- <property name="SYSTEM_NAME" value="${systemName}"/>-->
<!--引入默认的一些设置-->
<include resource="log/AutoCreateInst.xml"/>
<include resource="log/AcsToWms.xml"/>
<include resource="log/WmsToAcs.xml"/>
<include resource="log/ElevatorSocketUtil.xml"/>
<include resource="log/Elevator.xml"/>
<include resource="log/XgToAcs.xml"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<!--withJansi 参数改为true-->
<withJansi>true</withJansi>
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
<pattern>${log.pattern}</pattern>
<charset>${log.charset}</charset>
<!-- <charset>${log.charset}</charset>-->
</encoder>
</appender>
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="${logPath}"/>
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -51,19 +55,20 @@ https://juejin.cn/post/6844903775631572999
</encoder>
</appender>
<!--异步到文件-->
<appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>200</queueSize>
<appender-ref ref="FILE"/>
</appender>
<appender name="luceneAppender" class="org.nl.modules.lucene.config.LuceneAppender"/>
<appender name="asyncLuceneAppender" class="org.nl.modules.lucene.config.AsyncLuceneAppender">
<appender name="asyncLuceneAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="luceneAppender"/>
<!-- 设置队列大小，根据您的需求调整 -->
<queueSize>512</queueSize>
</appender>
<!--异步到文件-->
<appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>200</queueSize>
<appender-ref ref="FILE"/>
</appender>
<!--开发环境:打印控制台-->
<springProfile name="dev2">
<root level="info">