From 760f94f5aa0a8777ac1fd2351766882f4ff1049f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 07:46:21 +0800
Subject: [PATCH] # 529
---
/dev/null | 48 ------------------------
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 2
src/main/java/com/zy/common/config/AdminInterceptor.java | 10 +----
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 2 +
src/main/resources/mapper/AgvWrkDetlMapper.xml | 2
5 files changed, 6 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index f55bb6a..47690fc 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -51,6 +51,7 @@
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
.eq("crn_no",2)
+ .orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
return;
@@ -67,6 +68,7 @@
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
.eq("crn_no",3)
+ .orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9af8dc3..4d38a14 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -120,7 +120,7 @@
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
// 鏂板缓宸ヤ綔妗�
Date now = new Date();
- createWrkMast(109, 201L, agvWrkMast.getLocNo(), "", agvWrkMast.getBarcode(), now, 9527L, agvWrkMast.getWhsType(), 0);
+// createWrkMast(109, 201L, agvWrkMast.getLocNo(), "", agvWrkMast.getBarcode(), now, 9527L, agvWrkMast.getWhsType(), 0);
}
}
if (agvWrkMast.getIoType() == 58) {
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 8fc8783..4447904 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -14,16 +14,13 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
-import org.springframework.util.StreamUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
-import java.nio.charset.Charset;
import java.util.Date;
/**
@@ -140,15 +137,12 @@
Http.response(response, BaseRes.NO_ACTIVATION);
return false;
}
- ServletInputStream inputStream = request.getInputStream();
- String bodyParam = StreamUtils.copyToString(inputStream, Charset.defaultCharset());
-
// 璁板綍鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
operateLog.setIp(request.getRemoteAddr());
operateLog.setUserId(user.getId());
- operateLog.setRequest(JSON.toJSONString(bodyParam));
+ operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
request.setAttribute("operateLog", operateLog);
}
return true;
@@ -188,4 +182,4 @@
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/config/CustomRequestFilter.java b/src/main/java/com/zy/common/config/CustomRequestFilter.java
deleted file mode 100644
index 2820040..0000000
--- a/src/main/java/com/zy/common/config/CustomRequestFilter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.common.config;
-
-import com.zy.common.utils.CustomHttpServletRequestWrapper;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-@Component
-public class CustomRequestFilter implements Filter {
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
- HttpServletRequest httpServletRequest = (HttpServletRequest) request;
- CustomHttpServletRequestWrapper requestWrapper = new CustomHttpServletRequestWrapper(httpServletRequest);
- chain.doFilter(requestWrapper, response);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/utils/CustomHttpServletRequestWrapper.java b/src/main/java/com/zy/common/utils/CustomHttpServletRequestWrapper.java
deleted file mode 100644
index 3a2ff1a..0000000
--- a/src/main/java/com/zy/common/utils/CustomHttpServletRequestWrapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.zy.common.utils;
-
-import org.springframework.util.StreamUtils;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.*;
-
-public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper {
- private final byte[] bytes;
-
- public CustomHttpServletRequestWrapper(HttpServletRequest request) throws IOException {
- super(request);
- bytes = StreamUtils.copyToByteArray(request.getInputStream());
- }
-
- @Override
- public ServletInputStream getInputStream() throws IOException {
- final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
- return new ServletInputStream() {
- @Override
- public boolean isFinished() {
- return false;
- }
-
- @Override
- public boolean isReady() {
- return false;
- }
-
- @Override
- public void setReadListener(ReadListener readListener) {
- }
-
- @Override
- public int read() throws IOException {
- return byteArrayInputStream.read();
- }
- };
- }
-
- @Override
- public BufferedReader getReader() throws IOException {
- return new BufferedReader(new InputStreamReader(getInputStream()));
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/mapper/AgvWrkDetlMapper.xml b/src/main/resources/mapper/AgvWrkDetlMapper.xml
index 6326029..b934cf1 100644
--- a/src/main/resources/mapper/AgvWrkDetlMapper.xml
+++ b/src/main/resources/mapper/AgvWrkDetlMapper.xml
@@ -59,7 +59,7 @@
</sql>
- <select id="selectByWrkNo" resultMap="BaseResultMap">
+ <select id="selectByWrkNo11" resultMap="BaseResultMap">
select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
</select>
--
Gitblit v1.9.1