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

BIN
acs/nladmin-system/doc/wms.xls
View File

Binary file not shown.

489
acs/nladmin-system/doc/永裕家居LMS系统.postman_collection.json
View File

@@ -1,489 +0,0 @@
{
"info": {
"_postman_id": "584232a7-9ae4-4ca2-b4e5-d9e66870957e",
"name": "永裕家居LMS系统",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
"item": [
{
"name": "示例",
"description": "",
"item": [
{
"name": "LMS登录",
"event": [
{
"listen": "prerequest",
"script": {
"id": "56672d9d-9bac-4f23-b77e-809647ef5df4",
"type": "text/javascript",
"exec": [
""
]
}
},
{
"listen": "test",
"script": {
"id": "48d9e766-7014-4243-80de-81d63be07da5",
"type": "text/javascript",
"exec": [
"//postman使用:https://blog.csdn.net/wangyiyan315/article/details/122441791",
"",
"var JsonData = JSON.parse(responseBody); //定义一个变量，并且将请求返回的内容赋给该变量",
"pm.globals.set(\"lms_token\", JsonData.token.slice(7)); //7代表去掉token前面的Bearer加空格",
""
]
}
}
],
"request": {
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\n\t\n\t\"username\":\"admin\",\n\t\"password\":\"uefvHbyUCADkudW1MV+/yw9XBWR2Z+KDyq+dqQ+ozr1loClUgqm4XQPsUl87IsXetYBWRDLo7HC++20VHlW80g==\"\n}"
},
"url": {
"raw": "{{lms_url}}/mobile/auth/login",
"host": [
"{{lms_url}}"
],
"path": [
"mobile",
"auth",
"login"
]
},
"description": "LMS登录并设置返回的token"
},
"response": []
},
{
"name": "系统参数分页查询-示例",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "GET",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "/api/param"
},
"url": {
"raw": "{{lms_url}}/api/param?sort=id,desc&size=10&page=0",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param"
],
"query": [
{
"key": "sort",
"value": "id,desc"
},
{
"key": "size",
"value": "10"
},
{
"key": "page",
"value": "0"
},
{
"key": null,
"value": null
},
{
"key": null,
"value": null
}
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
},
{
"name": "根据编码获取值-示例",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "IS_CONNECT_ACS"
},
"url": {
"raw": "{{lms_url}}/api/param/getValueByCode",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param",
"getValueByCode"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
},
{
"name": "删除参数-示例",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "DELETE",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "[\"0c1d96d335cd4dd6aa0a4bee4b1c45fe\"]"
},
"url": {
"raw": "{{lms_url}}/api/param",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
},
{
"name": "新增参数-示例",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"code\":\"test22\",\"is_active\":\"1\",\"remark\":\"test11\",\"name\":\"test11\",\"value\":\"test11\"}"
},
"url": {
"raw": "{{lms_url}}/api/param",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
},
{
"name": "修改参数-示例",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "PUT",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"code\":\"test22\",\"is_active\":\"8\",\"create_time\":\"2022-10-14 13:33:52\",\"remark\":\"888\",\"update_time\":\"2022-10-14 13:33:52\",\"update_optname\":\"管理员\",\"create_id\":1,\"name\":\"888\",\"id\":\"3f1901b5814d40908bad602854b22aa6\",\"value\":\"8888\",\"update_id\":1,\"create_name\":\"管理员\"}"
},
"url": {
"raw": "{{lms_url}}/api/param",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
}
]
},
{
"name": "ACS请求LMS",
"description": "",
"item": [
{
"name": "共挤线申请空盘",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"type\":\"1\",\"point_code\":\"GJX01_K\",\"vehicle_code\":\"001\",\"qty\":\"100\",\"vehicle_type\":\"01\",\"vehicle_num\":\"1\"}"
},
"url": {
"raw": "{{lms_url}}/api/wms/task/apply",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"wms",
"task",
"apply"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
},
{
"name": "油漆线空盘入库",
"event": [
{
"listen": "prerequest",
"script": {
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "{{lms_token}}",
"type": "string"
}
]
},
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"code\":\"test22\",\"is_active\":\"1\",\"remark\":\"test11\",\"name\":\"test11\",\"value\":\"test11\"}"
},
"url": {
"raw": "{{lms_url}}/api/param",
"host": [
"{{lms_url}}"
],
"path": [
"api",
"param"
]
},
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}"
},
"response": []
}
]
}
],
"event": [
{
"listen": "prerequest",
"script": {
"id": "32f60779-6a66-4d77-80e3-1bc0040e7650",
"type": "text/javascript",
"exec": [
""
]
}
},
{
"listen": "test",
"script": {
"id": "fb339152-4984-49bb-8955-3e24baac67ae",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"variable": [
{
"id": "9b318f5e-373b-4f36-93a5-d131f4f76446",
"key": "lms_url",
"value": "http://localhost:8010",
"type": "string",
"description": ""
},
{
"id": "5557e8ff-f6ac-45b0-a950-4a8c139d1ae0",
"key": "acs_url",
"value": "http://localhost:8010",
"type": "string",
"description": ""
}
]
}

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) HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
log.info("查询agv指令数据:" + result.body()); //log.info("查询agv指令数据:" + result.body());
return result; return result;
} else { } else {
return null; return null;
@@ -293,7 +293,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
HttpResponse result = HttpRequest.get(agvurl) HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
log.info("查询agv状态数据:{}", result.body()); //log.info("查询agv状态数据:{}", result.body());
if (result.getStatus() == 200) { if (result.getStatus() == 200) {
JSONArray ja = (JSONArray) JSONArray.parse(result.body()); JSONArray ja = (JSONArray) JSONArray.parse(result.body());
for (int i = 0; i < ja.size(); i++) { 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) HttpResponse result2 = HttpRequest.get(agvurl2)
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
System.out.println("查询agv状态数据:" + result.body());
if (result.getStatus() == 200) { if (result.getStatus() == 200) {
JSONArray ja = (JSONArray) JSONArray.parse(result.body()); JSONArray ja = (JSONArray) JSONArray.parse(result.body());
@@ -181,8 +179,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
HttpResponse result = HttpRequest.get(agvurl) HttpResponse result = HttpRequest.get(agvurl)
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
System.out.println("查询agv指令数据:" + result.body());
return result; return result;
} else { } 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()))//表单内容 .body(String.valueOf(new JSONObject()))//表单内容
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
log.info("查询agv指令数据:" + result.body()); // log.info("查询agv指令数据:" + result.body());
return result; return result;
} else { } else {
return null; return null;
@@ -138,7 +138,6 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
log.info("查询agv设备数据:" + result.body()); log.info("查询agv设备数据:" + result.body());
return result; return result;
} else { } else {
return null; 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); device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
log.info("起点设备名称是{}",device_code); log.info("起点设备名称是{}",device_code);
// acsToWmsService.ghsmlqhfinish(task); //acsToWmsService.ghsmlqhfinish(task);
} }
if (ObjectUtil.isEmpty(device_code)) { if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!"); log.info(agvaddr + "对应设备号为空!");
@@ -215,10 +215,25 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//输送线对接，增加取货完成写入确认信号10 //输送线对接，增加取货完成写入确认信号10
try { 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);
siteDeviceDriver.writing(10);
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10成功！", siteDeviceDriver.getDeviceCode());
} catch (Exception e) { } catch (Exception e) {
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
try { try {
siteDeviceDriver.writing(10); 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; return;
} catch (Exception e1) { } catch (Exception e1) {
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage()); 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(); SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
try { 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);
siteDeviceDriver.writing(12);
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12成功！", siteDeviceDriver.getDeviceCode());
} catch (Exception e) { } catch (Exception e) {
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
try { try {
siteDeviceDriver.writing(12); 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; return;
} catch (Exception e1) { } catch (Exception e1) {
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage()); 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("x5", 0);
this.writing("x7", 0); this.writing("x7", 0);
} else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) { } else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) {
//DJW02申请空盘 //DJW02申请上空架
mode2 = 1; mode2 = 1;
out = false; out = false;
JSONObject jsonObject = new JSONObject(); 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: case 2:
break; break;
case 5: case 5:
//输送线申请空盘 //输送线申请上空架
if (move == 0 && !requireSucess) { if (move == 0 && !requireSucess) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
apply(5); 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 { public void run() throws Exception {
try { try {
log.info("自动线程开始查询浙大AGV任务状态"); //log.info("自动线程开始查询浙大AGV任务状态");
HttpResponse response2 = agvService.queryAgvInstStatus("1"); HttpResponse response2 = agvService.queryAgvInstStatus("1");
//查询AGV指令列表 //查询AGV指令列表
JSONArray inst_rows2 = JSONArray.parseArray(response2.body()); 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() { private void rgv() {
try { try {
log.info("自动线程开始查询浙大RGV设备状态"); // log.info("自动线程开始查询RGV设备状态");
HttpResponse response = agvService.queryAgvDeviceStatus("1"); HttpResponse response = agvService.queryAgvDeviceStatus("1");
JSONArray jsonArray = JSONArray.parseArray(response.body()); JSONArray jsonArray = JSONArray.parseArray(response.body());
//查询RGV指令列表 //查询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" <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)"/> 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="logPath" source="logging.file.path" defaultValue="logs"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/> <!-- <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="LOKI_URL" value="${lokiUrl}"/>-->
<property name="SYSTEM_NAME" value="${systemName}"/> <!-- <property name="SYSTEM_NAME" value="${systemName}"/>-->
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径--> <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="${logPath}"/> <property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置--> <!--引入默认的一些设置-->

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
View File

@@ -46,7 +46,6 @@ public class AcsToWmsController {
//@SaCheckPermission("@el.check('schBaseTask:add')") //@SaCheckPermission("@el.check('schBaseTask:add')")
@SaIgnore @SaIgnore
public ResponseEntity<Object> apply(@RequestBody JSONObject param) { public ResponseEntity<Object> apply(@RequestBody JSONObject param) {
String device_code = param.getString("device_code"); String device_code = param.getString("device_code");
BaseResponse response = LockUtils.lock( BaseResponse response = LockUtils.lock(
device_code, device_code,

90
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException; import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService; import org.nl.system.service.notice.ISysNoticeService;
@@ -21,11 +22,15 @@ import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils; import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils; import org.nl.wms.util.TaskUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -45,49 +50,72 @@ public class KJQKTask extends AbstractTask {
private ISchBaseTaskconfigService taskConfigService; private ISchBaseTaskconfigService taskConfigService;
@Autowired @Autowired
private ISysNoticeService noticeService; private ISysNoticeService noticeService;
@Resource
private RedissonClient redissonClient;
@Override @Override
protected void create() throws BadRequestException { protected void create() throws BadRequestException {
} }
@Override @Override
@SneakyThrows
protected void createCompletion(SchBaseTask task) { protected void createCompletion(SchBaseTask task) {
RLock lock = redissonClient.getLock(TASK_CONFIG_CODE);
// 配置信息 boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>() try {
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); if (tryLock) {
TaskUtils.setUpdateByAcs(task); // 寻找出料中，并且出口没有锁住的点位
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")) try {
.collect(Collectors.toList()); // 配置信息
// 找起点 SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
String requestParam = task.getRequest_param(); .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
JSONObject extGroupData = JSONObject.parseObject(requestParam); TaskUtils.setUpdateByAcs(task);
// 根据对接位查找对应的载具类型 List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
SchBasePoint endPoint = pointService.getById(task.getPoint_code2()); .collect(Collectors.toList());
log.error("tofix__KJQKTask_目标点位" + endPoint.getPoint_code() + ",点位状态为："+endPoint.getPoint_status()); // 找起点
if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) { String requestParam = task.getRequest_param();
log.error("tofix__KJQKTask_目标点位" + endPoint.getPoint_code() + "申请KJQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!"); JSONObject extGroupData = JSONObject.parseObject(requestParam);
throw new BadRequestException("点位" + endPoint.getPoint_code() + "申请KJQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!"); // 根据对接位查找对应的载具类型
SchBasePoint endPoint = pointService.getById(task.getPoint_code2());
log.error("tofix__KJQKTask_目标点位" + endPoint.getPoint_code() + ",点位状态为：" + endPoint.getPoint_status());
if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) {
log.error("tofix__KJQKTask_目标点位" + endPoint.getPoint_code() + "申请KJQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!");
throw new BadRequestException("点位" + endPoint.getPoint_code() + "申请KJQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!");
}
extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type());
SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
if (ObjectUtil.isEmpty(point)) {
log.error("tofix__KJQKTask_点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查ZCSSX010107,ZCSSX010207点位状态是否为2有货,或这些起点已存在未完成的KJQKTask任务");
throw new BadRequestException("点位:" + endPoint.getPoint_code() + "未找到取空架起点!请检查ZCSSX010107,ZCSSX010207点位状态是否为2有货,或这些起点已存在未完成的KJQKTask任务");
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_type(endPoint.getCan_vehicle_type());
task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode());
taskService.save(task);
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
} catch (Exception e) {
log.error("{}KJQKTask创建任务失败{}{}", this.TASK_CONFIG_CODE, e, e.getMessage());
}
} else {
log.info("KJQKTask任务正在创建被锁住。");
}
} finally {
if (tryLock) {
lock.unlock();
}
} }
extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type());
SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
if (ObjectUtil.isEmpty(point)) {
log.error("tofix__KJQKTask_点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查ZCSSX010107,ZCSSX010207点位状态是否为2有货,或这些起点已存在未完成的KJQKTask任务");
throw new BadRequestException("点位:" + endPoint.getPoint_code() + "未找到取空架起点!请检查ZCSSX010107,ZCSSX010207点位状态是否为2有货,或这些起点已存在未完成的KJQKTask任务");
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_type(endPoint.getCan_vehicle_type());
task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode());
taskService.save(task);
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
} }
/** /**
* 从空架暂存位获取 * 从空架暂存位获取
*
* @param startRegionStr * @param startRegionStr
* @param extGroupData * @param extGroupData
* @return * @return

84
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage.task.tasks.tbx;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException; import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService; import org.nl.system.service.notice.ISysNoticeService;
@@ -21,12 +22,16 @@ import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils; import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils; import org.nl.wms.util.TaskUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -46,6 +51,9 @@ public class TBXQKTask extends AbstractTask {
private ISchBaseTaskconfigService taskConfigService; private ISchBaseTaskconfigService taskConfigService;
@Autowired @Autowired
private ISysNoticeService noticeService; private ISysNoticeService noticeService;
@Resource
private RedissonClient redissonClient;
@Override @Override
protected void create() throws BadRequestException { protected void create() throws BadRequestException {
// 获取任务 // 获取任务
@@ -89,37 +97,55 @@ public class TBXQKTask extends AbstractTask {
} }
@Override @Override
@SneakyThrows
protected void createCompletion(SchBaseTask task) { protected void createCompletion(SchBaseTask task) {
// 配置信息 RLock lock = redissonClient.getLock(TASK_CONFIG_CODE);
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>() boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); try {
TaskUtils.setUpdateByAcs(task); if (tryLock) {
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")) // 寻找出料中，并且出口没有锁住的点位
.collect(Collectors.toList()); try {
// 找起点 // 配置信息
String requestParam = task.getRequest_param(); SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
JSONObject extGroupData = JSONObject.parseObject(requestParam); .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
// 根据对接位查找对应的载具类型 TaskUtils.setUpdateByAcs(task);
SchBasePoint endPoint = pointService.getById(task.getPoint_code2()); List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
// if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) { .collect(Collectors.toList());
// log.error("tofix__TBXQKTask_目标点位" + endPoint.getPoint_code() + "申请TBXQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!"); // 找起点
// throw new BadRequestException("点位" + endPoint.getPoint_code() + "申请TBXQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!"); String requestParam = task.getRequest_param();
// } JSONObject extGroupData = JSONObject.parseObject(requestParam);
extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type()); // 根据对接位查找对应的载具类型
SchBasePoint point = findStartPoint(startRegionStr, extGroupData); SchBasePoint endPoint = pointService.getById(task.getPoint_code2());
if (ObjectUtil.isEmpty(point)) { // if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) {
log.error("tofix__TBXQKTask_点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查起点ZCSSX020107,ZCSSX020207,ZCSSX030107,ZCSSX030207点位状态是否为2有货,或这些起点已存在未完成的TBXQKTask任务"); // log.error("tofix__TBXQKTask_目标点位" + endPoint.getPoint_code() + "申请TBXQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!");
throw new BadRequestException("点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查起点ZCSSX020107,ZCSSX020207,ZCSSX030107,ZCSSX030207点位状态是否为2有货,或这些起点已存在未完成的TBXQKTask任务"); // throw new BadRequestException("点位" + endPoint.getPoint_code() + "申请TBXQKTask任务,但该点位状态为2有货,不满足任务生成条件,请核对该点位现场的实际状态!");
// }
extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type());
SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
if (ObjectUtil.isEmpty(point)) {
log.error("tofix__TBXQKTask_点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查起点ZCSSX020107,ZCSSX020207,ZCSSX030107,ZCSSX030207点位状态是否为2有货,或这些起点已存在未完成的TBXQKTask任务");
throw new BadRequestException("点位" + endPoint.getPoint_code() + "未找到取空架起点!请检查起点ZCSSX020107,ZCSSX020207,ZCSSX030107,ZCSSX030207点位状态是否为2有货,或这些起点已存在未完成的TBXQKTask任务");
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_type(endPoint.getCan_vehicle_type());
task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode());
taskService.save(task);
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
} catch (Exception e) {
log.error("{}KJQKTask创建任务失败{}{}", this.TASK_CONFIG_CODE, e, e.getMessage());
}
} else {
log.info("KJQKTask任务正在创建被锁住。");
}
} finally {
if (tryLock) {
lock.unlock();
}
} }
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_type(endPoint.getCan_vehicle_type());
task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode());
taskService.save(task);
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
} }
/** /**