From 978f74777e10a0531c4413ab36320d2be36f42ea Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 21:06:18 +0800
Subject: [PATCH] PDMjar包代码提交
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
index 23c6a08..78d5d39 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
@@ -1,26 +1,26 @@
package com.vci.rmip.code.client.codeapply.Apply410;
import cn.hutool.json.JSONUtil;
+
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTableNode;
-import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
import com.vci.rmip.code.client.codeapply.Apply410.object.Page;
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.VciBaseUtil;
import com.vci.base.ui.swing.VCIOptionPane;
-import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
-import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.config.CodeShowFieldConfigVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.config.CodeSrchCondConfigVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.model.BaseModel;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
-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.map.ObjectMapper;
+import java.io.IOException;
import java.util.*;
-import java.util.stream.Collectors;
public class CodeDataMainPanelDataProvider extends AbstractVCIJTableDataProvider<BaseModel> {
private CodeDataMainPanel ownerPanel;
@@ -37,12 +37,12 @@
LinkedList<String> nameList = new LinkedList<>();
LinkedList<String> fieldList = new LinkedList<>();
List<CodeShowFieldConfigVO> colsList=ownerPanel.getUiFormRefer().getCodeShowFieldConfigVOS();
- colsList.stream().forEach(columns->{
+ for (CodeShowFieldConfigVO columns : colsList) {
String title= columns.getTitle();
String field=columns.getField();
nameList.add(title);
fieldList.add(field);
- });
+ }
specialColumns = nameList.toArray(new String[]{});
fields = fieldList.toArray(new String[]{});
return specialColumns;
@@ -61,7 +61,7 @@
VCIJTableNode<BaseModel> res = new VCIJTableNode<BaseModel>(model);
int i=dataColumnStartIndex;
for (String field:fields){
- String data=defaultDataMap.getOrDefault(field,"");
+ String data=defaultDataMap.containsKey(field) ? defaultDataMap.get(field) : "" ;
res.setPropertyValue(getColumns()[i++], data);
}
return res;
@@ -81,19 +81,18 @@
List<CodeSrchCondConfigVO> codeSrchCondConfigVOS=uiFormRefer.getCodeSrchCondConfigVOS();
JSONObject jsonObject=new JSONObject();
if(!CollectionUtils.isEmpty(codeSrchCondConfigVOS)){
- codeSrchCondConfigVOS.stream().forEach(codeSrchCondConfigVO -> {
+ for (CodeSrchCondConfigVO codeSrchCondConfigVO : codeSrchCondConfigVOS) {
String field=codeSrchCondConfigVO.getFilterField();
String value=codeSrchCondConfigVO.getFilterValue();
String filterType= codeSrchCondConfigVO.getFilterType();
condtionMap.put("conditionMap["+field+"]",value);
- });
+ }
}
Map<String, String> customCondtionMap=ownerPanel.getCustomCondtionMap();
if(customCondtionMap!=null&&customCondtionMap.size()>0){
- customCondtionMap.forEach((field, value) -> {
- condtionMap.put("conditionMap["+field+"]",value);
- });
-
+ for(String field : customCondtionMap.keySet()){
+ condtionMap.put("conditionMap["+field+"]",customCondtionMap.get(field));
+ }
}
Map<String,String> headerMap=new HashMap<>();
headerMap.put("Blade-Auth",this.ownerPanel.getTokenUserObject().getAccess_token());
@@ -109,14 +108,17 @@
}else{
VCIOptionPane.showMessage(this.ownerPanel,r.getMsg());
}
- } catch (JsonProcessingException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
this.total= new Long(iPage.getTotal()).intValue();
List dataList= iPage.getRecords();
BaseModel [] baseModels=new BaseModel[]{};
if(!CollectionUtils.isEmpty(dataList)) {
- List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());
+ List<BaseModel> hostInfos = new ArrayList<>();
+ for (Object entity : dataList) {
+ hostInfos.add(JSONUtil.toBean(JSONUtil.parseObj(entity),BaseModel.class));
+ }
baseModels = hostInfos.toArray(new BaseModel[]{});
}
return baseModels;
--
Gitblit v1.9.3