From 55cb4daf506ad8f3c637f6e3d9bc7df41e538b2e Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期二, 21 五月 2024 09:14:38 +0800
Subject: [PATCH] 产品和工站导出;不合格原因报废原因添加排序和与产品的关联;
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
index f534ddc..6c3e6e8 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
@@ -6,8 +6,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
-import com.dy.pmsGlobal.pojoBa.BaRole;
-import com.dy.pmsGlobal.pojoPlt.PltProductParams;
import com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@@ -39,19 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
reason.deleted = false;
reason.disabled = false;
- return BaseResponseUtils.buildSuccess(sv.save(reason));
+ count = sv.save(reason);
}catch (Exception e){
log.error("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -63,17 +67,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductUnqualifiedReason> update(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(reason));
+ count = sv.update(reason);
}catch (Exception e){
log.error("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -83,14 +93,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductUnqualifiedReason> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -101,7 +117,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300008") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<PltProductUnqualifiedReason> one(String id){
try{
@@ -119,7 +135,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300008")
@Log("鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<QueryResultVo<List<PltProductUnqualifiedReason>>> some(@RequestBody QueryVo vo){
try {
@@ -137,15 +153,21 @@
* @return
*/
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10300009")
@Log("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜")
- public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
+ count = sv.disabled(reason.id,reason.disabled);
}catch (Exception e){
log.error("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
}
--
Gitblit v1.8.0