From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
index f2bcbb8..b6e9a52 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
@@ -1,23 +1,28 @@
package com.vci.rmip.code.client.codeapply.Apply410;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.*;
import com.vci.base.ui.tree.VCIBaseTreeNode;
+import com.vci.rmip.code.client.codeapply.Apply410.enums.VciFieldTypeEnum;
import com.vci.rmip.code.client.codeapply.Apply410.object.*;
-import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeBasicSecVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeClassifyTemplateAttrVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeFixedValueVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeRuleVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.KeyValue;
import com.vci.rmip.code.client.codeapply.Apply410.swing.IntegerTextField;
import com.vci.rmip.code.client.codeapply.Apply410.swing.RealTextField;
import com.vci.rmip.code.client.codeapply.Apply410.swing.VCIJComboxBox;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.BeanUtilForVCI;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
-import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.ubcs.starter.web.pagemodel.KeyValue;
-import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.VciBaseUtil;
+
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.type.TypeReference;
import javax.swing.*;
import javax.swing.text.JTextComponent;
@@ -27,6 +32,7 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -83,7 +89,7 @@
private StringBuffer tempStr= new StringBuffer();//鍙彉鐮佹鐨勫��;
private String levelRes="";
private String[] specialSecVals = new String[0];
- private RMDataTransmitObject transmitForRMData = null;
+ private RMDataTransmitObject transmitForRMData = new RMDataTransmitObject();
private CodeRuleVO codeRuleVO=null;
/**
* 瀛樺偍灞炴�у拰鍊肩殑Map,key,鐢ㄤ簬榛樿鍊肩殑鏄剧ず
@@ -162,13 +168,16 @@
ObjectMapper objectMapper = new ObjectMapper();
try {
codeRuleVO = objectMapper.readValue(object.toString(),CodeRuleVO.class);
- } catch (JsonProcessingException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
+
}
}else{
- VCIOptionPane.showMessage(this,r.getMsg());
- }
+ /* if(!r.getMsg().equals("褰撳墠涓婚搴撳垎绫伙紝浠ュ強瀹冪殑鎵�鏈夌殑涓婄骇鍒嗙被閮芥病鏈夎缃紪鐮佽鍒�")){
+ VCIOptionPane.showMessage(this,r.getMsg());
+ }*/
+ }
/**鍔犺浇瑙勫垯瀵瑰簲鐨勭爜娈典俊鎭�**/
if(codeRuleVO!=null){
List<CodeBasicSecVO> codeBasicSecVOList=codeRuleVO.getSecVOList();
@@ -480,7 +489,7 @@
String classifyLevel = tempPropObj.getClassifyInvokeLevel();
String classifyInvokeAttr= tempPropObj.getClassifyInvokeAttr();
JComponent compt = attrInnerNameToCtrlMaps.get(innerName);
- if(StringUtils.isNotBlank(classifyLevel)&&!classifyLevel.equals("none")&&!classifyLevel.equals("min")) {
+ if(StringUtils.isNotBlank(classifyLevel)&&!classifyLevel.equals("none")) {
compt.setEnabled(false);
//ClassifyLevel classifyLevelObj=new ClassifyLevel();
//ObjectMapper objectMapper = new ObjectMapper();
@@ -581,7 +590,7 @@
if(object!=null) {
ObjectMapper objectMapper = new ObjectMapper();
try {
- codeClassifyValueList = objectMapper.readValue(object.toString(), new com.fasterxml.jackson.core.type.TypeReference<List<CodeClassifyValue>>() {});
+ codeClassifyValueList = objectMapper.readValue(object.toString(), new TypeReference<List<CodeClassifyValue>>() {});
} catch (JsonProcessingException e) {
e.printStackTrace();
}
@@ -638,6 +647,7 @@
}
for (CodeFixedValueVO codeFixedValueVO : fixedValueVOList) {
CodeFixedValue codeFixedValue=new CodeFixedValue();
+
BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueVO,codeFixedValue);
secCombo.addItem(codeFixedValue);
}
@@ -1055,10 +1065,10 @@
}
boolean enabled = true;
- /*// 闆嗗洟浠ｇ爜銆侀泦鍥㈤檮鍔犵爜涓嶅彲浠ユ墜宸ュ綍鍏ユ暟鎹�
- if (attrObj.getId().equals(Constants.GROUP_CODE_INNERNAME)|| attrObj.getInternalname().equals(Constants.GROUP_ADD_CODE_INNERNAME)) {
+ // 闆嗗洟浠ｇ爜銆侀泦鍥㈤檮鍔犵爜涓嶅彲浠ユ墜宸ュ綍鍏ユ暟鎹�
+ if (attrObj.getId().toLowerCase().equals("groupcode")) {
enabled = false;
- }*/
+ }
compt.setEnabled(enabled);
}
@@ -1090,9 +1100,9 @@
if(object!=null) {
ObjectMapper objectMapper = new ObjectMapper();
try {
- keyValueList = objectMapper.readValue(object.toString(), new com.fasterxml.jackson.core.type.TypeReference<List<KeyValue>>() {
+ keyValueList = objectMapper.readValue(object.toString(), new TypeReference<List<KeyValue>>() {
});
- } catch (JsonProcessingException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
}
--
Gitblit v1.9.3