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/CodeApplyPanelFor410.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
index c63e3ee..e3096f1 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
@@ -1,7 +1,5 @@
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.VCISwingUtil;
import com.vci.base.ui.swing.components.*;
@@ -9,14 +7,17 @@
import com.vci.base.ui.tree.VCIBaseTreeModel;
import com.vci.base.ui.tree.VCIBaseTreeNode;
import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassifyTemplateVO;
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeClassifyVO;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
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.event.TreeSelectionEvent;
@@ -24,6 +25,7 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
@@ -183,9 +185,12 @@
if(object!=null) {
ObjectMapper objectMapper = new ObjectMapper();
try {
- codeClassifyList = objectMapper.readValue(object.toString(), new com.fasterxml.jackson.core.type.TypeReference<List<CodeClassify>>() {
- });
- } catch (JsonProcessingException e) {
+ // codeClassifyList = objectMapper.readValue(object.toString(), new TypeReference<List<CodeClassify>();
+
+ codeClassifyList = objectMapper.readValue(object.toString(), new TypeReference<List<CodeClassify>>(){});
+
+ }catch (IOException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
}
}
@@ -288,8 +293,9 @@
setCurrentCodeClassifyTemplateVO(codeClassifyTemplateVO);
res = true;
}
- } catch (JsonProcessingException e) {
- e.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
}
}
}/*else{
@@ -334,7 +340,7 @@
setCurrentCodeClassifyTemplateVO(codeClassifyTemplateVO);
res=true;
}
- } catch (JsonProcessingException e1) {
+ } catch (IOException e1) {
e1.printStackTrace();
}
}
--
Gitblit v1.9.3