From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/Client/PLTClient/src/com/vci/client/framework/delegate/RightManagementClientDelegate.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/delegate/RightManagementClientDelegate.java b/Source/Client/PLTClient/src/com/vci/client/framework/delegate/RightManagementClientDelegate.java
index beb6721..f2c21f4 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/delegate/RightManagementClientDelegate.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/delegate/RightManagementClientDelegate.java
@@ -1,6 +1,5 @@
package com.vci.client.framework.delegate;
-import java.sql.Timestamp;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
@@ -21,11 +20,11 @@
import com.vci.client.common.objects.UserEntityObject;
import com.vci.client.common.objects.UserLogonObject;
import com.vci.client.common.objects.UserObject;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.client.framework.appConfig.object.AppConfigDetailObject;
import com.vci.client.framework.systemConfig.object.CombinationObject;
import com.vci.client.framework.systemConfig.object.CombinationValueObject;
import com.vci.client.framework.systemConfig.object.PasswordStrategyObject;
-import com.vci.client.omd.enumManager.ui.EnumClient;
import com.vci.client.ui.exception.VCIException;
import com.vci.corba.common.VCIError;
import com.vci.corba.common.data.VCIInvocationInfo;
@@ -38,6 +37,7 @@
import com.vci.corba.framework.data.UserLogonInfo;
import com.vci.corba.omd.etm.EnumChild;
import com.vci.corba.omd.etm.EnumItem;
+import com.vci.corba.log.data.LogType;
public class RightManagementClientDelegate extends ClientBaseDelegate {
@@ -1408,7 +1408,7 @@
// 浣跨敤IP瀵嗙骇鏋氫妇鐨勬渶灏忓��
EnumItem enumItem;
try {
- enumItem = EnumClient.getService().getEmItemByName("ipsecurityenum");
+ enumItem = ServiceProvider.getOMDService().getEnumService().getEmItemByName("ipsecurityenum");
List<EnumChild> childs = new LinkedList<EnumChild>();
if(enumItem == null || enumItem.children.length == 0) return "10";
for(EnumChild child : enumItem.children){
@@ -1547,18 +1547,21 @@
*/
public void savelog(String content) throws VCIException{
try{
- ClientSession.getFrameworkService().savelog(content, userEntityInfo);
+ ServiceProvider.getLogService().saveLoginLog(true, content, userEntityInfo);
}catch(VCIError e){
throw new VCIException(String.valueOf(e.code), e.messages);
}
}
+
+
public void saveLogV2(String result, String content, String type, int logTypeIntVal, String dataObjOid) throws VCIException{
try{
- ClientSession.getFrameworkService().saveLogV2(result, content, type, (short)logTypeIntVal, dataObjOid, userEntityInfo);
+ ServiceProvider.getLogService().saveLog(result, content, type, LogType.valueOf(logTypeIntVal), dataObjOid, userEntityInfo);
}catch(VCIError e){
throw new VCIException(String.valueOf(e.code), e.messages);
}
}
+
//add by caill start 2016.9.13鐢ㄦ埛琚攣瀹氱殑鏃ュ織
/**
*
@@ -1571,7 +1574,7 @@
*/
public void blocklog(String userId) throws VCIException{
try{
- ClientSession.getFrameworkService().blocklog(userId, userEntityInfo);
+ ServiceProvider.getLogService().saveLockLog(userId, userEntityInfo);
}catch(VCIError e){
throw new VCIException(String.valueOf(e.code), e.messages);
}
@@ -1588,12 +1591,12 @@
*/
public void savelogFail(String message) throws VCIException{
try{
- ClientSession.getFrameworkService().savelogfail(message, userEntityInfo);
+ ServiceProvider.getLogService().saveLoginLog(false, message, userEntityInfo);
}catch(VCIError e){
throw new VCIException(String.valueOf(e.code), e.messages);
}
-
}
+
/**
* 鍒嗛〉鏌ヨ瀵嗙爜缁勫悎鏂瑰紡
* <p>Description: </p>
--
Gitblit v1.9.3