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
2026-03-25 15:17:57 +08:00
parent 4ff3e81154
commit c8bdb72dbf
13 changed files with 122 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
@@ -110,8 +109,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AbstractTask task = taskFactory.getTask(requestMethodCode);
// 执行创建任务
task.apply(param);
// acs对接记录
interactRecordService.saveRecord(requestMethodCode, param, result, GeneralDefinition.ACS_LMS);
} catch (Exception e) {
String message = e.getMessage();
log.error("ACS请求LMS出现错误,acsApply请求参数为:{},错误信息为：{},{}", param, e, message);
@@ -121,6 +118,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 消息通知
noticeService.createNotice("异常信息：" + message, device_code, NoticeTypeEnum.EXCEPTION.getCode());
}
// acs对接记录
interactRecordService.saveRecord(requestMethodCode, param, result, GeneralDefinition.ACS_LMS);
return result;
}
@@ -244,19 +243,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// id / code
String pointCode = task1.againApply(task.getString("task_id"));
result.setNext_point_code(pointCode);
// acs对接记录
interactRecordService.saveRecord(task.getString("request_method_name"), task, result, GeneralDefinition.ACS_LMS);
} catch (Exception e) {
String message = ObjectUtil.isEmpty(e.getMessage())
? ((InvocationTargetException) e).getTargetException().getMessage()
: e.getMessage();
log.error("ACS请求LMS出现错误,againApply请求参数为:{},错误信息为：{},{}",task,e, message);
// 消息通知
noticeService.createNotice("ACS请求LMS出现错误,againApply二次请求任务信息：" + JSONObject.toJSONString(task), task2.getConfig_code(), NoticeTypeEnum.EXCEPTION.getCode());
String message = e.getMessage();
log.error("ACS请求LMS出现错误,againApply请求参数为:{},错误信息为：{},{}", task, e, message);
noticeService.createNotice("ACS请求LMS出现错误,againApply二次请求任务信息：" + JSONObject.toJSONString(task),
task2.getConfig_code(), NoticeTypeEnum.EXCEPTION.getCode());
result.setCode(HttpStatus.HTTP_BAD_REQUEST);
result.setMessage(message);
result.setRequestNo(task.getString("requestNo"));
}
// acs对接记录
interactRecordService.saveRecord(task.getString("request_method_name"), task, result, GeneralDefinition.ACS_LMS);
return result;
}

133
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
View File

