From 37d730454255d0680c2bc4f1e15dc5cd1a55e6a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 十月 2024 09:58:36 +0800
Subject: [PATCH] 部门分配成员接口和界面传参修改，枚举修改报错修复提交
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 85 ++++--------------------------------------
1 files changed, 8 insertions(+), 77 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index 8f0ec19..8fbdc66 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -3,29 +3,26 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.mw.ClientContextVariable;
import com.vci.client.mw.LaunchModeEnum;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.FrameworkServicePrx;
import com.vci.corba.omd.data.AttributeValue;
-import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.SessionStorageTypeEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.interceptor.VciSessionForLoginI;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.properties.VciSessionProperties;
import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.OsAttributeVO;
+import com.vci.pagemodel.OsAttributeVO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.VciMdServiceI;
-import com.vci.web.service.WebSecretServiceI;
import com.vci.web.service.impl.UIEngineServiceImpl;
-import com.vci.web.service.impl.WebContextInfoFetcher;
-import com.vci.web.service.impl.WebInitServiceImpl;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -37,16 +34,14 @@
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.ResourceUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -58,29 +53,16 @@
@Component
public class VciWebInitTaskComponent implements ApplicationRunner {
-
/**
* 鏃ュ織瀵硅薄
*/
private Logger logger = LoggerFactory.getLogger(getClass());
/**
- * 鍒濆鍖栫殑鏈嶅姟
- */
- @Autowired
- private WebInitServiceImpl initService;
-
- /**
* 鏄惁鍏煎
*/
@Value("${user-table-compatibility:}")
private String compatibility;
-
- /**
- * 涓婁笅鏂囨敞鍐�
- */
- @Autowired
- private WebContextInfoFetcher contextInfoFetcher;
/**
* 閰嶇疆瀵硅薄
@@ -101,11 +83,6 @@
private VciSessionProperties sessionProperties;
/**
- * 浼氳瘽澶勭悊
- */
- @Autowired
- private VciSessionForLoginI sessionForLogin;
- /**
* 寮曞叆鍏煎鐨勯厤缃�
*/
@Autowired(required = false)
@@ -123,17 +100,6 @@
@Autowired
private VciMdServiceI mdService;
- /**
- * 瀵嗙骇鏈嶅姟
- */
- @Autowired
- private WebSecretServiceI secretService;
-
-// /**
-// * corba鐨勫鎴风
-// */
-// @Autowired(required = false)
-// private JacorbClientMapProperties jacorbClientMapProperties;
/**
* 鎵ц鍒濆鍖�
@@ -142,14 +108,13 @@
@Override
public void run(ApplicationArguments args) {
initCompatibility();
- initCorbaFromConf();
initSysadmin();
initClearSession();
initSetting();
// secretService.getMinDataSecret();
// secretService.getMinIpSecret();
// secretService.getMinUserSecret();
- initService.clearAllCache();
+// initService.clearAllCache();
// initService.initServerCache();
mdService.scanAllMdFile();
initDefaultAttribute();
@@ -235,38 +200,6 @@
}
/**
- * 浠庡钩鍙扮殑閰嶇疆涓幏鍙朿onf鐨勪俊鎭�
- */
- public void initCorbaFromConf(){
- File file = null;
- try {
- file = ResourceUtils.getFile("classpath:properties/corba.properties");
- } catch (FileNotFoundException e) {
- try {
- file = ResourceUtils.getFile("classpath:corba.properties");
- } catch (FileNotFoundException fileNotFoundException) {
- logger.info("杩欎釜鐜閲屾病鏈夊瓨鏀惧钩鍙扮殑corba閰嶇疆鏂囦欢",fileNotFoundException);
- }
- }
- try {
- if (file.exists()) {
- Properties properties = new Properties();
- properties.load(new FileInputStream(file));
- String url = properties.getProperty("NameService");
- String name = properties.getProperty("InstanceIdentity");
-// if (StringUtils.isNotBlank(url)) {
-// jacorbClientMapProperties.setUrl(url);
-// }
-// if (StringUtils.isNotBlank(name)) {
-// jacorbClientMapProperties.setInstanceIdentity(name);
-// }
- }
- }catch (IOException e) {
- logger.error("璇诲彇骞冲彴鐨刢orb閰嶇疆鏂囦欢鍑虹幇浜嗛敊璇�",e);
- }
- }
-
- /**
* 鍒濆鍖栫敤鎴�
*/
public void initSysadmin(){
@@ -284,8 +217,6 @@
public void initSetting() {
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛----");
ClientContextVariable.setClientLanuchMode(LaunchModeEnum.WebApp);
-// InvocationUtility.registerIInvocationContext(contextInfoFetcher);
-// JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛瀹屾垚----");
System.out.println("----寮�濮嬫壂鎻忔湁VciConfigModule娉ㄨВ鐨勭被----");
String[] namesForAnnotation = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(VciConfigModule.class);
--
Gitblit v1.9.3