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

rev 校验、日志

Browse Source
This commit is contained in:
gengby
2023-04-26 13:45:08 +08:00
parent c5accf2a04
commit e552993803
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -131,9 +131,9 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (ikey != 0) { if (ikey != 0) {
inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); inst = instructionService.findByCodeFromCache(String.valueOf(ikey));
if (ObjectUtil.isEmpty(inst)) { // if (ObjectUtil.isEmpty(inst)) {
inst = instructionService.findByCode(String.valueOf(ikey)); // inst = instructionService.findByCode(String.valueOf(ikey));
} // }
} }
if (!ObjectUtil.isEmpty(link_inst)) { if (!ObjectUtil.isEmpty(link_inst)) {
link_flag = true; link_flag = true;

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

@@ -32,10 +32,7 @@ import org.nl.modules.system.service.ParamService;
import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* NDC单工位AGV * NDC单工位AGV
@@ -96,9 +93,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
if (ikey != 0) { if (ikey != 0) {
inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); inst = instructionService.findByCodeFromCache(String.valueOf(ikey));
if (ObjectUtil.isEmpty(inst)) { // if (ObjectUtil.isEmpty(inst)) {
inst = instructionService.findByCode(String.valueOf(ikey)); // inst = instructionService.findByCode(String.valueOf(ikey));
} // }
} }
if (!ObjectUtil.isEmpty(link_inst)) { if (!ObjectUtil.isEmpty(link_inst)) {
link_flag = true; link_flag = true;

13
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -475,21 +475,28 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (StrUtil.isEmpty(task_code)) { if (StrUtil.isEmpty(task_code)) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("message", "任务号不能为空"); json.put("message", "任务号不能为空！");
errArr.add(json);
continue;
}
if (StrUtil.isEmpty(vehicle_code)) {
JSONObject json = new JSONObject();
json.put("task_code", task_code);
json.put("message", "托盘号不能为空！");
errArr.add(json); errArr.add(json);
continue; continue;
} }
if (StrUtil.isEmpty(start_device_code)) { if (StrUtil.isEmpty(start_device_code)) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("message", "起点不能为空"); json.put("message", "起点不能为空！");
errArr.add(json); errArr.add(json);
continue; continue;
} }
if (StrUtil.isEmpty(next_device_code)) { if (StrUtil.isEmpty(next_device_code)) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("message", "终点不能为空"); json.put("message", "终点不能为空！");
errArr.add(json); errArr.add(json);
continue; continue;
} }

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

@@ -2,7 +2,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: prod
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:

2
acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
View File

@@ -6,7 +6,7 @@
<appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名--> <!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/一楼NDC系统/%d{yyyy-MM-dd}.%i.log</FileNamePattern> <FileNamePattern>${LOG_HOME}/NDC系统/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数--> <!--日志文件保留天数-->
<maxHistory>15</maxHistory> <maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来--> <!--单个日志最大容量 至少10MB才能看得出来-->

6
acs/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -34,11 +34,11 @@ https://juejin.cn/post/6844903775631572999
<!--FILE 10开始+1--> <!--FILE 10开始+1-->
<include resource="log/OneNDCSocketConnectionAutoRun.xml"/> <include resource="log/OneNDCSocketConnectionAutoRun.xml"/>
<include resource="log/AgvNdcOneDeviceDriver.xml"/> <include resource="log/AgvNdcOneDeviceDriver.xml"/>
<include resource="log/AcsToLk.xml"/> <!--<include resource="log/AcsToLk.xml"/>-->
<include resource="log/LkToAcs.xml"/> <!-- <include resource="log/LkToAcs.xml"/>-->
<include resource="log/AcsToWms.xml"/> <include resource="log/AcsToWms.xml"/>
<include resource="log/WmsToAcs.xml"/> <include resource="log/WmsToAcs.xml"/>
<include resource="log/OpcUtil.xml"/> <!-- <include resource="log/OpcUtil.xml"/>-->