From 4d3f7f10d422fd6eee128fa32bc48ce7b10ec09d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期二, 07 一月 2025 18:24:21 +0800
Subject: [PATCH] 属性定义参照类型改成下拉树选择，处理值域显示不正确的问题，属性名选择改为下拉搜索
---
Source/Service/FrameService/src/com/vci/server/framework/volume/delegate/PvolumeDelegate.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Source/Service/FrameService/src/com/vci/server/framework/volume/delegate/PvolumeDelegate.java b/Source/Service/FrameService/src/com/vci/server/framework/volume/delegate/PvolumeDelegate.java
index f93917e..39a7d6f 100644
--- a/Source/Service/FrameService/src/com/vci/server/framework/volume/delegate/PvolumeDelegate.java
+++ b/Source/Service/FrameService/src/com/vci/server/framework/volume/delegate/PvolumeDelegate.java
@@ -5,19 +5,19 @@
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import com.vci.common.log.LogType;
import com.vci.common.objects.UserEntity;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.VCIError;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.PvolumeInfo;
+import com.vci.corba.log.data.LogType;
import com.vci.server.base.delegate.BaseDelegate;
import com.vci.server.base.delegate.UserEntityDelegate;
+import com.vci.server.base.utility.LogRecordUtil;
import com.vci.server.cache.VolumeCacheProvider;
-import com.vci.server.framework.systemConfig.log.LogRecordUtil;
+import com.vci.server.framework.cache.VolumeCatch;
import com.vci.server.framework.volume.dao.Pvolume;
import com.vci.server.framework.volume.service.PvolumeService;
-import com.vci.server.framework.volume.service.VolumeCatch;
public class PvolumeDelegate extends BaseDelegate {
@@ -46,14 +46,14 @@
}
Pvolume pvolume = changePvolumeInfoToPvolume(pvolumeInfo);
- UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
+ //UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
try {
//createFileCabinet(pvolume.getPath());
boolean success = pvoSer.savePvolume(pvolume);
if (success) {
VolumeCatch.setVolume(pvolumeInfo);
}
- LogRecordUtil.writeLog(userEntity, "娣诲姞", success ? "娣诲姞鎴愬姛" : "娣诲姞澶辫触", pvolume.getLogInfo(),LogType.GeneralOperation,pvolume.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "娣诲姞", success ? "娣诲姞鎴愬姛" : "娣诲姞澶辫触", pvolume.getLogInfo(),LogType.General,pvolume.getId());
} catch (Exception e) {
throw new VCIError("310100",new String[0]);
}
@@ -135,7 +135,7 @@
UserEntityDelegate.setUserEntityToService(pvoSer, userEntityInfo);
Pvolume pvolume = changePvolumeInfoToPvolume(pvoInfo);
- UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
+ //UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
try{
Pvolume pvolumeBefore = pvoSer.getProlumeById(pvolume.getId());
boolean success = pvoSer.updatePvolume(pvolume);
@@ -145,9 +145,9 @@
StringBuilder logres = new StringBuilder();
logres.append("鏇存柊鍓嶏細"+pvolumeBefore.getLogInfo());
logres.append("鏇存柊鍚庯細"+pvolume.getLogInfo());
- LogRecordUtil.writeLog(userEntity, "鏇存柊", success ? "淇敼鎴愬姛" : "淇敼澶辫触", logres.toString(), LogType.GeneralOperation,pvolumeBefore.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鏇存柊", success ? "淇敼鎴愬姛" : "淇敼澶辫触", logres.toString(), LogType.General,pvolumeBefore.getId());
}catch(Exception e){
- LogRecordUtil.writeLog(userEntity, "鏇存柊", "淇敼澶辫触", e.getMessage(), LogType.GeneralOperation, pvoInfo.id);
+ LogRecordUtil.writeLog(userEntityInfo, "鏇存柊", "淇敼澶辫触", e.getMessage(), LogType.General, pvoInfo.id);
throw new VCIError("310103", new String[0]);
}
@@ -163,7 +163,7 @@
*/
public boolean deletePvolume(String[] ids, UserEntityInfo userEntityInfo) throws VCIError {
UserEntityDelegate.setUserEntityToService(pvoSer, userEntityInfo);
- UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
+ //UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
try {
List<Pvolume> list = new ArrayList<Pvolume>();
@@ -176,7 +176,7 @@
for (Pvolume vol : list) {
String volId = vol.getId();
VolumeCatch.delVolume(vol.getName());
- LogRecordUtil.writeLog(userEntity, "鍒犻櫎", "鍒犻櫎鎴愬姛", volId, LogType.GeneralOperation, vol.getLogInfo());
+ LogRecordUtil.writeLog(userEntityInfo, "鍒犻櫎", "鍒犻櫎鎴愬姛", volId, LogType.General, vol.getLogInfo());
}
} catch (Exception e) {
throw new VCIError("310104", new String[0]);
@@ -191,7 +191,7 @@
public void updatePvolumeInvalid(UserEntityInfo userEntityInfo)throws VCIError{
UserEntityDelegate.setUserEntityToService(pvoSer, userEntityInfo);
- UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
+ //UserEntity userEntity = changeUserEntityInfoToUserEntity(userEntityInfo);
Pvolume pvo = pvoSer.getIsvalidVolumeName();
try{
@@ -202,10 +202,10 @@
logres.append("鏇存柊鍓嶏細"+pvo.getLogInfo()+"涓洪閫夎矾寰勶紒");
pvo.setIsvalid(false);
logres.append(" 鏇存柊鍚�:"+pvo.getLogInfo()+"涓嶄负棣栭�夎矾寰�");
- LogRecordUtil.writeLog(userEntity, "鏇存柊", "淇敼鎴愬姛", logres.toString(), LogType.GeneralOperation,pvo.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鏇存柊", "淇敼鎴愬姛", logres.toString(), LogType.General,pvo.getId());
}
}catch(Exception e){
- LogRecordUtil.writeLog(userEntity, "鏇存柊", "淇敼澶辫触", e.getMessage(), LogType.GeneralOperation,pvo.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鏇存柊", "淇敼澶辫触", e.getMessage(), LogType.General,pvo.getId());
throw new VCIError("310105", new String[0]);
}
}
--
Gitblit v1.9.3