From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 37a863d..e05cb80 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.zy.common.properties.SystemProperties;
import com.zy.common.utils.Http;
import com.zy.system.entity.*;
import com.zy.system.service.*;
@@ -63,10 +65,21 @@
}
}
}
+ // 鐧藉悕鍗�
+// if (IpTools.gainRealIp(request).equals("127.0.0.1")) {
+// request.setAttribute("userId", 9527);
+// return true;
+// }
// 璺ㄥ煙璁剧疆
// response.setHeader("Access-Control-Allow-Origin", "*");
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
+ if (method.isAnnotationPresent(AppAuth.class)){
+ AppAuth annotation = method.getAnnotation(AppAuth.class);
+ if (annotation.value().equals(AppAuth.Auth.CHECK)){
+ request.setAttribute("appAuth", annotation.memo());
+ }
+ }
if (method.isAnnotationPresent(ManagerAuth.class)){
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
@@ -86,6 +99,11 @@
}
}
+ @Override
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
+// Object r = request.getAttribute("cool-response");
+ }
+
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
@@ -97,8 +115,8 @@
User user = userService.selectById(userLogin.getUserId());
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
- // 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ // 15鍒嗛挓鍚庤繃鏈� 涓�澶�
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -114,6 +132,12 @@
userLoginService.updateById(userLogin);
// 鎿嶄綔鏃ュ織
if (!Cools.isEmpty(memo)) {
+ // 杩涜婵�娲诲垽鏂�
+ if (!SystemProperties.SYSTEM_ACTIVATION) {
+ Http.response(response, BaseRes.NO_ACTIVATION);
+ return false;
+ }
+ // 璁板綍鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
operateLog.setIp(request.getRemoteAddr());
--
Gitblit v1.9.1