From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案, 如何实现,对现有找库位规则进行整改,数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位,离线设备不分配 3、库位分配要均衡到每一个设备  4、库位高度需要匹配到对应库位信息,低库位能向上兼容  5、空托盘优先放在locType2库位=1的库位,没有这种库位了,允许放到其他库位 6、给入库站点设置有限去那些堆垛机,其次去那些堆垛机,弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置,当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频,如果是高频则从前往后找库位,如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 80e61c5..547ba96 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,6 +2,7 @@
 
 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;
@@ -64,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)){
@@ -87,9 +99,18 @@
         }
     }
 
+    @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");
+            String token = new String();
+            token = request.getHeader("token");
+            if (Cools.isEmpty(token)){
+                return true;
+            }
             UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
             if (null == userLogin){
                 Http.response(response, BaseRes.DENIED);
@@ -120,13 +141,13 @@
                     Http.response(response, BaseRes.NO_ACTIVATION);
                     return false;
                 }
-                // 璁板綍鎿嶄綔鏃ュ織
-                OperateLog operateLog = new OperateLog();
-                operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
-                operateLog.setIp(request.getRemoteAddr());
-                operateLog.setUserId(user.getId());
-                operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
-                request.setAttribute("operateLog", operateLog);
+//                // 璁板綍鎿嶄綔鏃ュ織
+//                OperateLog operateLog = new OperateLog();
+//                operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
+//                operateLog.setIp(request.getRemoteAddr());
+//                operateLog.setUserId(user.getId());
+//                operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
+//                request.setAttribute("operateLog", operateLog);
             }
             return true;
         } catch (Exception e){

--
Gitblit v1.9.1