@@ -26,6 +26,7 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskFactory;
@@ -41,7 +42,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -191,23 +191,23 @@ public class GHCMLTask extends AbstractTask {
// 多个数据选择一个：Limit 1, 还需要考虑任务数，尽量一排排满
List<SchBasePoint> sameMaterialPoints = autoMapper.getZCSameMaterialPoint(jsonObject.getString("pcsn")
, jsonObject.getString("material_id"));
SchBasePoint temp=null;
int row_num=0;
//检查当前列前面是否有货
for(SchBasePoint schBasePoint:sameMaterialPoints){
if(row_num==schBasePoint.getRow_num()){
continue;
}
if(PointStatusEnum.EMPTY_POINT.getCode().equals(schBasePoint.getPoint_status())
&& StringUtil.isEmpty(schBasePoint.getIng_task_code())){
temp = schBasePoint;
}else{
row_num=schBasePoint.getRow_num();
SchBasePoint temp = null;
int row_num = 0;
//检查当前列前面是否有货
for (SchBasePoint schBasePoint : sameMaterialPoints) {
if (row_num == schBasePoint.getRow_num()) {
continue;
}
if (PointStatusEnum.EMPTY_POINT.getCode().equals(schBasePoint.getPoint_status())
&& StringUtil.isEmpty(schBasePoint.getIng_task_code())) {
temp = schBasePoint;
} else {
row_num = schBasePoint.getRow_num();
}
if (ObjectUtil.isNotEmpty(temp)) {
return temp;
}
}
if (ObjectUtil.isNotEmpty(temp)) {
return temp;
}
//如果没有找到。或者分配等待点失败，就选择一个空列存放
return autoMapper.getZCEmptyMaterialPoint(nextRegionStr.get(0), jsonObject.getString("material_id"));
}
@@ -356,62 +356,71 @@ public class GHCMLTask extends AbstractTask {
if (ObjectUtil.isEmpty(task)) {
throw new BadRequestException("任务：[" + task_id + "]不存在!");
}
// String waitPoint = task.getNext_wait_point();
// if (ObjectUtil.isEmpty(waitPoint)) {
// throw new BadRequestException("找不到任务：[" + task_id + "]等待点!");
// }
// String waitPoint = task.getNext_wait_point();
// if (ObjectUtil.isEmpty(waitPoint)) {
// throw new BadRequestException("找不到任务：[" + task_id + "]等待点!");
// }
if (!"DDD".equals(task.getPoint_code2())) {
log.info("任务号{}已请求过二次分配，直接返回已分配地址{}", task_id, task.getPoint_code2());
return task.getPoint_code2();
}
// SchBasePoint waitPointObj = pointService.getById(waitPoint);
// SchBasePoint result;
// // 找到这排对应的准确货位，
// // hint: 需要考虑前后空，中间有货的情况，有货之后的即使是空也不能放。
// // 寻找有货的数据
// List<SchBasePoint> points = pointService.list(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
// .eq(SchBasePoint::getIs_used, true)
// .orderByDesc(SchBasePoint::getIn_order_seq));
// if (points.size() > 0) {
// SchBasePoint basePoint = points.get(0);
// // 找到物料位置的下一个位置
// result = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getCol_num, basePoint.getCol_num() - 1)
// // 当前执行的任务为空或者NULL，有数据表示锁住
// .and(la -> la.isNull(SchBasePoint::getIng_task_code)
// .or()
// .eq(SchBasePoint::getIng_task_code, ""))
// .eq(SchBasePoint::getIs_used, true));
// if (ObjectUtil.isEmpty(result)) {
// throw new BadRequestException("点位错误");
// }
// } else {
// // 空的话代表这排是新的一排，找个位置就行
// points = pointService.list(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
// // 当前执行的任务为空或者NULL，有数据表示锁住
// .and(la -> la.isNull(SchBasePoint::getIng_task_code)
// .or()
// .eq(SchBasePoint::getIng_task_code, ""))
// .eq(SchBasePoint::getIs_used, true)
// .orderByAsc(SchBasePoint::getIn_order_seq));
// // 获取第一条
// result = points.get(0);
// }
// SchBasePoint waitPointObj = pointService.getById(waitPoint);
// SchBasePoint result;
// // 找到这排对应的准确货位，
// // hint: 需要考虑前后空，中间有货的情况，有货之后的即使是空也不能放。
// // 寻找有货的数据
// List<SchBasePoint> points = pointService.list(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
// .eq(SchBasePoint::getIs_used, true)
// .orderByDesc(SchBasePoint::getIn_order_seq));
// if (points.size() > 0) {
// SchBasePoint basePoint = points.get(0);
// // 找到物料位置的下一个位置
// result = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getCol_num, basePoint.getCol_num() - 1)
// // 当前执行的任务为空或者NULL，有数据表示锁住
// .and(la -> la.isNull(SchBasePoint::getIng_task_code)
// .or()
// .eq(SchBasePoint::getIng_task_code, ""))
// .eq(SchBasePoint::getIs_used, true));
// if (ObjectUtil.isEmpty(result)) {
// throw new BadRequestException("点位错误");
// }
// } else {
// // 空的话代表这排是新的一排，找个位置就行
// points = pointService.list(new LambdaQueryWrapper<SchBasePoint>()
// .eq(SchBasePoint::getRegion_code, waitPointObj.getRegion_code())
// .eq(SchBasePoint::getRow_num, waitPointObj.getRow_num())
// .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
// // 当前执行的任务为空或者NULL，有数据表示锁住
// .and(la -> la.isNull(SchBasePoint::getIng_task_code)
// .or()
// .eq(SchBasePoint::getIng_task_code, ""))
// .eq(SchBasePoint::getIs_used, true)
// .orderByAsc(SchBasePoint::getIn_order_seq));
// // 获取第一条
// result = points.get(0);
// }
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param());
if (ObjectUtil.isEmpty(jsonObject.getString("pcsn")) || ObjectUtil.isEmpty(jsonObject.getString("material_id"))) {
throw new BadRequestException("tofix,againApply二次分配任务：pcsn和material_id参数错误");
}
SchBasePoint result = findNextPoint(nextRegionStr, jsonObject);
log.info("任务{}二次分配找到目标点位{}",task_id, result.getPoint_code());
if (ObjectUtil.isEmpty(result)) {
// 消息通知
noticeService.createNotice("失败原因：固化室出口找不到符合条件的空架终点", task.getPoint_code1() + "固化室出库失败",
NoticeTypeEnum.EXCEPTION.getCode());
throw new BadRequestException(task.getPoint_code1() + "：固化室出库失败，失败原因：固化室出口找不到符合条件的空架终点");
}
log.info("任务{}二次分配找到目标点位{}", task_id, result.getPoint_code());
// 锁住货位点
PointUtils.setUpdateByAcs(result);
result.setIng_task_code(task.getTask_code());

22
lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -4,13 +4,13 @@ server:
spring:
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
db-type: com.alibaba.druid.pool.DruidDataSourceQ
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms_xftn}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}
# password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:P@ssw0rd}
# 初始连接数
initial-size: 5
# 最小连接数
@@ -47,8 +47,8 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:2}
# host: ${REDIS_HOST:10.44.101.112}
host: ${REDIS_HOST:127.0.0.1}
# host: ${REDIS_HOST:10.44.101.112}
host: ${REDIS_HOST:10.44.101.19}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}
redisson:
@@ -58,9 +58,10 @@ spring:
singleServerConfig:
connectionMinimumIdleSize: 8
connectionPoolSize: 8
address: redis://127.0.0.1:6379
address: redis://10.44.101.19:6379
idleConnectionTimeout: 10000
timeout: 3000
# 登录相关配置
login:
# 登录缓存
@@ -150,19 +151,16 @@ sa-token:
# ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
is-read-cookie: true
is-print: false
# 未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
# 未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
token-session-check-login: false
alone-redis:
# Redis数据库索引（默认为0）
database: 2
# Redis服务器地址
host: 127.0.0.1
host: 10.44.101.19
# Redis服务器连接端口
port: 6379
# Redis服务器连接密码（默认为空）
password:
# 连接超时时间
timeout: 10s
lucene:
index:
path: D:\lucene\index

2
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -38,7 +38,7 @@ https://juejin.cn/post/6844903775631572999
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来-->
<maxFileSize>150MB</maxFileSize>
<maxFileSize>50MB</maxFileSize>
<!--所有日志最多占多大容量-->
<totalSizeCap>50GB</totalSizeCap>
</rollingPolicy>