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 | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 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 853e3a3..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,21 +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.exception.VciBaseException;
+import com.vci.starter.web.annotation.log.VciBusinessLog;
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.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.List;
+import java.util.Date;
/**
* 鏂囦欢鏌滅鐞嗙殑鎺у埗鍣�
@@ -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);
@@ -83,4 +89,63 @@
return objectBaseResult;
}
}
+
+ /**
+ * 鍒犻櫎鍗�
+ * @param ids 涓婚敭闆嗗悎
+ * @return 鍒犻櫎缁撴灉
+ */
+ @DeleteMapping("/deletePvolume")
+ public BaseResult deletePvolume(String ids){
+ try {
+ return osPvolumesServiceI.deletePvolume(ids);
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
+
+ /**
+ * 涓烘枃浠舵煖鍒嗛厤鎴愬憳
+ * @param pvolumId
+ * @param userIds
+ * @return
+ */
+ @PostMapping("/savePvolumeUser")
+ public BaseResult savePvolumeUser(String pvolumId ,String userIds){
+ try {
+ return osPvolumesServiceI.savePvolumeUser(pvolumId,Func.toStrList(userIds)) ? BaseResult.success("鏂囦欢鏌滃垎閰嶆垚鍛樻垚鍔燂紒"):BaseResult.fail("鏂囦欢鏌滃垎閰嶆垚鍛樺け璐ワ紒");
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
+
+ /**
+ * 瀵煎嚭閫変腑鐨勬枃浠舵煖淇℃伅
+ * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
+ * @param pvolumeIds 闇�瑕佸鍑虹殑灞炴�ц嫳鏂囧悕绉�
+ * @param response
+ */
+ @GetMapping( "/exportPvolumes")
+ @VciBusinessLog(operateName = "瀵煎嚭閫変腑鐨勬枃浠舵煖淇℃伅")
+ public void exportPvolumes(String exportFileName, String pvolumeIds, HttpServletResponse response){
+ try {
+ String excelPath = osPvolumesServiceI.exportPvolumes(exportFileName,pvolumeIds);
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ } catch (Exception e) {
+ String msg = "瀵煎嚭鏂囦欢鏌滄椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ try {
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3