From 603cefa0114af539a25906c6fd8bf18b00737b31 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 十一月 2024 17:19:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
index 76e99b9..e42e7e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
@@ -1,13 +1,15 @@
package com.vci.web.service.impl;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmUserVO;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.constant.EnumIdConstant;
-import com.vci.web.pageModel.KeyValue;
+import com.vci.constant.EnumIdConstant;
+import com.vci.pagemodel.KeyValue;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.WebBoServiceI;
@@ -25,7 +27,8 @@
import java.util.Map;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST;
+
/**
* 瀵嗙骇鐨勬湇鍔�
@@ -314,10 +317,10 @@
Map<String,String> conditionMap = new HashMap<String, String>();
conditionMap.put("startip",ip.trim());
- List<com.vci.client.bof.ClientBusinessObject> ipCbos = boService.queryCBO(EnumIdConstant.IPSECRET_BTMNAME,conditionMap,null, Arrays.asList(new String[]{"ipsecret"}));
+ List<BusinessObject> ipCbos = boService.queryCBO(EnumIdConstant.IPSECRET_BTMNAME,conditionMap,null, Arrays.asList(new String[]{"ipsecret"}));
int ipSecret = 0;
if(ipCbos!=null&& ipCbos.size()>0){
- ipSecret = WebUtil.getInt(ipCbos.get(0).getAttributeValue("ipsecret"));
+ ipSecret = WebUtil.getInt(ObjectTool.getBOAttributeValue(ipCbos.get(0), "ipsecret"));
}
if(ipSecret == 0){
ipSecret = getMinIpSecret();
--
Gitblit v1.9.3