From 663878fdcd0d44c105888014f4cdf7fc926f609f Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 19 六月 2024 10:27:04 +0800
Subject: [PATCH] 1、去掉client包的相关更改。 2、修改登录鉴权修改。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java | 101 ++++++++++++++++++++++----------------------------
1 files changed, 44 insertions(+), 57 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
index 6dbfdcb..cd11d1d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
@@ -2,8 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.vci.client.bof.ClientBusinessObject;
-import com.vci.client.bof.ClientLinkObject;
import com.vci.client.common.objects.UserEntityObject;
import com.vci.common.exception.VciException;
import com.vci.corba.common.PLException;
@@ -11,6 +9,7 @@
import com.vci.corba.omd.data.AttributeValue;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.data.LinkObject;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -1078,9 +1077,9 @@
* @param cbo 涓氬姟鏁版嵁
* @param obj 瀵硅薄
*/
- public static void copyValueToObjectFromCbos(com.vci.client.bof.ClientBusinessObject cbo,Object obj){
+ public static void copyValueToObjectFromCbos(BusinessObject cbo,Object obj){
if(cbo!=null){
- copyValueToObjectFromBos(cbo.getBusinessObject(),obj);
+ copyValueToObjectFromBos(cbo,obj);
}
}
@@ -1090,9 +1089,9 @@
* @param obj 瀵硅薄
* @param fieldAttrMap 灞炴�ф槧灏�
*/
- public static void copyValueToObjectFromCbos(com.vci.client.bof.ClientBusinessObject cbo,Object obj,Map<String,String> fieldAttrMap){
+ public static void copyValueToObjectFromCbos(BusinessObject cbo,Object obj,Map<String,String> fieldAttrMap){
if(cbo!=null){
- copyValueToObjectFromBos(cbo.getBusinessObject(),obj,fieldAttrMap);
+ copyValueToObjectFromBos(cbo,obj,fieldAttrMap);
}
}
@@ -1218,9 +1217,9 @@
* @param cbo 涓氬姟鏁版嵁
* @param map map
*/
- public static void copyValueToMapFromCbos(com.vci.client.bof.ClientBusinessObject cbo,Map<String,String> map){
+ public static void copyValueToMapFromCbos(BusinessObject cbo,Map<String,String> map){
if(cbo!=null){
- copyValueToMapFromBos(cbo.getBusinessObject(),map);
+ copyValueToMapFromBos(cbo,map);
}
}
@@ -1256,9 +1255,9 @@
* @param clo 閾炬帴绫诲瀷
* @param map map
*/
- public static void copyValueToMapFromClos(com.vci.client.bof.ClientLinkObject clo,Map<String,String> map){
+ public static void copyValueToMapFromClos(LinkObject clo,Map<String,String> map){
if(clo!=null){
- copyValueToMapFromLos(clo.getLinkObject(),map);
+ copyValueToMapFromLos(clo,map);
}
}
@@ -1297,9 +1296,9 @@
* @param obj 瀵硅薄
* @param fieldAttrMap 灞炴�ap
*/
- public static void copyValueToObjectFromClos(ClientLinkObject clo,Object obj,Map<String,String> fieldAttrMap){
+ public static void copyValueToObjectFromClos(LinkObject clo,Object obj,Map<String,String> fieldAttrMap){
if(clo!=null){
- copyValueToObjectFromLos(clo.getLinkObject(),obj,fieldAttrMap);
+ copyValueToObjectFromLos(clo,obj,fieldAttrMap);
}
}
@@ -1351,7 +1350,7 @@
* @param cbo 閾炬帴绫诲瀷
* @param map 瀵硅薄
*/
- public static void copyValueToCboFromMap(com.vci.client.bof.ClientBusinessObject cbo,Map<String,String> map) throws VciBaseException{
+ public static void copyValueToCboFromMap(BusinessObject cbo,Map<String,String> map) throws VciBaseException{
if(map!=null){
Iterator<String> it = map.keySet().iterator();
while(it.hasNext()){
@@ -1360,15 +1359,11 @@
if(value == null){
value = "";
}
- try {
- if(isDefaultField(key)){
- setValueToField(key, cbo, value);
- }
- cbo.setAttributeValueWithNoCheck(key.toLowerCase(), value);
- } catch (PLException e) {
- throw WebUtil.getVciBaseException(e);
- }
- }
+ if(isDefaultField(key)){
+ setValueToField(key, cbo, value);
+ }
+ ObjectTool.setBOAttributeValue(cbo,key.toLowerCase(), value);
+ }
}
}
@@ -1377,7 +1372,7 @@
* @param clo 閾炬帴绫诲瀷
* @param map 瀵硅薄
*/
- public static void copyValueToCloFromMap(ClientLinkObject clo,Map<String,String> map) throws VciBaseException{
+ public static void copyValueToCloFromMap(LinkObject clo,Map<String,String> map) throws VciBaseException{
if(map!=null){
Iterator<String> it = map.keySet().iterator();
while(it.hasNext()){
@@ -1386,16 +1381,12 @@
if(value == null){
value = "";
}
- try {
- if(isDefaultField(key)){
- setValueToField(key, clo, value);
- }else {
- clo.setAttributeValue(key.toLowerCase(), value);
- }
- } catch (PLException e) {
- throw WebUtil.getVciBaseException(e);
- }
- }
+ if(isDefaultField(key)){
+ setValueToField(key, clo, value);
+ }else {
+ ObjectTool.setLOAttributeValue(clo,key.toLowerCase(), value);
+ }
+ }
}
}
@@ -1406,10 +1397,10 @@
* @throws VciBaseException 鎷疯礉鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
public static void copyValueToBoFromObj(BusinessObject bo,Object obj) throws VciBaseException{
- ClientBusinessObject cbo = new ClientBusinessObject();
- cbo.setBusinessObject(bo);
+ BusinessObject cbo = new BusinessObject();
+ cbo = bo;
copyValueToCboFromObj(cbo,obj);
- bo = cbo.getBusinessObject();
+ bo = cbo;
}
/**
@@ -1418,7 +1409,7 @@
* @param obj 鏁版嵁瀵硅薄
* @throws VciBaseException 鎷疯礉鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- public static void copyValueToCboFromObj(ClientBusinessObject cbo ,Object obj) throws VciBaseException{
+ public static void copyValueToCboFromObj(BusinessObject cbo ,Object obj) throws VciBaseException{
Map<String,String> fieldMap = getFieldNameMap(obj.getClass());//鍏堟煡鎵炬墍鏈夐渶瑕佹寔涔呭寲鍒板钩鍙扮殑灞炴�э紝涓嶉渶瑕佹寔涔呭寲鐨勫氨涓嶇敤璧嬪�间簡
Iterator<String> it = fieldMap.keySet().iterator();
while(it.hasNext()){
@@ -1430,15 +1421,11 @@
if(value==null){
value = "";
}
- try {
- if(isDefaultField(fieldName)){
- setValueToField(fieldName, cbo, value);
- }
- cbo.setAttributeValue(attrName.toLowerCase(), value);
- } catch (PLException e) {
- throw WebUtil.getVciBaseException(e);
- }
- }
+ if(isDefaultField(fieldName)){
+ setValueToField(fieldName, cbo, value);
+ }
+ ObjectTool.setBOAttributeValue(cbo,attrName.toLowerCase(), value);
+ }
}
}
@@ -1665,19 +1652,19 @@
* @param wrapperOptions 灏佽鐨勪俊鎭�
* @return 鏍戝垪琛�
*/
- public static <T,R> List<Tree> cboList2Trees(List<? extends com.vci.client.bof.ClientBusinessObject> doList, TreeWrapperOptions wrapperOptions, Function<T,R> f){
+ public static <T,R> List<Tree> cboList2Trees(List<? extends BusinessObject> doList, TreeWrapperOptions wrapperOptions, Function<T,R> f){
if(CollectionUtils.isEmpty(doList)){
return new ArrayList<>();
}
List<Tree> allTree = new ArrayList<Tree>();
List<Tree> children = new ArrayList<Tree>();
for (int i = 0 ; i < doList.size();i++) {
- com.vci.client.bof.ClientBusinessObject cbo = doList.get(i);
+ BusinessObject cbo = doList.get(i);
Tree tree =new Tree();
List<String> oidFieldNames = VciBaseUtil.str2List(wrapperOptions.getOidFieldName());
List<String> oidValues = new LinkedList<>();
oidFieldNames.stream().forEach( s->{
- oidValues.add(cbo.getAttributeValue(s));
+ oidValues.add(ObjectTool.getBOAttributeValue(cbo, s));
});
tree.setOid(oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
if(f !=null){
@@ -1686,12 +1673,12 @@
List<String> textFieldNames = VciBaseUtil.str2List(wrapperOptions.getTextFieldName());
List<String> textValues = new LinkedList<>();
textFieldNames.stream().forEach( s->{
- textValues.add(cbo.getAttributeValue(s));
+ textValues.add(ObjectTool.getBOAttributeValue(cbo, s));
});
tree.setText(textValues.stream().collect(Collectors.joining(wrapperOptions.getTextValueSep())));
}
if(StringUtils.isNotBlank(wrapperOptions.getParentFieldName())){
- tree.setParentId(cbo.getAttributeValue(wrapperOptions.getParentFieldName()));
+ tree.setParentId(ObjectTool.getBOAttributeValue(cbo, wrapperOptions.getParentFieldName()));
}
if(wrapperOptions.isAllAttributes()) {
try {
@@ -1735,23 +1722,23 @@
return allTree;
}
- public static com.vci.client.bof.ClientBusinessObject arryAndSqlToClientBusinessObject(String sqlStr,String[] valueArry) {
- com.vci.client.bof.ClientBusinessObject clientBusinessObject = new com.vci.client.bof.ClientBusinessObject();
+ public static BusinessObject arryAndSqlToBusinessObject(String sqlStr,String[] valueArry) {
+ BusinessObject BusinessObject = new BusinessObject();
try {
PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse(sqlStr);
- com.vci.corba.omd.data.AttributeValue[] attributeValues = new com.vci.corba.omd.data.AttributeValue[valueArry.length];
+ AttributeValue[] attributeValues = new AttributeValue[valueArry.length];
for (int i = 0; i < select.getSelectItems().size(); i++) {
SelectItem selectItem = select.getSelectItem(i);
- com.vci.corba.omd.data.AttributeValue attributeValue = new com.vci.corba.omd.data.AttributeValue();
+ AttributeValue attributeValue = new AttributeValue();
attributeValue.attrName = selectItem.getAlias().getName();
attributeValue.attrVal = valueArry[i];
attributeValues[i] = attributeValue;
}
- clientBusinessObject.getBusinessObject().newAttrValList= attributeValues;
+ BusinessObject.newAttrValList= attributeValues;
}catch (Exception e){
logger.error("鏁版嵁瑙ｆ瀽閿欒",e);
return null;
}
- return clientBusinessObject;
+ return BusinessObject;
}
}
--
Gitblit v1.9.3