From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 7fff70c..362ddc4 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
@@ -1,26 +1,21 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
-import com.vci.corba.framework.data.PvolumeInfo;
import com.vci.dto.*;
import com.vci.starter.web.annotation.log.VciBusinessLog;
-import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.service.OsActionServiceI;
import com.vci.web.service.OsPvolumesServiceI;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
-import java.util.List;
/**
* 鏂囦欢鏌滅鐞嗙殑鎺у埗鍣�
@@ -39,14 +34,20 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@GetMapping("/getPvolumesPage")
- public BaseResult getPvolumesPage(short pageSize, short pageIndex){
+ public BaseResult getPvolumesPage(Integer pageSize, Integer pageIndex){
try {
- return osPvolumesServiceI.getPvolumesPage(pageSize, pageIndex);
+ if(pageIndex == null){
+ pageIndex = 1000 ;
+ }
+ if(pageSize == null){
+ pageSize = 0;
+ }
+ return osPvolumesServiceI.getPvolumesPage(pageSize.shortValue(), pageIndex.shortValue());
} catch (PLException e) {
BaseResult objectBaseResult = new BaseResult<>();
objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -95,7 +96,7 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping("/deletePvolume")
- public BaseResult deletePvolume(String[] ids){
+ public BaseResult deletePvolume(String ids){
try {
return osPvolumesServiceI.deletePvolume(ids);
} catch (PLException e) {
@@ -113,9 +114,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));
--
Gitblit v1.9.3