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/Service/FrameService/src/com/vci/server/framework/FrameworkServiceImpl.java | 228 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 112 insertions(+), 116 deletions(-)
diff --git a/Source/Service/FrameService/src/com/vci/server/framework/FrameworkServiceImpl.java b/Source/Service/FrameService/src/com/vci/server/framework/FrameworkServiceImpl.java
index 92ed536..a8da329 100644
--- a/Source/Service/FrameService/src/com/vci/server/framework/FrameworkServiceImpl.java
+++ b/Source/Service/FrameService/src/com/vci/server/framework/FrameworkServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.server.framework;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import com.vci.common.ServiceNames;
@@ -17,8 +18,6 @@
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.FuncOperationInfo;
import com.vci.corba.framework.data.FunctionInfo;
-import com.vci.corba.framework.data.LogInfo;
-import com.vci.corba.framework.data.LogPeriodInfo;
import com.vci.corba.framework.data.MachSecurityInfo;
import com.vci.corba.framework.data.OperateInfo;
import com.vci.corba.framework.data.PasswordStrategyInfo;
@@ -27,31 +26,23 @@
import com.vci.corba.framework.data.RoleRightInfo;
import com.vci.corba.framework.data.SpecialCharClsfInfo;
import com.vci.corba.framework.data.SpecialCharInfo;
-//import com.vci.corba.framework.data.SpecialRoleInfo;
import com.vci.corba.framework.data.SpecialtyInfo;
-import com.vci.corba.framework.data.SystemCfgInfo;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.UserInfo;
import com.vci.corba.framework.data.UserLogonInfo;
-import com.vci.corba.framework.method.FrameworkService;
+import com.vci.corba.framework.FrameworkService;
import com.vci.server.BaseService;
import com.vci.corba.framework.data.CheckValue;
import com.vci.corba.framework.data.GrandValue;
-import com.vci.server.framework.appConfig.AppConfigDetailCatch;
-import com.vci.server.framework.cache.DeptCacheUtil;
-import com.vci.server.framework.cache.RoleCacheUtil;
-import com.vci.server.framework.cache.UserCacheUtil;
import com.vci.server.framework.delegate.AppConfigCategoryDelegate;
import com.vci.server.framework.delegate.AppConfigDetailDelegate;
import com.vci.server.framework.delegate.DataTypeRightDelegate;
import com.vci.server.framework.delegate.FuncOperationDelegate;
import com.vci.server.framework.delegate.FunctionDelegate;
-import com.vci.server.framework.delegate.LogManagementDelegate;
import com.vci.server.framework.delegate.MachSecurityDelegate;
import com.vci.server.framework.delegate.OperateDelegate;
import com.vci.server.framework.delegate.RightManagementDelegate;
import com.vci.server.framework.delegate.RoleRightDelegate;
-//import com.vci.server.framework.delegate.SpecialRoleDelegate;
import com.vci.server.framework.delegate.SystemCfgDelegate;
import com.vci.server.framework.volume.delegate.PvolumeDelegate;
import com.zeroc.Ice.Current;
@@ -69,10 +60,10 @@
private RightManagementDelegate rightmanagementDelegate = new RightManagementDelegate(); //鏉冮檺鐨刣elegate
public FrameworkServiceImpl() {
- AppConfigDetailCatch.InitCatch();
- UserCacheUtil.initCache();
- DeptCacheUtil.initCache();
- RoleCacheUtil.initCache();
+// AppConfigDetailCatch.InitCatch();
+// UserCacheUtil.initCache();
+// DeptCacheUtil.initCache();
+// RoleCacheUtil.initCache();
}
@@ -84,6 +75,11 @@
@Override
public boolean test(com.zeroc.Ice.Current current) {
+ String op = current.operation;
+ String adapter = current.adapter.getName();
+ String id = current.id.name;
+ String time = new Date().toString();
+ System.out.println(String.format("== %s [FrameworkService.test] (adapter=%s, id=%s, op=%s)", time, adapter, id, op));
return true;
}
@@ -119,59 +115,59 @@
}
- /*-------------------鏃ュ織绠＄悊妯″潡---------------------*/
-
- /**
- * 鍒濆鍖栨棩蹇楁ā鍧楁椂妫�鏌ユ槸鍚﹂厤缃簡鑷姩鍒犻櫎
- */
- @Override
- public boolean getIsAutoDelete(com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- boolean res = false;
- res = logDel.getIsAutoDelete();
- return res;
- }
-
-
-
- /**
- * 鑾峰彇閰嶇疆濂界殑鏃ュ織鏌ヨ椤甸潰鏄剧ず鏉℃暟
- */
- @Override
- public long getPageSize(com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.getPageSize();
- }
-
- /**
- * 鑾峰彇褰撳墠鏌ヨ鏃ュ織鐨勬�绘潯锟�?
- */
- @Override
- public long getSumLogRows(String sql, com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.getSumLogRows(sql);
- }
-
-
-
- /**
- * 鑾峰彇褰撳墠淇濆瓨/澶囦唤鏈熼檺
- */
- @Override
- public long getCurPeriod(String type, com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.getCurPeriod(type);
- }
-
- /**
- * 鎵嬪姩鍒犻櫎鏃ュ織
- */
- @Override
- public boolean deleteLog(String deleteDate, com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.deleteLog(deleteDate);
- }
-
+// /*-------------------鏃ュ織绠＄悊妯″潡---------------------*/
+//
+// /**
+// * 鍒濆鍖栨棩蹇楁ā鍧楁椂妫�鏌ユ槸鍚﹂厤缃簡鑷姩鍒犻櫎
+// */
+// @Override
+// public boolean getIsAutoDelete(com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// boolean res = false;
+// res = logDel.getIsAutoDelete();
+// return res;
+// }
+//
+//
+//
+// /**
+// * 鑾峰彇閰嶇疆濂界殑鏃ュ織鏌ヨ椤甸潰鏄剧ず鏉℃暟
+// */
+// @Override
+// public long getPageSize(com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.getPageSize();
+// }
+//
+// /**
+// * 鑾峰彇褰撳墠鏌ヨ鏃ュ織鐨勬�绘潯锟�?
+// */
+// @Override
+// public long getSumLogRows(String sql, com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.getSumLogRows(sql);
+// }
+//
+//
+//
+// /**
+// * 鑾峰彇褰撳墠淇濆瓨/澶囦唤鏈熼檺
+// */
+// @Override
+// public long getCurPeriod(String type, com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.getCurPeriod(type);
+// }
+//
+// /**
+// * 鎵嬪姩鍒犻櫎鏃ュ織
+// */
+// @Override
+// public boolean deleteLog(String deleteDate, com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.deleteLog(deleteDate);
+// }
+//
/**
@@ -836,33 +832,33 @@
public void deblock(String[] ids,UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
rightmanagementDelegate.deblock(ids,userEntityInfo);
}
+//
+// @Override
+// public LogPeriodInfo[] getPeriods(com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.getPeriods();
+// }
- @Override
- public LogPeriodInfo[] getPeriods(com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.getPeriods();
- }
-
- @Override
- public LogInfo[] fetchLogInfo(long pageNo, long pagesize, String sql, com.zeroc.Ice.Current current)
- throws VCIError {
- LogManagementDelegate logDel = new LogManagementDelegate();
- return logDel.fetchLogInfo((int)pageNo,(int)pagesize,sql);
- }
-
- @Override
- public LogInfo[] getLogListByContion(long pageNo, long pagesize, String sql, com.zeroc.Ice.Current current)
- throws VCIError {
- LogManagementDelegate logDelegate = new LogManagementDelegate();
- return logDelegate.getLogListByContion((int)pageNo,(int)pagesize,sql);
- }
-
- @Override
- public boolean savePeriod(SystemCfgInfo period,
- UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
- LogManagementDelegate logDelegate = new LogManagementDelegate();
- return logDelegate.savePeriod(period,userEntityInfo);
- }
+// @Override
+// public LogInfo[] fetchLogInfo(long pageNo, long pagesize, String sql, com.zeroc.Ice.Current current)
+// throws VCIError {
+// LogManagementDelegate logDel = new LogManagementDelegate();
+// return logDel.fetchLogInfo((int)pageNo,(int)pagesize,sql);
+// }
+//
+// @Override
+// public LogInfo[] getLogListByContion(long pageNo, long pagesize, String sql, com.zeroc.Ice.Current current)
+// throws VCIError {
+// LogManagementDelegate logDelegate = new LogManagementDelegate();
+// return logDelegate.getLogListByContion((int)pageNo,(int)pagesize,sql);
+// }
+//
+// @Override
+// public boolean savePeriod(SystemCfgInfo period,
+// UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
+// LogManagementDelegate logDelegate = new LogManagementDelegate();
+// return logDelegate.savePeriod(period,userEntityInfo);
+// }
@Override
public OperateInfo fetchOperateTypeByName(String name, com.zeroc.Ice.Current current) throws VCIError {
@@ -879,21 +875,21 @@
return rightmanagementDelegate.getRoleListByTypeForMeasure(type);
}
- @Override
- public void savelog(String message, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
- rightmanagementDelegate.savelog(message, userEntityInfo);
- }
- @Override
- public void saveLogV2(String result, String message, String type, short logTypeIntVal, String dataObjOid, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
- rightmanagementDelegate.saveLogV2(result, message, type, logTypeIntVal, dataObjOid, userEntityInfo);
- }
-
- @Override
- public void savelogfail(String message, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current)
- throws VCIError {
- rightmanagementDelegate.savelogfail(message, userEntityInfo);
-
- }
+// @Override
+// public void savelog(String message, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
+// rightmanagementDelegate.savelog(message, userEntityInfo);
+// }
+// @Override
+// public void saveLogV2(String result, String message, String type, short logTypeIntVal, String dataObjOid, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current) throws VCIError {
+// rightmanagementDelegate.saveLogV2(result, message, type, logTypeIntVal, dataObjOid, userEntityInfo);
+// }
+//
+// @Override
+// public void savelogfail(String message, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current)
+// throws VCIError {
+// rightmanagementDelegate.savelogfail(message, userEntityInfo);
+//
+// }
@Override
public RoleInfo[] fetchRoleInfoByUserNameAndPage(long pageNo, long pageSize,
@@ -1285,13 +1281,13 @@
}
return true;
}
- @Override
- public void blocklog(String userId, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current)
- throws VCIError {
- rightmanagementDelegate.blocklog(userId, userEntityInfo);
- // TODO Auto-generated method stub
-
- }
+// @Override
+// public void blocklog(String userId, UserEntityInfo userEntityInfo, com.zeroc.Ice.Current current)
+// throws VCIError {
+// rightmanagementDelegate.blocklog(userId, userEntityInfo);
+// // TODO Auto-generated method stub
+//
+// }
@Override
public UserInfo[] fetchUserInfoByConditionUnited(String searchName,
--
Gitblit v1.9.3