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

rev:任务状态反馈修改

Browse Source
This commit is contained in:
zhangzq
2025-02-07 10:05:54 +08:00
parent 62d1f6831e
commit 1f02e53d11
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
View File

@@ -42,8 +42,10 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Parameter; import java.lang.reflect.Parameter;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -106,22 +108,27 @@ public class LogAspect {
SysLog log = new SysLog("INFO", System.currentTimeMillis() - currentTime.get()); SysLog log = new SysLog("INFO", System.currentTimeMillis() - currentTime.get());
currentTime.remove(); currentTime.remove();
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log); logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log);
}catch (Exception ex) { }catch (Throwable ex) {
StringBuffer errorStack = new StringBuffer(); StringBuffer errorStack = new StringBuffer();
errorStack.append("<br/>【异常堆栈:"); errorStack.append("<br/>【异常堆栈:");
String errorMsg = ex.getMessage();
int x = 0; int x = 0;
if (ex instanceof UndeclaredThrowableException){
ex = ((UndeclaredThrowableException) ex).getUndeclaredThrowable();
if (ex instanceof InvocationTargetException){
ex = ((InvocationTargetException) ex).getTargetException();
}
}
StackTraceElement[] stackTrace = ex.getStackTrace(); StackTraceElement[] stackTrace = ex.getStackTrace();
if (stackTrace != null && stackTrace.length > 0) { if (stackTrace != null && stackTrace.length > 0) {
for (StackTraceElement stack : stackTrace) { for (StackTraceElement stack : stackTrace) {
x++; x++;
errorStack.append(stack.toString().replaceAll("<", ">")).append("<br/>"); errorStack.append(stack.toString().replaceAll("<", ">")).append("<br/>");
if (x > 10) { if (x > 15) {
break; break;
} }
} }
} }
log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url, errorMsg, params, errorStack.append("】").toString()); log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url, ex.getMessage(), params, ThrowableUtil.getStackTrace(ex));
throw ex; throw ex;
} finally { } finally {
log.info("[--response--][请求接口:{} 执行结束][耗时:{}s]", url, (System.currentTimeMillis() - comming) / 1000); log.info("[--response--][请求接口:{} 执行结束][耗时:{}s]", url, (System.currentTimeMillis() - comming) / 1000);

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

@@ -184,7 +184,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try { try {
if (tryLock) { if (tryLock) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task")
.query("task_id = '" + task_id + "'").uniqueResult(0);
// 任务处理类 // 任务处理类
String processing_class = taskObj.getString("handle_class"); String processing_class = taskObj.getString("handle_class");
//1:执行中,2:完成 ,3:acs取消 //1:执行中,2:完成 ,3:acs取消
@@ -193,7 +194,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (StrUtil.isNotEmpty(car_no)) { if (StrUtil.isNotEmpty(car_no)) {
WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("car_no", car_no),"task_id = '" + task_id + "'"); WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("car_no", car_no),"task_id = '" + task_id + "'");
} }
String message = "";
String status = ""; String status = "";
if ("1".equals(acs_task_status)) { if ("1".equals(acs_task_status)) {
status = TaskStatusEnum.EXECUTING.getCode(); status = TaskStatusEnum.EXECUTING.getCode();
@@ -217,10 +217,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class); Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class);
m.invoke(obj, row, status); m.invoke(obj, row, status);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+status+"失败:"+e.getMessage()),"task_id = '" + task_id + "'"); WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+status+"失败:"+e.getMessage()),"task_id = '" + task_id + "'");
message = e.getMessage(); throw e;
throw new BadRequestException(message);
} }
} else { } else {
throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！"); throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");