From c1557ca67eab8caef9de375b07c3ad4e7291bb56 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 十月 2024 16:25:23 +0800
Subject: [PATCH] 文件柜代码合并
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java | 4 ++--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java | 11 +++--------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java | 4 ++--
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
index e103888..5e088d1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
@@ -119,9 +119,9 @@
* @return
*/
@PostMapping("/savePvolumeUser")
- public BaseResult savePvolumeUser(String pvolumId ,String[] userIds){
+ public BaseResult savePvolumeUser(String pvolumId ,String userIds){
try {
- return osPvolumesServiceI.savePvolumeUser(pvolumId,userIds) ? BaseResult.success("鏂囦欢鏌滃垎閰嶆垚鍛樻垚鍔燂紒"):BaseResult.fail("鏂囦欢鏌滃垎閰嶆垚鍛樺け璐ワ紒");
+ return osPvolumesServiceI.savePvolumeUser(pvolumId,Func.toStrList(userIds)) ? BaseResult.success("鏂囦欢鏌滃垎閰嶆垚鍛樻垚鍔燂紒"):BaseResult.fail("鏂囦欢鏌滃垎閰嶆垚鍛樺け璐ワ紒");
} catch (PLException e) {
BaseResult objectBaseResult = new BaseResult<>();
objectBaseResult.setCode(Integer.parseInt(e.code));
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
index 3220e17..dcd27a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
@@ -1,14 +1,10 @@
package com.vci.web.service;
import com.vci.corba.common.PLException;
+import com.vci.corba.framework.data.PvolumeInfo;
import com.vci.dto.*;
import com.vci.starter.web.pagemodel.BaseResult;
-import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -41,7 +37,7 @@
* @param ids 涓婚敭闆嗗悎
* @return 鍒犻櫎缁撴灉
*/
- BaseResult deletePvolume(String[] ids) throws PLException;
+ BaseResult deletePvolume(String ids) throws PLException;
/**
* 鏂囦欢鏌滃鍑�
* @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
@@ -62,6 +58,5 @@
* @param userIds
* @return
*/
- boolean savePvolumeUser(String pvolumId ,String[] userIds) throws PLException;
- BaseResult deletePvolume(String ids) throws PLException;
+ boolean savePvolumeUser(String pvolumId ,List<String> userIds) throws PLException;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
index 8d20ea9..8baf55b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
@@ -225,11 +225,11 @@
* @return
*/
@Override
- public boolean savePvolumeUser(String pvolumId, String[] userIds) throws PLException {
+ public boolean savePvolumeUser(String pvolumId ,List<String> userIds) throws PLException {
VciBaseUtil.alertNotNull(pvolumId,"鏂囦欢鏌滀富閿�",userIds,"鐢ㄦ埛涓婚敭闆嗗悎");
UserEntityInfo userEntityInfo = new UserEntityInfo();
userEntityInfo.setUserName(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId());
- boolean resBoolean = platformClientUtil.getFrameworkService().savePvolumeUser(pvolumId, userIds, userEntityInfo);
+ boolean resBoolean = platformClientUtil.getFrameworkService().savePvolumeUser(pvolumId, userIds.toArray(new String[userIds.size()]), userEntityInfo);
return resBoolean;
}
--
Gitblit v1.9.3