From 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 15 一月 2024 17:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
index 5483b23..d89f165 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -68,7 +68,11 @@
public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(QueryVo vo){
try {
QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
- return BaseResponseUtils.buildSuccess(res);
+ if(res.itemTotal != null && res.itemTotal > 0) {
+ return BaseResponseUtils.buildSuccess(res);
+ }else {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
+ }
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -94,7 +98,11 @@
public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){
try {
PrDivide res = divideSv.getOneDivide(id);
- return BaseResponseUtils.buildSuccess(res);
+ if(res != null) {
+ return BaseResponseUtils.buildSuccess(res);
+ }else {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
+ }
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -153,7 +161,7 @@
/**
* 鏍规嵁鍒嗘按鎴縄D閫昏緫鍒犻櫎鍒嗘按鎴�
- * @param id
+ * @param map
* @return
*/
@Operation(summary = "鍒犻櫎涓�涓垎姘存埧", description = "鍒犻櫎涓�涓垎姘存埧鏁版嵁")
@@ -166,14 +174,19 @@
)
})
- @GetMapping(path = "/delone/{id}")
+ //@GetMapping(path = "/delone/{id}")
+ @PostMapping(path = "delete", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> deleteDivideById(@PathVariable("id") Long id){
+ public BaseResponse<Boolean> deleteDivideById(@RequestBody Map map){
+ Long id = Optional.ofNullable(Long.parseLong(map.get("id").toString())).orElse(0L);
+ if(id == 0)
+ return BaseResponseUtils.buildException(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());
+
try {
Integer res = Optional.ofNullable(divideSv.deleteDivideById(id)).orElse(0);
- if(res == 0) {
- return BaseResponseUtils.buildFail("鍒嗘按鎴垮垹闄ゅけ璐�");
- }
+ if(res == 0)
+ return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());
+
return BaseResponseUtils.buildSuccess(true);
} catch (Exception e) {
log.error("鍒犻櫎鍒嗘按鎴垮紓甯�", e);
--
Gitblit v1.8.0