From cc6354cee46ff8facbd16c8919f2616c9031acdb Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 21 六月 2024 10:19:59 +0800
Subject: [PATCH] 1、三元账号验证修改，以及获取数据修改
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 45314e6..60555d1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,12 +1,13 @@
package com.vci.frameworkcore.compatibility.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.UserInfo;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -33,7 +34,7 @@
import java.util.stream.Collectors;
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
-import static com.vci.web.util.WebUtil.arryAndSqlToClientBusinessObject;
+import static com.vci.web.util.WebUtil.arryAndSqlToBusinessObject;
/**
* 鐢ㄦ埛鐨勬煡璇㈢浉鍏崇殑鏈嶅姟锛屽彲浠ュ吋瀹硅�佸钩鍙板拰鑰佺殑pdm
@@ -147,9 +148,9 @@
" left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapper.getTableNick() + ".pluid = pkUserPassword.pluseruid " +
queryWrapper.getLinkTableSql() + (StringUtils.isNotBlank(queryWrapper.getWhereSql())?(" where " + queryWrapper.getWhereSql()):"");
try{
- String[][] sqlQueryResult = ServiceProvider.getBOFService().getSqlQueryResult(sql + fromSql, null);
+ String[][] sqlQueryResult = platformClientUtil.getBOFService().getSqlQueryResult(sql + fromSql, null);
if(sqlQueryResult.length>0){
- com.vci.client.bof.ClientBusinessObject cbo = arryAndSqlToClientBusinessObject(queryWrapper.getSelectFieldSql(),sqlQueryResult[0]);
+ BusinessObject cbo = arryAndSqlToBusinessObject(queryWrapper.getSelectFieldSql(),sqlQueryResult[0]);
return cbo2VO(cbo);
}
}catch (Exception e){
@@ -177,7 +178,7 @@
+ " left join pluserdept up on " + queryWrapper.getTableNick() + ".pluid = up.pluseruid left join pldept pkDepartment on up.pldeptuid = pkDepartment.pluid " +
" left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapper.getTableNick() + ".pluid = pkUserPassword.pluseruid " +
queryWrapper.getLinkTableSql() + (StringUtils.isNotBlank(queryWrapper.getWhereSql())?(" where " + queryWrapper.getWhereSql()):"");
- List<com.vci.client.bof.ClientBusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
+ List<BusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
if(!CollectionUtils.isEmpty(dataList)){
dataList.stream().forEach(cbo->{
userVOList.add(cbo2VO(cbo));
@@ -286,7 +287,7 @@
+ " left join pluserdept up on " + queryWrapper.getTableNick() + ".pluid = up.pluseruid left join pldept pkDepartment on up.pldeptuid = pkDepartment.pluid " +
" left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapper.getTableNick() + ".pluid = pkUserPassword.pluseruid " + (QUERY_FIELD_ROLE.equalsIgnoreCase(queryField)?roleSql:"") +
queryWrapper.getLinkTableSql() + (StringUtils.isNotBlank(queryWrapper.getWhereSql())?(" where " + queryWrapper.getWhereSql()):"");
- List<com.vci.client.bof.ClientBusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
+ List<BusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
if(!CollectionUtils.isEmpty(dataList)){
dataList.stream().forEach(cbo->{
userVOList.add(cbo2VO(cbo));
@@ -300,7 +301,7 @@
* @param cbo 涓氬姟鏁版嵁
* @return 鏄剧ず瀵硅薄
*/
- private SmUserVO cbo2VO(com.vci.client.bof.ClientBusinessObject cbo){
+ private SmUserVO cbo2VO(BusinessObject cbo){
SmUserDO userDO = new SmUserDO();
SmUserVO userVO = new SmUserVO();
WebUtil.copyValueToObjectFromCbos(cbo,userDO);
@@ -354,7 +355,7 @@
}
}
}
- List<com.vci.client.bof.ClientBusinessObject> dataList = boService.queryBySql((isPage?("select " + pageSelectList.stream().collect(Collectors.joining(","))+ " from (select A.*,rownum RN from ( "):"") + sql + fromSql + (isPage?pageSubfix:""), null);
+ List<BusinessObject> dataList = boService.queryBySql((isPage?("select " + pageSelectList.stream().collect(Collectors.joining(","))+ " from (select A.*,rownum RN from ( "):"") + sql + fromSql + (isPage?pageSubfix:""), null);
if(!CollectionUtils.isEmpty(dataList)){
dataList.stream().forEach(cbo->{
userVOList.add(cbo2VO(cbo));
@@ -670,13 +671,13 @@
+ " left join pluserdept up on " + queryWrapper.getTableNick() + ".pluid = up.pluseruid left join pldept pkDepartment on up.pldeptuid = pkDepartment.pluid " +
" left join PLUSERPASSWORDSTRATEGY pkUserPassword on " +queryWrapper.getTableNick() + ".pluid = pkUserPassword.pluseruid " +
queryWrapper.getLinkTableSql() + (StringUtils.isNotBlank(queryWrapper.getWhereSql())?(" where " + queryWrapper.getWhereSql()):"");
- List<com.vci.client.bof.ClientBusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
+ List<BusinessObject> dataList = boService.queryBySql(sql + fromSql, null);
List<Tree> treeList = new ArrayList<>();
if(!CollectionUtils.isEmpty(dataList)){
dataList.stream().forEach(cbo->{
Tree tree = new Tree();
- tree.setOid(cbo.getOid());
- tree.setText(cbo.getId() + " " + cbo.getName());
+ tree.setOid(cbo.oid);
+ tree.setText(cbo.id + " " + cbo.name);
Map<String,String> attributeMap = new HashMap<>();
WebUtil.copyValueToCboFromMap(cbo,attributeMap);
tree.setAttributes(attributeMap);
@@ -700,15 +701,15 @@
String sql = " select plpassword from pluser where pluid = :userOid";
Map<String,String> conditionMap = new HashMap<>();
conditionMap.put("userOid",userOid.trim());
- List<com.vci.client.bof.ClientBusinessObject> clientBusinessObjectList = boService.queryBySql(sql, conditionMap);
- if(CollectionUtils.isEmpty(clientBusinessObjectList)){
+ List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
+ if(CollectionUtils.isEmpty(BusinessObjectList)){
return false;
}
ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
md5Password = des.getEncString(md5Password);
- if(md5Password.equals(clientBusinessObjectList.get(0).getAttributeValue("plpassword"))){
+ if(md5Password.equals(ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0),"plpassword"))){
return true;
}
return false;
@@ -743,7 +744,7 @@
public SmPasswordStrategyVO getPasswordStrategyVOByOid(String oid){
VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(null, SmPasswordStrategyDO.class);
queryWrapperForDO.eq("oid",oid.trim());
- List<com.vci.client.bof.ClientBusinessObject> cboList = boService.queryBySql(queryWrapperForDO.getSelectFieldSql() + " from plpasswordstrategy " +
+ List<BusinessObject> cboList = boService.queryBySql(queryWrapperForDO.getSelectFieldSql() + " from plpasswordstrategy " +
queryWrapperForDO.getTableNick() + queryWrapperForDO.getLinkTableSql() +
(StringUtils.isBlank(queryWrapperForDO.getWhereSql()) ? "" : (" where " + queryWrapperForDO.getWhereSql())), null);
if(!CollectionUtils.isEmpty(cboList)){
--
Gitblit v1.9.3