From b77c70bb4fd39f3a08d2a3bc5e16155652452990 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 15 十一月 2024 16:28:08 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 b1486a2..4f196fe 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
@@ -53,7 +53,7 @@
import java.util.stream.Collectors;
/*
- * 閾炬帴绫诲瀷鏈嶅姟
+ * 琛ㄥ崟/琛ㄦ牸鏈嶅姟
* @author xiej
* @date 2024-08-14
*/
@@ -211,7 +211,13 @@
if (formFlag) {
throw new Throwable(viewName + "鏁版嵁宸茬粡琚玌I缁勪欢寮曠敤锛岃閲嶆柊閫夋嫨瑕佸垹闄ょ殑瀵硅薄!");
}
- UITools.getService().deletePortalVIByID(id);
+ PortalVI portalVI = new PortalVI();
+ portalVI.id = portalVIDTO.getId();
+ portalVI.viName = portalVIDTO.getViName();
+ portalVI.viType = portalVIDTO.getViType();
+ portalVI.typeName = portalVIDTO.getTypeName();
+ portalVI.typeFlag = portalVIDTO.getTypeFlag();
+ platformClientUtil.getPortalService().deletePortalVI(portalVI);
}
}catch (Throwable e){
String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -224,20 +230,26 @@
@Override
public boolean delete(String ids) throws PLException {
VciBaseUtil.alertNotNull(ids,"涓婚敭");
- List<String> idsList= VciBaseUtil.str2List(ids);
- List<PortalVI> PortalVIList= new ArrayList<>();
- DeletePortalVIDTOList portalVIDTOList=new DeletePortalVIDTOList();
+ List<String> idsList = VciBaseUtil.str2List(ids);
+ List<PortalVIDTO> portalVIDTOList = new ArrayList<>();
+ DeletePortalVIDTOList deletePortalVIDTOList=new DeletePortalVIDTOList();
idsList.stream().forEach(id->{
PortalVI portalVI= null;
try {
portalVI = platformClientUtil.getPortalService().getPortalVIById(id);
- PortalVIList.add(portalVI);
+ PortalVIDTO portalVIDTO = new PortalVIDTO();
+ portalVIDTO.setId(portalVI.id);
+ portalVIDTO.setTypeFlag(portalVI.typeFlag);
+ portalVIDTO.setTypeName(portalVI.typeName);
+ portalVIDTO.setViName(portalVI.viName);
+ portalVIDTO.setViType(portalVI.viType);
+ portalVIDTOList.add(portalVIDTO);
} catch (PLException e) {
e.printStackTrace();
}
});
- portalVIDTOList.setPortalVIDTOList(portalVIO2DTOS(PortalVIList));
- return delete(portalVIDTOList);
+ deletePortalVIDTOList.setPortalVIDTOList(portalVIDTOList);
+ return delete(deletePortalVIDTOList);
}
/**
@@ -648,7 +660,7 @@
try {
VciBaseUtil.alertNotNull(
portalVIDTO.getViName(),"鍚嶇О"
- ,portalVIDTO.getPrm().getFormQtName(),"缁戝畾琛ㄥ崟");
+ /*,portalVIDTO.getPrm().getFormQtName(),"缁戝畾琛ㄥ崟"*/);
if(portalVIDTO.getPrm()==null||portalVIDTO.getPrm().getPrmItemList()==null||portalVIDTO.getPrm().getPrmItemList().size()==0){
throw new Throwable(labelName+"锛屾湭璁剧疆");
}
@@ -692,7 +704,7 @@
}else{
flag=platformClientUtil.getPortalService().judgeUpdateButton(portalVIDTO.getTypeFlag(), portalVIDTO.getViName(), portalVIDTO.getTypeName());
}
- PortalVI pvi=portalVIDTOO2VI(portalVIDTO);
+ PortalVI pvi = portalVIDTOO2VI(portalVIDTO);
if (!isEdit) {
flag= platformClientUtil.getPortalService().savePortalVI(pvi);
} else {
@@ -801,7 +813,7 @@
*/
@Override
public List<PortalVIDTO> portalVIO2DTOS(Collection<PortalVI> PortalVIS) {
- List<PortalVIDTO>PortalVIDTOS = new ArrayList<>();
+ List<PortalVIDTO> PortalVIDTOS = new ArrayList<>();
Optional.ofNullable(PortalVIS).orElseGet(()->new ArrayList<>()).stream().forEach(PortalVI -> {
PortalVIDTO PPortalVIDTO = portalVIO2DTO(PortalVI);
PortalVIDTOS.add(PPortalVIDTO);
@@ -809,15 +821,13 @@
return PortalVIDTOS;
}
-
-
/**
* 琛ㄥ崟鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param portalVIDTO
* @return
*/
@Override
- public PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
+ public PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
PortalVI portalVI = new PortalVI();
portalVI.id = portalVIDTO.getId();
portalVI.typeFlag = portalVIDTO.getTypeFlag();
--
Gitblit v1.9.3