From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 一月 2024 17:24:02 +0800
Subject: [PATCH] 1、增加流浪控制器实体（和数据库表）； 2、修改部分通信协议实现； 3、增加部分通信协议实现； 4、增加通信中间件RTU上行数据处理任务树部分节点。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index fd25e3e..fa5f55e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -10,6 +10,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrProject.result.ProjectResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -70,7 +71,11 @@
public BaseResponse<QueryResultVo<List<PrIntake>>> all(){
try {
QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
- return BaseResponseUtils.buildSuccess(res);
+ if(res == null) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
+ }else {
+ return BaseResponseUtils.buildSuccess(res);
+ }
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -93,7 +98,11 @@
@GetMapping(path = "one/{id}")
@SsoAop()
public BaseResponse<PrIntake> one(@PathVariable("id") Long id){
- return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ if(this.intakeSv.selectById(id) == null) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
+ }else {
+ return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ }
}
@Operation(summary = "鑾峰緱涓�椤靛彇姘村彛璁板綍", description = "杩斿洖涓�椤靛彇姘村彛鏁版嵁")
@@ -111,7 +120,7 @@
try {
QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
if(res == null) {
- return BaseResponseUtils.buildFail("鏌ヨ澶辫触");
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
}
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
@@ -142,7 +151,7 @@
po.setOperateDt(operateTime);
Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
if(rec == 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -177,7 +186,7 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage()) ;
}else{
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -200,8 +209,8 @@
@GetMapping(path = "delete/{id}")
@SsoAop()
public BaseResponse<Boolean> delete(@PathVariable("id") Long id){
- if(id == null){
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ if(id == null ){
+ return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()) ;
}
int count;
try {
@@ -211,7 +220,7 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()) ;
}else{
return BaseResponseUtils.buildSuccess(true) ;
}
--
Gitblit v1.8.0