From 991bf3c56c379ba78f13d9ff34fccc2769d296b7 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 24 十月 2024 15:09:15 +0800
Subject: [PATCH] 1、文件柜管理接口方式以及接受参数修改
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java | 20 +++++++++++++-------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java | 6 +++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java | 14 +++++++-------
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
index 4995d63..680edac 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
@@ -20,5 +20,5 @@
private String service; // 鏈嶅姟鍚�
private short type; //鍗锋湇鍔＄被鍨� 0:Unix,1:Win NT
private String path; //鍗锋湇鍔¤矾寰�
- private boolean isvalid; //鏄惁涓洪閫夎矾寰勶紝濡傛灉淇敼浜嗚繖涓�间細鎻愰啋锛氭偍纭疄瑕佷慨鏀瑰嵎鐨勯閫夎矾寰勫悧锛�
+ private boolean isvalid; //鏄惁涓洪閫夎矾寰勶紝濡傛灉淇敼浜嗚繖涓�间細鎻愰啋锛氭偍纭疄瑕佷慨鏀瑰嵎鐨勯閫夎矾寰勫悧锛焒alse 涓烘湭閫夋嫨锛宼rue涓洪�夋嫨
}
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 35c5619..961a448 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
@@ -34,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));
@@ -55,7 +61,7 @@
* @param dto 鍗风殑浼犺緭淇℃伅
* @return 淇濆瓨缁撴灉
*/
- @GetMapping("/savePvolume")
+ @PostMapping("/savePvolume")
public BaseResult savePvolume(@RequestBody OsPvolumeDTO dto){
try {
return osPvolumesServiceI.savePvolume(dto);
@@ -72,7 +78,7 @@
* @param dto 鍗风殑浼犺緭淇℃伅
* @return 淇敼缁撴灉
*/
- @GetMapping("/updatePvolume")
+ @PostMapping("/updatePvolume")
public BaseResult updatePvolume(@RequestBody OsPvolumeDTO dto){
try {
return osPvolumesServiceI.updatePvolume(dto);
@@ -90,7 +96,7 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping("/deletePvolume")
- public BaseResult deletePvolume(String[] ids){
+ public BaseResult deletePvolume(String ids){
try {
return osPvolumesServiceI.deletePvolume(ids);
} catch (PLException e) {
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 b2511e0..8459c9c 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
@@ -17,8 +17,8 @@
public interface OsPvolumesServiceI {
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
BaseResult getPvolumesPage(short pageSize, short pageIndex) throws PLException;
@@ -39,5 +39,5 @@
* @param ids 涓婚敭闆嗗悎
* @return 鍒犻櫎缁撴灉
*/
- BaseResult deletePvolume(String[] ids) throws PLException;
+ BaseResult deletePvolume(String ids) 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 d4ba423..e171a7d 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
@@ -51,8 +51,8 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@Override
@@ -72,7 +72,7 @@
public BaseResult savePvolume(OsPvolumeDTO dto) throws PLException {
PvolumeInfo pvoInfo = new PvolumeInfo();
pvoInfo.service = dto.getService();
- pvoInfo.id = dto.getId();
+// pvoInfo.id = dto.getId();
pvoInfo.name = dto.getName();
pvoInfo.host = dto.getHost();
pvoInfo.isvalid = dto.isIsvalid();
@@ -139,11 +139,11 @@
* @return 鍒犻櫎缁撴灉
*/
@Override
- public BaseResult deletePvolume(String[] ids) throws PLException {
- if ( ids.length == 0){
+ public BaseResult deletePvolume(String ids) throws PLException {
+ if ( StringUtils.isBlank(ids)){
throw new PLException("500", new String[]{"璇烽�夋嫨鐩稿叧鏁版嵁锛侊紒"});
}
- for (String id : ids) {
+ for (String id : ids.split(",")) {
boolean isvalid = platformClientUtil.getFrameworkService().checkIsvalid(id);
if(isvalid) {
throw new PLException("500", new String[]{"閫夋嫨鏁版嵁涓洪閫夎矾寰勶紝涓嶈兘鍒犻櫎锛�"});
@@ -152,7 +152,7 @@
UserEntityInfo userInfo = new UserEntityInfo();
userInfo.setUserName(WebUtil.getCurrentUserId());
userInfo.setModules("com.vci.client.framework.systemConfig.volumn.PvolumePanel");
- boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids, userInfo);
+ boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids.split(","), userInfo);
if(!rs){
return BaseResult.fail("鍒犻櫎澶辫触锛�");
}
--
Gitblit v1.9.3