From a8a841000119370ec34a59a7f4f51dc2f8ee0976 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期四, 13 六月 2024 14:22:02 +0800
Subject: [PATCH] 去掉原controller 中的try catch 和BindingResult
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java | 64 ++----
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 8
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 2
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java | 71 +-----
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/DevOpsPlanCtrl.java | 3
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java | 69 +-----
pms-parent/pms-common/src/main/java/com/dy/common/webUtil/GlExceptionHandler.java | 2
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java | 72 +-----
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltMaterial.java | 3
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java | 107 +++-------
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 107 +++-------
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessCtrl.java | 2
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java | 65 ++----
pms-parent/pms-common/src/main/java/com/dy/common/aop/CheckLength.java | 2
14 files changed, 155 insertions(+), 422 deletions(-)
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/aop/CheckLength.java b/pms-parent/pms-common/src/main/java/com/dy/common/aop/CheckLength.java
index b1bc4ba..2fa739f 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/aop/CheckLength.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/aop/CheckLength.java
@@ -11,7 +11,7 @@
public @interface CheckLength {
int min() default 11;
- int max() default 12;
+ int max() default 11;
String message() default "鎵嬫満鍙烽暱搴﹀繀椤绘槸11浣�";
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/GlExceptionHandler.java b/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/GlExceptionHandler.java
index 1eeaf11..19ac9e4 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/GlExceptionHandler.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/GlExceptionHandler.java
@@ -47,6 +47,6 @@
@ExceptionHandler
public BaseResponse exceptionHandler(Throwable t) {
log.error("鎹曡幏鍒板紓甯革細{}",t.getMessage(),t);
- return BaseResponseUtils.buildException("鍦–ontroller涓垨鍚庝骇鐢熷紓甯革細" + t.getMessage());
+ return BaseResponseUtils.buildException( t.getMessage());
}
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltMaterial.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltMaterial.java
index d263f18..7eae806 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltMaterial.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltMaterial.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
/**
@@ -31,7 +32,7 @@
* 浜у搧瀹炰綋缂栧彿
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @NotEmpty(message = "浜у搧瀹炰綋缂栧彿涓嶈兘涓虹┖")
+ @NotNull(message = "浜у搧瀹炰綋缂栧彿涓嶈兘涓虹┖")
public Long proId;
/**
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java
index db3bf6f..bba69ff 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java
@@ -10,11 +10,9 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 鐗╂枡绠＄悊
@@ -33,22 +31,18 @@
/**
* 淇濆瓨鐗╂枡淇℃伅
* @param material
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300001")
@Log("淇濆瓨鐗╂枡淇℃伅")
- public BaseResponse<PltMaterial> save(@RequestBody @Valid PltMaterial material,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- material.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(material));
- }catch (Exception e){
- log.error("淇濆瓨鐗╂枡寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<PltMaterial> save(@RequestBody @Valid PltMaterial material){
+ material.deleted = false;
+ int count = sv.save(material);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -56,21 +50,17 @@
/**
* 鏇存柊鐗╂枡淇℃伅
* @param material
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300001")
@Log("鏇存柊鐗╂枡淇℃伅")
- public BaseResponse<PltMaterial> update(@RequestBody @Valid PltMaterial material,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- return BaseResponseUtils.buildSuccess(sv.update(material));
- }catch (Exception e){
- log.error("鏇存柊鐗╂枡寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<PltMaterial> update(@RequestBody @Valid PltMaterial material){
+ int count = sv.update(material);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -83,11 +73,11 @@
@SsoPowerAop(power = "10300001")
@Log("鍒犻櫎鐗╂枡淇℃伅")
public BaseResponse<PltMaterial> delete(String id){
- try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
- }catch (Exception e){
- log.error("鍒犻櫎鐗╂枡寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ int count = sv.delete(Long.parseLong(id));
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -101,13 +91,8 @@
@SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ鐗╂枡淇℃伅")
public BaseResponse<PltMaterial> one(String id){
- try{
- PltMaterial material=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(material));
- }catch (Exception e){
- log.error("鏌ヨ鐗╂枡寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltMaterial material=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(material));
}
/**
@@ -119,13 +104,8 @@
@SsoPowerAop(power = "10300000")
@Log("鏌ヨ鐗╂枡淇℃伅")
public BaseResponse<QueryResultVo<List<PltMaterial>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltMaterial>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鏌ヨ鐗╂枡寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltMaterial>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
index 8abe361..59af6ee 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
@@ -6,18 +6,14 @@
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.PltProductQualityInspectionItems;
import com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 浜у搧鍝佽川妫�鏌ラ」鐩�
@@ -36,25 +32,15 @@
/**
* 淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩�
* @param item
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300003")
@Log("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
- public BaseResponse<Boolean> save(@RequestBody @Valid PltProductQualityInspectionItems item, BindingResult bindingResult){
- int count = 0;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- item.deleted = false;
- item.disabled = false;
- count =sv.save(item);
- }catch (Exception e){
- log.error("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductQualityInspectionItems item){
+ item.deleted = false;
+ item.disabled = false;
+ int count =sv.save(item);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -66,23 +52,13 @@
/**
* 鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�
* @param item
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300003")
@Log("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
- public BaseResponse<Boolean> update(@RequestBody @Valid PltProductQualityInspectionItems item,BindingResult bindingResult){
- int count ;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = sv.update(item);
- }catch (Exception e){
- log.error("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductQualityInspectionItems item){
+ int count = sv.update(item);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -99,13 +75,8 @@
@SsoPowerAop(power = "10300003")
@Log("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = sv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.delete(Long.parseLong(id));
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -123,13 +94,8 @@
@SsoPowerAop(power = "10300002") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
public BaseResponse<PltProductQualityInspectionItems> one(String id){
- try{
- PltProductQualityInspectionItems item=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(item));
- }catch (Exception e){
- log.error("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltProductQualityInspectionItems item=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(item));
}
/**
@@ -141,13 +107,8 @@
@SsoPowerAop(power = "10300002")
@Log("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
public BaseResponse<QueryResultVo<List<PltProductQualityInspectionItems>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProductQualityInspectionItems>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProductQualityInspectionItems>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
/**
* 绂佺敤鎴栧惎鐢�
@@ -158,13 +119,8 @@
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
- int count;
- try {
- count = sv.disabled(reason.id,reason.disabled);
- }catch (Exception e){
- log.error("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.disabled(reason.id,reason.disabled);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
index 92a0063..2bb5963 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
@@ -10,11 +10,9 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 浜у搧鎶�鏈弬鏁扮鐞�
@@ -33,22 +31,18 @@
/**
* 淇濆瓨浜у搧鎶�鏈弬鏁颁俊鎭�
* @param param
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300001")
@Log("淇濆瓨浜у搧鎶�鏈弬鏁颁俊鎭�")
- public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductParams param,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- param.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(param));
- }catch (Exception e){
- log.error("淇濆瓨浜у搧鎶�鏈弬鏁板紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductParams param){
+ param.deleted = false;
+ int count = sv.save(param);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -56,21 +50,18 @@
/**
* 鏇存柊浜у搧鎶�鏈弬鏁颁俊鎭�
* @param param
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300001")
@Log("鏇存柊浜у搧鎶�鏈弬鏁颁俊鎭�")
- public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductParams param,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- return BaseResponseUtils.buildSuccess(sv.update(param));
- }catch (Exception e){
- log.error("鏇存柊浜у搧鎶�鏈弬鏁板紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductParams param){
+ param.deleted = false;
+ int count = sv.update(param);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -83,11 +74,11 @@
@SsoPowerAop(power = "10300001")
@Log("鍒犻櫎浜у搧鎶�鏈弬鏁颁俊鎭�")
public BaseResponse<PltProductParams> delete(String id){
- try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧鎶�鏈弬鏁板紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ int count = sv.delete(Long.parseLong(id));
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -101,13 +92,8 @@
@SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鎶�鏈弬鏁颁俊鎭�")
public BaseResponse<PltProductParams> one(String id){
- try{
- PltProductParams param=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
- }catch (Exception e){
- log.error("鏌ヨ浜у搧鎶�鏈弬鏁板紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltProductParams param=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
}
/**
@@ -119,13 +105,8 @@
@SsoPowerAop(power = "10300000")
@Log("鏌ヨ浜у搧鎶�鏈弬鏁颁俊鎭�")
public BaseResponse<QueryResultVo<List<PltProductParams>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProductParams>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鏌ヨ浜у搧鎶�鏈弬鏁板紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProductParams>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
index 80bc77c..f2bff1e 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
@@ -6,17 +6,14 @@
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.PltProductScrappingReason;
import com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 浜у搧璁惧鎶ュ簾鍘熷洜
@@ -35,25 +32,15 @@
/**
* 淇濆瓨
* @param reason
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300011")
@Log("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜")
- public BaseResponse<Boolean> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- reason.disabled = false;
- reason.deleted = false;
- count = sv.save(reason);
- }catch (Exception e){
- log.error("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductScrappingReason reason){
+ reason.disabled = false;
+ reason.deleted = false;
+ int count = sv.save(reason);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -65,23 +52,13 @@
/**
* 鏇存柊
* @param reason
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300011")
@Log("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜")
- public BaseResponse<Boolean> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = sv.update(reason);
- }catch (Exception e){
- log.error("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductScrappingReason reason){
+ int count = sv.update(reason);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -98,13 +75,8 @@
@SsoPowerAop(power = "10300011")
@Log("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = sv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.delete(Long.parseLong(id));
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -122,13 +94,8 @@
@SsoPowerAop(power = "10300010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
public BaseResponse<PltProductScrappingReason> one(String id){
- try{
- PltProductScrappingReason param=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
- }catch (Exception e){
- log.error("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltProductScrappingReason param=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
}
/**
@@ -140,13 +107,8 @@
@SsoPowerAop(power = "10300010")
@Log("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
public BaseResponse<QueryResultVo<List<PltProductScrappingReason>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProductScrappingReason>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProductScrappingReason>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
/**
@@ -158,13 +120,8 @@
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥�")
public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
- int count;
- try {
- count = sv.disabled(reason.id,reason.disabled);
- }catch (Exception e){
- log.error("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.disabled(reason.id,reason.disabled);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
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 6c3e6e8..09f08fc 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
@@ -10,11 +10,9 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 浜у搧鐢熶骇涓嶅悎鏍煎師鍥�
@@ -33,25 +31,15 @@
/**
* 淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥�
* @param reason
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300009")
@Log("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- 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;
- count = sv.save(reason);
- }catch (Exception e){
- log.error("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductUnqualifiedReason reason){
+ reason.deleted = false;
+ reason.disabled = false;
+ int count = sv.save(reason);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -63,23 +51,13 @@
/**
* 鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥�
* @param reason
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300009")
@Log("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- 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());
- }
- count = sv.update(reason);
- }catch (Exception e){
- log.error("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductUnqualifiedReason reason){
+ int count = sv.update(reason);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -96,13 +74,8 @@
@SsoPowerAop(power = "10300009")
@Log("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = sv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.delete(Long.parseLong(id));
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -120,13 +93,8 @@
@SsoPowerAop(power = "10300008") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<PltProductUnqualifiedReason> one(String id){
- try{
- PltProductUnqualifiedReason param=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltProductUnqualifiedReason param=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
}
/**
@@ -138,13 +106,8 @@
@SsoPowerAop(power = "10300008")
@Log("鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<QueryResultVo<List<PltProductUnqualifiedReason>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProductUnqualifiedReason>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProductUnqualifiedReason>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
/**
@@ -156,13 +119,7 @@
@SsoPowerAop(power = "10300009")
@Log("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜")
public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
- int count;
- try {
- count = sv.disabled(reason.id,reason.disabled);
- }catch (Exception e){
- log.error("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.disabled(reason.id,reason.disabled);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
index 4b54650..9249ea0 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -13,7 +13,6 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -43,26 +42,15 @@
/**
* 淇濆瓨浜у搧淇℃伅
* @param pro
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300001")
@Log("淇濆瓨浜у搧淇℃伅")
- public BaseResponse<PltProduct> save(@RequestBody @Valid PltProduct pro,
- BindingResult bindingResult){
+ public BaseResponse<PltProduct> save(@RequestBody @Valid PltProduct pro){
pro.id = null;
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- pro.setDeleted(false);
- count = proSv.save(pro);
- }catch (Exception e){
- log.error("淇濆瓨浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ pro.setDeleted(false);
+ int count = proSv.save(pro);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -74,23 +62,13 @@
/**
* 鏇存柊浜у搧淇℃伅
* @param pro
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300001")
@Log("鏇存柊浜у搧淇℃伅")
- public BaseResponse<PltProduct> update(@RequestBody @Valid PltProduct pro,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = proSv.update(pro);
- }catch (Exception e){
- log.error("鏇存柊浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<PltProduct> update(@RequestBody @Valid PltProduct pro){
+ int count = proSv.update(pro);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -107,13 +85,7 @@
@SsoPowerAop(power = "10300001")
@Log("鍒犻櫎浜у搧淇℃伅")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = proSv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = proSv.delete(Long.parseLong(id));
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -130,14 +102,9 @@
@SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧淇℃伅")
public BaseResponse<PltProduct> one(String id){
- try{
- PltProduct pro=proSv.selectById(id);
+ PltProduct pro=proSv.selectById(id);
- return BaseResponseUtils.buildSuccess(pro);
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(pro);
}
/**
@@ -149,13 +116,8 @@
@SsoPowerAop(power = "10300000")
@Log("鍒嗛〉鏌ヨ浜у搧淇℃伅")
public BaseResponse<QueryResultVo<List<PltProduct>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProduct>> list = proSv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProduct>> list = proSv.selectSome(vo);
+ return BaseResponseUtils.buildSuccess(list);
}
/**
@@ -166,42 +128,33 @@
@SsoPowerAop(power = "10300000")
@Log("鏌ヨ鎵�鏈変骇鍝�")
public BaseResponse<List<PltProduct>> all(){
- try {
- QueryVo vo = new QueryVo();
- return BaseResponseUtils.buildSuccess(proSv.selectAll(vo));
- }catch (Exception e){
- log.error("鏌ヨ鎵�鏈変骇鍝佸紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryVo vo = new QueryVo();
+ return BaseResponseUtils.buildSuccess(proSv.selectAll(vo));
}
@PostMapping(path="export")
@SsoPowerAop(power = "10300000")
@Log("瀵煎嚭浜у搧淇℃伅")
public void export(@RequestBody QueryVo queryVo, HttpServletResponse response){
- try{
- List<Converter> list = new ArrayList<>() ;
+ List<Converter> list = new ArrayList<>() ;
- List<PltProduct> porList = proSv.selectAll(queryVo);
- // 浣跨敤骞惰娴佹彁楂樻�ц兘
- porList.parallelStream().forEach(pro -> {
- ExcelVo vo = new ExcelVo();
- vo.name = pro.name;
- vo.type = pro.type;
- vo.code = pro.code;
- try {
- vo.qrCode = QrCodeUtil.genQrCode(pro.code);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (WriterException e) {
- e.printStackTrace();
- }
- list.add(vo);
- });
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
- }catch (Exception e){
- log.error("瀵煎嚭浜у搧淇℃伅寮傚父", e);
- }
+ List<PltProduct> porList = proSv.selectAll(queryVo);
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ porList.parallelStream().forEach(pro -> {
+ ExcelVo vo = new ExcelVo();
+ vo.name = pro.name;
+ vo.type = pro.type;
+ vo.code = pro.code;
+ try {
+ vo.qrCode = QrCodeUtil.genQrCode(pro.code);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (WriterException e) {
+ e.printStackTrace();
+ }
+ list.add(vo);
+ });
+ QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
index e081b49..3508e08 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
@@ -14,13 +14,11 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
/**
* 宸ョ珯
@@ -42,24 +40,14 @@
/**
* 淇濆瓨
* @param station
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300007")
@Log("淇濆瓨宸ョ珯")
- public BaseResponse<Boolean> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- int count;
- try {
- station.deleted = false;
- count = sv.save(station);
- }catch (Exception e){
- log.error("淇濆瓨宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltStation station){
+ station.deleted = false;
+ int count = sv.save(station);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -72,23 +60,14 @@
/**
* 鏇存柊
* @param station
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300007")
@Log("鏇存柊宸ョ珯")
- public BaseResponse<Boolean> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = sv.update(station);
- }catch (Exception e){
- log.error("鏇存柊宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltStation station){
+ int count = sv.update(station);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -105,13 +84,8 @@
@SsoPowerAop(power = "10300007")
@Log("鍒犻櫎宸ョ珯")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = sv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.delete(Long.parseLong(id));
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -126,13 +100,8 @@
@SsoPowerAop(power = "10300006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ宸ョ珯")
public BaseResponse<PltStation> one(String id){
- try{
- PltStation param=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltStation param=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
}
/**
@@ -144,26 +113,16 @@
@SsoPowerAop(power = "10300006")
@Log("鍒嗛〉鏌ヨ宸ョ珯")
public BaseResponse<QueryResultVo<List<PltStation>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltStation>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltStation>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
@PostMapping(path="disabled")
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄥ伐绔�")
public BaseResponse<Boolean> disabled(@RequestBody PltStation station){
- int count;
- try {
- count = sv.disabled(station.id,station.disabled);
- }catch (Exception e){
- log.error("绂佺敤鎴栧惎鐢ㄥ伐绔欏紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.disabled(station.id,station.disabled);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -174,29 +133,25 @@
@SsoPowerAop(power = "10300000")
@Log("瀵煎嚭宸ョ珯淇℃伅")
public void export(HttpServletResponse response){
- try{
- List<Converter> list = new ArrayList<>() ;
+ List<Converter> list = new ArrayList<>() ;
- List<PltStation> stations = sv.selectAll();
- // 浣跨敤骞惰娴佹彁楂樻�ц兘
- stations.parallelStream().forEach(station -> {
- ExcelVo vo = new ExcelVo();
- vo.name = station.name;
+ List<PltStation> stations = sv.selectAll();
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ stations.parallelStream().forEach(station -> {
+ ExcelVo vo = new ExcelVo();
+ vo.name = station.name;
// vo.code = "103"+station.id;
- vo.lineName = station.lineName;
- try {
- vo.qrCode = QrCodeUtil.genQrCode(stationPrefix+station.id);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (WriterException e) {
- e.printStackTrace();
- }
- list.add(vo);
- });
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
- }catch (Exception e){
- log.error("瀵煎嚭浜у搧淇℃伅寮傚父", e);
- }
+ vo.lineName = station.lineName;
+ try {
+ vo.qrCode = QrCodeUtil.genQrCode(stationPrefix+station.id);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (WriterException e) {
+ e.printStackTrace();
+ }
+ list.add(vo);
+ });
+ QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
index f1b868f..f3c52cd 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
@@ -30,9 +30,9 @@
}
@Transactional
- public int save(PltStation station) throws Exception {
+ public int save(PltStation station) throws RuntimeException {
if(dao.selectByCodeId(station.id,station.code)>0){
- throw new Exception("宸ョ珯缂栧彿宸插瓨鍦�");
+ throw new RuntimeException("宸ョ珯缂栧彿宸插瓨鍦�");
}
int count = dao.insertSelective(station);
return count;
@@ -51,9 +51,9 @@
@Transactional
- public int update(PltStation station) throws Exception {
+ public int update(PltStation station) throws RuntimeException {
if(dao.selectByCodeId(station.id,station.code)>0){
- throw new Exception("宸ョ珯缂栧彿宸插瓨鍦�");
+ throw new RuntimeException("宸ョ珯缂栧彿宸插瓨鍦�");
}
int count = dao.updateByPrimaryKeySelective(station);
return count;
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessCtrl.java
index a575385..1060acf 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessCtrl.java
@@ -9,12 +9,10 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
* 鐢熶骇娴佺▼
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
index 4b4cd0c..748f1cc 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
@@ -14,14 +14,12 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 缁勮浠诲姟璁″垝
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/DevOpsPlanCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/DevOpsPlanCtrl.java
index c7c074b..29ac7bf 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/DevOpsPlanCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/DevOpsPlanCtrl.java
@@ -5,16 +5,13 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
-import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrDevOpsPlan;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 瀹夎杩愮淮浠诲姟璁″垝
--
Gitblit v1.8.0