From c43b9d04dea89ee0adf731ce46c4f48eed11ffb9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 10:34:48 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 15415e2..540121c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -53,17 +53,16 @@
import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.vo.RoleVO;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+
import javax.annotation.Resource;
import javax.jws.WebMethod;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
import java.util.*;
@@ -81,20 +80,25 @@
@Slf4j
@VciWebservice(path = "/universalInterface")
public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
+
@Value("${code.universalinterface.checkSystemConfig:true}")
public boolean CODE_CHECKCONFIG;
+
@Autowired(required = false)
private AttributeMapConfig attributeMapConfig;
+
/***
* 浜哄憳鐩稿叧閰嶇疆鏈嶅姟
*/
@Autowired(required = false)
private PersonAndDeptConfig personAndDeptConfig;
+
/**
* 缂撳瓨鏈嶅姟
*/
//@Autowired
//private RedisService redisService;
+
/**
* 涓婚搴撳垎绫荤殑鏈嶅姟
*/
@@ -134,7 +138,6 @@
/**
* 瀵嗙骇鐨勬湇鍔�
*/
-
@Resource
private MdmIOService mdmIOService;
@@ -164,7 +167,7 @@
@WebMethod
public HttpServletRequest getRequest() {
// 鑾峰彇HttpServletRequest瀵硅薄
- HttpServletRequest request = (HttpServletRequest) webServiceContext.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+ HttpServletRequest request = (HttpServletRequest)webServiceContext.getMessageContext().get(MessageContext.SERVLET_REQUEST);
return request;
}
@@ -210,7 +213,7 @@
ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
- //鍏嶅瘑鐧诲綍鐢宠token锛宧eader寰�token涓坊鍔�
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
@@ -362,8 +365,6 @@
//璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮�
return resultStr;
}
-
-
/****
* 浜哄憳鏁版嵁鍚屾
@@ -637,6 +638,7 @@
return resultOrgData;
}
+
/****
* 閮ㄩ棬鏁版嵁鍚屾
* @param orgData
@@ -903,6 +905,7 @@
}
return resultOrgData;
}
+
/***
* 缁熶竴鏇存柊鎺ュ彛锛堟洿鏀圭姸鎬侊紝鏇存敼灞炴�т俊鎭級鎺ュ彛
* @param data
@@ -947,6 +950,8 @@
ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -1118,6 +1123,8 @@
}
QueryData queryData=queryClassifyVO.getData();
UserVO userVo=queryData.getUser();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
systemId=queryData.getSystemId();
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
@@ -1276,6 +1283,8 @@
CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
systemId=condtionsVO.getSystemId();
UserVO userVo=condtionsVO.getUser();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
CondtionVO condtionVO= condtionsVO.getCondtion();
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -1452,8 +1461,6 @@
return resultStr;
}
-
-
@Override
public String queryClassifyRule(String data, String dataType) throws Throwable {
@@ -1492,6 +1499,8 @@
}
QueryData queryData=queryClassifyVO.getData();
UserVO userVo=queryData.getUser();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
systemId=queryData.getSystemId();
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
--
Gitblit v1.9.3