Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-04-16 73de789fbbc67873aab0e72eb0f469ea195c1cbe

Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

 src/main/java/com/zy/asrs/controller/AgvLocMastController.java

@@ -48,7 +48,7 @@
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        convert1(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
    }
@@ -180,4 +180,16 @@
            }
        }
    }
    private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.eq(entry.getKey(), val);
            }
        }
    }
}

 src/main/java/com/zy/common/config/AdminInterceptor.java

@@ -116,7 +116,7 @@
//            String deToken = Cools.deTokn(token, user.getPassword());
//            long timestamp = Long.parseLong(deToken.substring(0, 13));
            // 15分钟后过期
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > (900000 * 96)){
                Http.response(response, BaseRes.DENIED);
                return false;
            }