From a04797899856a822c792530d0d65e88b3622ddd7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 09 五月 2024 13:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 20 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index c1aaa56..fd0aced 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -1,12 +1,18 @@
package com.dy.pipIrrProject.intakeController;
+
+import cn.hutool.core.date.DateTime;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaClient;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
+import com.dy.pipIrrProject.controller.ControllerSv;
+import com.dy.pipIrrProject.intake.IntakeSv;
import com.dy.pipIrrProject.result.ProjectResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -22,6 +28,8 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -38,12 +46,19 @@
@RequiredArgsConstructor
public class IntakeControllerCtrl {
private final IntakeControllerSv intakeControllerSv;
+ private final IntakeSv intakeSv;
+ private final ControllerSv controllerSv;
/**
- * 娣诲姞鍙栨按鍙�/鎺у埗鍣ㄦ崋缁戣褰�
- * 1. 鍒ゆ柇鍙栨按鍙ｆ槸鍚﹀瓨鍦�
- * 2. 鍒ゆ柇鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
- * 3. 鍒ゆ柇鍙栨按鍙ｃ�佹帶鍒跺櫒缁戝畾鍏崇郴鏄惁宸插瓨鍦�
+ * 鍙栨按鍙ｇ粦瀹氭帶鍒跺櫒
+ * 1. 鎺ユ敹鍙栨按鍙D鍙婃祦娴帶鍒跺櫒ID锛屽苟楠岃瘉鍙栨按鍙ｅ拰鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
+ * 2. 鍒ゆ柇璇ユ帶鍒跺櫒鏄惁瀛樺湪鏈В缁戣褰曪紝濡傛灉瀛樺湪鎻愮ず鐢ㄦ埛璇ユ帶鍒跺櫒瀛樺湪鏈В缁戣褰�
+ * 3. 缁勮鎺у埗鍣ㄥ璞℃彃鍏ユ帶鍒跺櫒琛ㄤ腑
+ * 4. 娣诲姞缁戝畾璁板綍
+ * 5. 鍒犻櫎娴佹氮鎺у埗鍣紙鐗╃悊鍒犻櫎锛�
+ * @param po
+ * @param bindingResult
+ * @return
*/
@Operation(summary = "娣诲姞缁戝畾璁板綍", description = "娣诲姞缁戝畾璁板綍")
@ApiResponses(value = {
@@ -57,33 +72,70 @@
@PostMapping(path = "bind", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> bind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult){
+ public BaseResponse<Boolean> bind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult) throws ParseException {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ // 鎺ユ敹鍙傛暟
+ Long intakeId = po.getIntakeId();
+ Long controllerId = po.getControllerId();
+ String remarks = po.getRemarks();
+ Long operator = po.getOperator();
- Integer recordCount = Optional.ofNullable(intakeControllerSv.getBindRecordCount(po.getIntakeId(), po.getControllerId(), (byte)1)).orElse(0);
- if(recordCount > 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_HAS_BINDED_CONTROLLER.getMessage());
+ // 鏍规嵁缂栧彿鍒嗗埆鑾峰彇鍙栨按鍙ｈ褰曟暟銆佹祦娴帶鍒跺櫒淇℃伅锛屽垽鏂彇姘村彛鍙婃帶鍒跺櫒鏄惁瀛樺湪
+ Integer recIntke = Optional.ofNullable(intakeSv.getRecordCountOfIntake(intakeId)).orElse(0);
+ PrControllerTramp prControllerTramp = intakeControllerSv.getTrampControllerInfo(controllerId);
+ //Map map_TrampController = Optional.ofNullable(intakeControllerSv.getTrampControllerInfo(controllerId)).orElse(new HashMap());
+ if(recIntke == 0 || prControllerTramp == null) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
}
- PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
+ // 鏍规嵁鎺у埗鍣ㄧ紪鍙峰垽鏂鎺у埗鍣ㄦ槸鍚﹀瓨鍦ㄦ湭瑙ｇ粦璁板綍
+ Integer recBinded = Optional.ofNullable(controllerSv.getBindedCount(controllerId)).orElse(0);
+ if(recBinded > 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_BINDED.getMessage());
+ }
+
+ // 娣诲姞鎺у埗鍣ㄨ褰�
+ PrController prController = new PrController();
+ prController.setIntakeId(intakeId);
+ prController.setRtuAddr(prControllerTramp.getRtuAddr());
+ prController.setProtocol(prControllerTramp.getProtocol());
+ prController.setFindDt(prControllerTramp.getFindDt());
+ prController.setAddWays((byte)1);
+ prController.setOperator(operator);
Date operateTime = new Date();
+ prController.setOperateDt(operateTime);
+ prController.setDeleted((byte)0);
+ Integer rec_addController = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
+ if(rec_addController == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+ }
+
+ // 娣诲姞缁戝畾璁板綍
+ PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
prIntakeController.setOperatedt(operateTime);
prIntakeController.setOperatetype((byte)1);
-
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
if(rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+
+ // 鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙峰垹闄ゆ祦娴帶鍒跺櫒璁板綍
+ intakeControllerSv.deleteTrampController(controllerId);
+
return BaseResponseUtils.buildSuccess(true) ;
}
/**
- * 娣诲姞鍙栨按鍙�/鎺у埗鍣ㄨВ缁戣褰�
- * 1. 鍒ゆ柇鍙栨按鍙ｆ槸鍚﹀瓨鍦�
- * 2. 鍒ゆ柇鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
- * 3. 鍒ゆ柇鍙栨按鍙ｃ�佹帶鍒跺櫒瑙ｇ粦鍏崇郴鏄惁宸插瓨鍦�
+ * 鍙栨按鍙ｈВ缁戞帶鍒跺櫒
+ * 1. 鎺ユ敹鍙栨按鍙D鍙婃祦娴帶鍒跺櫒ID锛屽苟楠岃瘉鍙栨按鍙ｅ拰鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
+ * 2. 娣诲姞瑙ｇ粦璁板綍
+ * 3. 鍒犻櫎鎺у埗鍣ㄥ閿�
+ * @param po
+ * @param bindingResult
+ * @return
*/
@Operation(summary = "娣诲姞瑙ｇ粦璁板綍", description = "娣诲姞瑙ｇ粦璁板綍")
@ApiResponses(value = {
@@ -102,20 +154,35 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- Integer recordCount = Optional.ofNullable(intakeControllerSv.getBindRecordCount(po.getIntakeId(), po.getControllerId(), (byte)2)).orElse(0);
- if(recordCount > 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_CONTROLLER_HAS_UNBOUND.getMessage());
+ // 鏍规嵁缂栧彿鍒嗗埆鑾峰彇鍙栨按鍙ｃ�佹帶鍒跺櫒鏈垹闄よ褰曟暟
+ Integer recIntke = Optional.ofNullable(intakeSv.getRecordCountOfIntake(po.getIntakeId())).orElse(0);
+ Integer recController = Optional.ofNullable(controllerSv.getRecordCountOfController(po.getControllerId())).orElse(0);
+ if(recIntke == 0 || recController == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
}
+ // 鍒ゆ柇鏈�鍚庢搷浣滆褰曟槸鍚︿负瑙ｇ粦璁板綍
+ //Integer recordCount = Optional.ofNullable(intakeControllerSv.getBindRecordCount(po.getIntakeId(), po.getControllerId(), (byte)2)).orElse(0);
+ //if(recordCount > 0) {
+ // return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_CONTROLLER_HAS_UNBOUND.getMessage());
+ //}
+
+ // 娣诲姞瑙ｇ粦璁板綍
PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
Date operateTime = new Date();
prIntakeController.setOperatedt(operateTime);
prIntakeController.setOperatetype((byte)2);
-
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
if(rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+
+ // 鍒犻櫎鎺у埗鍣ㄥ閿�
+ Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
+ if(rec_deleteIntakeId == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+ }
+
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -139,8 +206,9 @@
try {
List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByIntakeId(intakeId)).orElse(new ArrayList<>());
if(list.size() <= 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NO_RECORDS.getMessage());
- }
+ //鏃犵粦瀹氳褰曚篃杩斿洖鎴愬姛 浣嗘暟鎹负绌�
+ return BaseResponseUtils.buildSuccess(list);
+ }//鎴愬姛杩斿洖缁戝畾璁板綍鏁版嵁
return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
@@ -176,4 +244,75 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄥ垪琛�
+ *
+ * @param vo 鏌ヨ鏉′欢
+ * @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
+ */
+ @Operation(summary = "鑾峰緱涓�椤垫祦娴帶鍒跺櫒璁板綍", description = "杩斿洖涓�椤垫祦娴帶鍒跺櫒鏁版嵁")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤垫祦娴帶鍒跺櫒鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = PrControllerTramp.class))}
+ )
+ })
+ @GetMapping(path = "/getTrampControllers")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<PrControllerTramp>>> getTrampControllers(TrampControllerQueryVo vo) {
+
+ try {
+ QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
+ if (res.itemTotal != null && res.itemTotal > 0) {
+ return BaseResponseUtils.buildSuccess(res);
+ } else {
+ //璇锋眰鎴愬姛浣嗘暟鎹负绌�
+ return BaseResponseUtils.buildSuccess(res);
+ }
+ //return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇娴佹氮鎺у埗鍣ㄨ褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 娣诲姞娴佹氮鎺у埗鍣�
+ * @param pct
+ * @return
+ */
+ @PostMapping("addTrampController")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> addTrampController(@RequestBody PrControllerTramp pct){
+ pct.setFindDt(new Date());
+ Integer rows = intakeControllerSv.addTrampController(pct);
+ if (rows == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true);
+ }
+
+ /**
+ * 鍒犻櫎娴佹氮鎺у埗鍣�
+ * @param id
+ * @return
+ */
+ @PostMapping("deleteTrampController")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> deleteTrampController(Long id){
+ PrControllerTramp controllerInfo = intakeControllerSv.getTrampControllerInfo(id);
+ if (controllerInfo==null){return BaseResponseUtils.buildFail(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());}
+
+ Integer rows = intakeControllerSv.deleteTrampController(id);
+ if (rows == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
--
Gitblit v1.8.0