From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
index 5aac379..e0f7987 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
@@ -1,22 +1,22 @@
package com.vci.frameworkcore.compatibility.impl;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.OrgDeptForPlatform1;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
+import com.vci.frameworkcore.model.SmPasswordStrategyDO;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.omd.utils.ObjectTool;
-import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.SmPasswordStrategyDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.Func;
+import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +24,7 @@
import org.springframework.util.CollectionUtils;
import java.util.*;
-import java.util.function.Function;
import java.util.stream.Collectors;
-
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
@@ -50,6 +48,12 @@
private SmUserQueryServiceI smUserQueryService;
/**
+ * 骞冲彴璋冪敤瀹㈡埛绔�
+ */
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
+
+ /**
* 鑾峰彇榛樿瀵嗙爜绛栫暐
* @return
*/
@@ -66,6 +70,30 @@
return pwdStrategyDO2VO(passwordStrategyDO);
}
return null;
+ }
+
+ /**
+ * 瀵嗙爜绛栫暐鍒嗛〉鏌ヨ
+ * @param conditionMap
+ * @param pageHelper
+ * @return
+ */
+ @Override
+ public DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) {
+ return null;
+ }
+
+ /**
+ * 淇濆瓨鐢ㄦ埛鍏宠仈瀵嗙爜绛栫暐
+ * @param userIds
+ * @param passwordStrategId
+ * @return
+ */
+ @Override
+ public boolean saveUserPasswordStrateg(String[] userIds, String passwordStrategId) throws PLException {
+ VciBaseUtil.alertNotNull(userIds,"鐢ㄦ埛涓婚敭",passwordStrategId,"瀵嗙爜瀹夊叏绛栫暐涓婚敭");
+ //TODO锛氳繖閲屾病鏈夊仛鏌ラ噸澶勭悊锛屾槑澶╄寰楅獙璇佷竴涓嬭繖鍎挎槸涓嶆槸浼氳嚜鍔ㄥ仛saveOrUpdate鐨勫鐞�
+ return platformClientUtil.getFrameworkService().saveUserPasswordStrateg(userIds,passwordStrategId,new UserEntityInfo());
}
/**
@@ -163,10 +191,10 @@
@Override
public SmPasswordStrategyVO getPasswordStrategyVOByUserOid(String userOid) throws PLException {
WebUtil.alertNotNull(userOid,"鐢ㄦ埛鐨勪富閿�");
- if(smUserQueryService.checkUserExist(null,userOid)){
+ if(!smUserQueryService.checkUserExist(null,userOid)){
throw new VciBaseException(DATA_OID_NOT_EXIST);
}
- String sql = "select plpasswordstrategyuid,pluseruid from pluserpasswordstrategy where pluseruid = '"+ userOid +"')";
+ String sql = "select plpasswordstrategyuid,pluseruid from pluserpasswordstrategy where pluseruid = '"+ userOid +"'";
List<BusinessObject> cbos = boService.queryBySql(sql, null);
if(Func.isNotEmpty(cbos)){
return getPasswordStrategyVOByOid(ObjectTool.getNewBOAttributeValue(cbos.get(0), "plpasswordstrategyuid"));
--
Gitblit v1.9.3