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

rev:注释不必要的日志记录

Browse Source
This commit is contained in:
gongbaoxiong
2025-02-28 09:17:25 +08:00
parent 90df60711e
commit 4ff3e81154
14 changed files with 156 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
View File

@@ -66,7 +66,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒
.execute();
log.info("查询agv指令数据:" + result.body());
//log.info("查询agv指令数据:" + result.body());
return result;
} else {
return null;
@@ -293,7 +293,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒
.execute();
log.info("查询agv状态数据:{}", result.body());
//log.info("查询agv状态数据:{}", result.body());
if (result.getStatus() == 200) {
JSONArray ja = (JSONArray) JSONArray.parse(result.body());
for (int i = 0; i < ja.size(); i++) {

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

@@ -128,8 +128,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
HttpResponse result2 = HttpRequest.get(agvurl2)
.timeout(20000)//超时，毫秒
.execute();
System.out.println("查询agv状态数据:" + result.body());
if (result.getStatus() == 200) {
JSONArray ja = (JSONArray) JSONArray.parse(result.body());
@@ -181,8 +179,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒
.execute();
System.out.println("查询agv指令数据:" + result.body());
return result;
} else {

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
View File

@@ -113,7 +113,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
.body(String.valueOf(new JSONObject()))//表单内容
.timeout(20000)//超时，毫秒
.execute();
log.info("查询agv指令数据:" + result.body());
// log.info("查询agv指令数据:" + result.body());
return result;
} else {
return null;
@@ -138,7 +138,6 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
.timeout(20000)//超时，毫秒
.execute();
log.info("查询agv设备数据:" + result.body());
return result;
} else {
return null;

32
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -202,7 +202,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
log.info("起点设备名称是{}",device_code);
// acsToWmsService.ghsmlqhfinish(task);
//acsToWmsService.ghsmlqhfinish(task);
}
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");
@@ -215,10 +215,25 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//输送线对接，增加取货完成写入确认信号10
try {
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10成功！", siteDeviceDriver.getDeviceCode());
} catch (Exception e) {
for (int i = 0; i < 15; i++) {
try {
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10失败，再次写入，成功！{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());
return;
} catch (Exception e1) {
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());
@@ -309,10 +324,25 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
try {
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12成功！", siteDeviceDriver.getDeviceCode());
} catch (Exception e) {
for (int i = 0; i < 15; i++) {
try {
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
siteDeviceDriver.writing(12);
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12失败，再次写入，成功！{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());
return;
} catch (Exception e1) {
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
View File

@@ -218,7 +218,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
this.writing("x5", 0);
this.writing("x7", 0);
} else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) {
//DJW02申请空盘
//DJW02申请上空架
mode2 = 1;
out = false;
JSONObject jsonObject = new JSONObject();

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
View File

@@ -216,7 +216,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
case 2:
break;
case 5:
//输送线申请空盘
//输送线申请上空架
if (move == 0 && !requireSucess) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
apply(5);

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
View File

@@ -37,7 +37,7 @@ public class QueryZDAgvTaskStatus {
public void run() throws Exception {
try {
log.info("自动线程开始查询浙大AGV任务状态");
//log.info("自动线程开始查询浙大AGV任务状态");
HttpResponse response2 = agvService.queryAgvInstStatus("1");
//查询AGV指令列表
JSONArray inst_rows2 = JSONArray.parseArray(response2.body());

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -55,7 +55,7 @@ public class SyncDeviceStatus {
private void rgv() {
try {
log.info("自动线程开始查询浙大RGV设备状态");
// log.info("自动线程开始查询RGV设备状态");
HttpResponse response = agvService.queryAgvDeviceStatus("1");
JSONArray jsonArray = JSONArray.parseArray(response.body());
//查询RGV指令列表

8
acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -14,10 +14,10 @@ https://juejin.cn/post/6844903775631572999
<property name="log.pattern"
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"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<property name="SYSTEM_NAME" value="${systemName}"/>
<!-- <springProperty scope="context" name="lokiUrl" source="loki.url"/>-->
<!-- <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}"/>
<!--引入默认的一些设置-->