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/CodeReferTreePanel.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java index 8094ad7..7fcef13 100644 --- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java +++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java @@ -1,8 +1,5 @@ package com.vci.rmip.code.client.codeapply.Apply410; -import com.alibaba.cloud.commons.lang.StringUtils; -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.VCIJPanel; import com.vci.base.ui.tree.VCIBaseTree; @@ -12,16 +9,22 @@ import com.vci.rmip.code.client.codeapply.Apply410.object.ReferTreObject; import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject; import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer; +import com.vci.rmip.code.client.codeapply.Apply410.object.tree.Tree; 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.pagemodel.Tree; 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.event.TreeExpansionEvent; import javax.swing.event.TreeExpansionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; + +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -68,13 +71,12 @@ Object object= r.getData(); if(object!=null) { // ObjectMapper objectMapper = new ObjectMapper(); - treeList = objectMapper.readValue(object.toString(), new com.fasterxml.jackson.core.type.TypeReference<List<Tree>>() {}); - treeList=treeList; + treeList = objectMapper.readValue(object.toString(), new TypeReference<List<Tree>>() {}); } }else{ VCIOptionPane.showMessage(this,r.getMsg()); } - } catch (JsonProcessingException e) { + } catch (IOException e) { e.printStackTrace(); } } -- Gitblit v1.9.3