From 15b6a3e0d236ade3d4bd69f3b6ca9e4e420e455c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 20 一月 2025 15:17:34 +0800
Subject: [PATCH] 标记agvLocMove方法为Deprecated
---
src/main/java/com/zy/common/web/BaseController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index a61e965..0309a4a 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,6 +1,5 @@
package com.zy.common.web;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -8,9 +7,13 @@
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.Tag;
+import com.zy.asrs.service.NodeService;
import com.zy.asrs.service.TagService;
import com.zy.system.entity.User;
+import com.zy.system.entity.UserLogin;
+import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +36,16 @@
private UserService userService;
@Autowired
private TagService tagService;
+ @Autowired
+ private NodeService nodeService;
+
+ @Autowired
+ private UserLoginService userLoginService;
protected Long getUserId(){
+ if(Cools.isEmpty(request.getAttribute("userId"))){
+ return 000L;
+ }
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
}
@@ -58,6 +69,14 @@
protected Tag getOriginTag(){
return tagService.getTop();
+ }
+
+ protected Node getOriginNode(){
+ Node node = nodeService.getTop();
+ if (node == null) {
+ throw new CoolException("搴撳尯鏁版嵁閿欒");
+ }
+ return node;
}
/**
@@ -158,4 +177,40 @@
}
}
}
+
+ protected <T> void hostEq(EntityWrapper<T> wrapper){
+ Long hostId = getHostId();
+ if (hostId != null) {
+ wrapper.eq("host_id", hostId);
+ }
+ }
+
+ protected Long getHostId(){
+ if (getUserId() == 9527) {
+ return null;
+ }
+ User user = getUser();
+ if (user.getRoleId() == 1) {
+ String hostId = String.valueOf(request.getAttribute("hostId"));
+ if (Cools.isEmpty(hostId)) {
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ if (userLogin != null) {
+ //return userLogin.getHostId();
+ return 1L;
+ }
+ }
+ return Long.parseLong(hostId);
+ } else {
+ return user.getHostId();
+ }
+ }
+
+ public static boolean isNumber(String str){
+ for (int i = str.length();--i>=0;){
+ if (!Character.isDigit(str.charAt(i))){
+ return false;
+ }
+ }
+ return true;
+ }
}
--
Gitblit v1.9.1