From 65866894f615d7a1386cd7f030307322996450de Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 十月 2024 16:17:37 +0800
Subject: [PATCH] 文件柜导出接口上传，ui定义导出界面传参调整。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java | 78 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index d6ca935..b1486a2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -125,7 +125,7 @@
}
DataGrid<PortalVIVO> dataGrid = new DataGrid<>();
try {
- GetPagePortalVIArrayByPageInfoResult pagePortalVIArrayByPageInfoResult= platformClientUtil.getPortalService().getPagePortalVIArrayByPageInfo(typeName,viName,viType,viTypeFlag,pageIndex,pageSize);
+ GetPagePortalVIArrayByPageInfoResult pagePortalVIArrayByPageInfoResult = platformClientUtil.getPortalService().getPagePortalVIArrayByPageInfo(typeName,viName,viType,viTypeFlag,pageIndex,pageSize);
if(pagePortalVIArrayByPageInfoResult.total>0) {
PortalVI[] portalVIS = pagePortalVIArrayByPageInfoResult.returnValue;
List<PortalVIVO> portalVIVOS = portalVIDOO2VOS(Arrays.asList(portalVIS));
@@ -166,8 +166,8 @@
if(PortalVIType.Table.getName()==viType){
lableName=PortalVIType.Table.getLabel();
}
- PortalVIVO portalVIVO=new PortalVIVO();
- PortalVI portalVI= platformClientUtil.getPortalService().getPortalVIById(id);
+ PortalVIVO portalVIVO = new PortalVIVO();
+ PortalVI portalVI = platformClientUtil.getPortalService().getPortalVIById(id);
if(portalVI==null||StringUtils.isBlank(portalVI.id)){
throw new VciBaseException("鏍规嵁涓婚敭鏈煡璇㈠埌鏁版嵁");
}
@@ -248,7 +248,7 @@
*/
@Override
public boolean clone(ClonePortalVIDTOList clonePortalVIDTOList) throws VciBaseException {
- if(clonePortalVIDTOList==null||CollectionUtils.isEmpty(clonePortalVIDTOList.getClonePortalVIDTOList())){
+ if(clonePortalVIDTOList == null || CollectionUtils.isEmpty(clonePortalVIDTOList.getClonePortalVIDTOList())){
throw new VciBaseException("璇烽�夋嫨瑕佸厠闅嗙殑瀵硅薄!");
}
try {
@@ -573,6 +573,7 @@
}
return BaseResult.success("瀵煎叆鎴愬姛");
}
+
private String readLines(String filePath){
StringBuffer sb=new StringBuffer();
FileInputStream prmFile=null;
@@ -590,6 +591,7 @@
}
return sb.toString();
}
+
/**
* 鎷疯礉鏁版嵁鍒皐ord妯℃澘涓�
* @param fileName 瑕佸啓鍏ョ殑鏁版嵁
@@ -620,6 +622,7 @@
}
return filePath;
}
+
public List<PortalVIDTO> listByIds(Collection idList){
List<PortalVIDTO> portalVIVOList=new ArrayList<>();
if(CollectionUtils.isEmpty(idList)){
@@ -637,13 +640,15 @@
portalVIVOList= portalVIO2DTOS(portalVIList);
return portalVIVOList;
}
- private BaseResult savePortalVIDTO(PortalVIDTO portalVIDTO,boolean isEdit) {
+ private BaseResult savePortalVIDTO(PortalVIDTO portalVIDTO,boolean isEdit) {
boolean _isBtm=false;
boolean flag = false;
String labelName=PortalVIType.Form.getName();
try {
- VciBaseUtil.alertNotNull(portalVIDTO.getViName(),"鍚嶇О");
+ VciBaseUtil.alertNotNull(
+ portalVIDTO.getViName(),"鍚嶇О"
+ ,portalVIDTO.getPrm().getFormQtName(),"缁戝畾琛ㄥ崟");
if(portalVIDTO.getPrm()==null||portalVIDTO.getPrm().getPrmItemList()==null||portalVIDTO.getPrm().getPrmItemList().size()==0){
throw new Throwable(labelName+"锛屾湭璁剧疆");
}
@@ -706,6 +711,7 @@
}
return BaseResult.success("淇濆瓨"+labelName+"鎴愬姛!");
}
+
@Override
public Map<String, PortalVIVO> selectAllPortalVIMap() throws VciBaseException {
return null;
@@ -757,7 +763,6 @@
return "";
}
-
/**
* 鏋氫妇鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
*
@@ -773,6 +778,7 @@
});
return portalVIVOS;
}
+
/**
* 琛ㄥ崟鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param portalVIDTOS 琛ㄥ崟鐨勫璞�
@@ -787,6 +793,7 @@
});
return portalVIS;
}
+
/**
* 琛ㄥ崟鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param PortalVIS 琛ㄥ崟鐨勫璞�
@@ -811,13 +818,13 @@
*/
@Override
public PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
- PortalVI portalVI=new PortalVI();
- portalVI.id=portalVIDTO.getId();
- portalVI.typeFlag= portalVIDTO.getTypeFlag();
- portalVI.typeName=portalVIDTO.getTypeName();
- portalVI.viName=portalVIDTO.getViName();
- portalVI.viType=portalVIDTO.getViType();
- short viType =portalVIDTO.getViType();
+ PortalVI portalVI = new PortalVI();
+ portalVI.id = portalVIDTO.getId();
+ portalVI.typeFlag = portalVIDTO.getTypeFlag();
+ portalVI.typeName = portalVIDTO.getTypeName();
+ portalVI.viName = portalVIDTO.getViName();
+ portalVI.viType = portalVIDTO.getViType();
+ short viType = portalVIDTO.getViType();
PRMDO prmdo = prmDOO2VIS(portalVIDTO.getPrm(),viType);
try {
portalVI.prm=UITools.getPRMText(prmdo);
@@ -826,6 +833,7 @@
}
return portalVI;
}
+
/**
* 琛ㄥ崟鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param portalVI
@@ -844,6 +852,7 @@
portalVIDTO.setPrm(prmDOO2DTOS(prmdo,viType));
return portalVIDTO;
}
+
/**
* 琛ㄥ崟鏁版嵁瀵硅薄杞崲
* @param prmdto
@@ -883,7 +892,7 @@
portalVIVO.setViType(portalVI.viType);
portalVIVO.setViTypeText(PortalVIType.getByIntVal(portalVI.viType).getLabel());
- String prm= portalVI.prm;
+ String prm = portalVI.prm;
if(StringUtils.isNotBlank(prm)) {
PRMDO prmdo = UITools.getPRM(prm);
portalVIVO.setPrm(prmDOO2VOS(prmdo, portalVI.viType));
@@ -955,7 +964,7 @@
prmItemDO.setItemHrefConf(prmItemDO.getItemHrefConf());//瓒呴摼鎺ラ厤缃�
prmItemDO.setItemTips(prmItemDTO.getItemTips());
prmItemDO.setItemTrim(prmItemDTO.getItemTrim());
- prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
+ //prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
prmItemDO.setItemCtrlDisplyCondition(prmItemDTO.getItemCtrlDisplyCondition());////鎺у埗鏄剧ず鏉′欢
prmItemDO.setItemEditableProgram(prmItemDTO.getItemEditableProgram());
prmItemDO.setItemEditCondition(prmItemDTO.getItemEditCondition());
@@ -1164,10 +1173,12 @@
List<String> allKeyList= getRefFormVIName(prmItemDO.getItemInObj());
List<String> itemOutFieldList =VciBaseUtil.str2List(prmItemDO.getItemOutFields());
List<String> itemKeyFieldList =VciBaseUtil.str2List(prmItemDO.getItemKeyFields());
- List<String> itemSelectOutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+ List<String> itemSelectOutFieldList= allKeyList.stream()
+ .filter(s -> !itemOutFieldList.contains(s))
+ .collect(Collectors.toList());
prmItemVO.setItemSelectOutFieldList(itemSelectOutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
prmItemVO.setItemOutFieldList(itemOutFieldList);//闇�瑕佷娇鐢ㄧ殑闆嗗悎
- // List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+ // List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
List<String> itemSearchFieldList=new ArrayList<>();
if(!CollectionUtils.isEmpty(itemKeyFieldList)){
itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.contains(s)).collect(Collectors.toList());
@@ -1208,25 +1219,25 @@
prmItemDO.setItemOutFields(VciBaseUtil.array2String(prmItemDTO.getItemOutFieldList().toArray(new String[]{})));//闇�瑕佷娇鐢ㄧ殑瀛楁
prmItemDO.setItemKeyFields(CollectionUtils.isEmpty(prmItemDTO.getItemKeyFieldList())?"":VciBaseUtil.array2String(prmItemDTO.getItemKeyFieldList().toArray(new String[]{})));//闇�瑕佹悳绱㈢殑瀛楁
- List<String> newItemFieldWidthList=prmItemDTO.getItemFieldWidthList().stream().map(KeyValue::getValue).distinct().collect(Collectors.toList());
+ List<String> newItemFieldWidthList = prmItemDTO.getItemFieldWidthList().stream().map(KeyValue::getValue).distinct().collect(Collectors.toList());
prmItemDO.setItemFieldWidth(VciBaseUtil.array2String(newItemFieldWidthList.toArray(new String[]{}),":"));//瀛楁瀹藉害
- List<ItemSeniorQueryBO> itemSeniorQueryBOS= prmItemDTO.getItemSeniorQueryBOS();
- List<String> itemSeniorQueryColsList=new ArrayList<>();
+ List<ItemSeniorQueryBO> itemSeniorQueryBOS = prmItemDTO.getItemSeniorQueryBOS();
+ List<String> itemSeniorQueryColsList = new ArrayList<>();
List<String> itemSeniorQueryColsCountsList=new ArrayList<>();
- List<String> itemQuerySqlList=new ArrayList<>();
+ List<String> itemQuerySqlList = new ArrayList<>();
itemSeniorQueryBOS.stream().forEach(itemSeniorQueryBO -> {
- String itemSeniorQueryCols= itemSeniorQueryBO.getItemSeniorQueryCols();
- String itemSeniorQueryColsCounts=itemSeniorQueryBO.getItemSeniorQueryColsCounts();
- String itemQuerySql=itemSeniorQueryBO.getItemQuerySql();
+ String itemSeniorQueryCols = itemSeniorQueryBO.getItemSeniorQueryCols();
+ String itemSeniorQueryColsCounts = itemSeniorQueryBO.getItemSeniorQueryColsCounts();
+ String itemQuerySql = itemSeniorQueryBO.getItemQuerySql();
if(StringUtils.isNotBlank(itemSeniorQueryCols)) {
itemSeniorQueryColsList.add(itemSeniorQueryCols);
}
- if(StringUtils.isNotBlank(itemSeniorQueryColsCounts)) {
- itemSeniorQueryColsCountsList.add(itemSeniorQueryColsCounts);
- }
- if(StringUtils.isNotBlank(itemQuerySql)){
- itemQuerySqlList.add(itemQuerySql);
- }
+ if(StringUtils.isNotBlank(itemSeniorQueryColsCounts)) {
+ itemSeniorQueryColsCountsList.add(itemSeniorQueryColsCounts);
+ }
+ if(StringUtils.isNotBlank(itemQuerySql)){
+ itemQuerySqlList.add(itemQuerySql);
+ }
});
prmItemDO.setItemSeniorQueryCols(VciBaseUtil.array2String(itemSeniorQueryColsList.toArray(new String[]{})));
prmItemDO.setItemSeniorQueryColsCounts(VciBaseUtil.array2String(itemSeniorQueryColsCountsList.toArray(new String[]{})));
@@ -1239,8 +1250,8 @@
*/
private List<KeyValue> initItemFieldWidthList(String itemOutFields,String itemFieldWidth){
List<KeyValue> keyValueList=new ArrayList<>();
- List<String>itemOutFieldList= VciBaseUtil.str2List(itemOutFields);
- List<String>itemFieldWidthList= VciBaseUtil.str2List(itemFieldWidth,",");
+ List<String>itemOutFieldList = VciBaseUtil.str2List(itemOutFields);
+ List<String>itemFieldWidthList =VciBaseUtil.str2List(itemFieldWidth,",");
if(itemOutFieldList.size()>0) {
for (int i = 0; i < itemOutFieldList.size(); i++) {
KeyValue keyValue = new KeyValue();
@@ -1288,6 +1299,7 @@
}
return itemSeniorQueryBOList;
}
+
private List<String> getRefFormVIName(String refFormOid){
List<String> keyList=new ArrayList<>();
try {
--
Gitblit v1.9.3