From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 10:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 199 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 156 insertions(+), 43 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 5311d90..5c481f2 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,5 +1,6 @@
package com.dy.pipIrrProject.intakeController;
+
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -40,7 +41,7 @@
@Slf4j
@Tag(name = "鍙栨按鍙�/鎺у埗鍣ㄥ叧鑱旂鐞�", description = "鍙栨按鍙�/鎺у埗鍣ㄥ叧鑱旀搷浣�")
@RestController
-@RequestMapping(path="intake_controller")
+@RequestMapping(path = "intake_controller")
@RequiredArgsConstructor
public class IntakeControllerCtrl {
private final IntakeControllerSv intakeControllerSv;
@@ -51,9 +52,10 @@
* 鍙栨按鍙ｇ粦瀹氭帶鍒跺櫒
* 1. 鎺ユ敹鍙栨按鍙D鍙婃祦娴帶鍒跺櫒ID锛屽苟楠岃瘉鍙栨按鍙ｅ拰鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
* 2. 鍒ゆ柇璇ユ帶鍒跺櫒鏄惁瀛樺湪鏈В缁戣褰曪紝濡傛灉瀛樺湪鎻愮ず鐢ㄦ埛璇ユ帶鍒跺櫒瀛樺湪鏈В缁戣褰�
- * 3. 缁勮鎺у埗鍣ㄥ璞℃彃鍏ユ帶鍒跺櫒琛ㄤ腑
- * 4. 娣诲姞缁戝畾璁板綍
+ * 3. 缁勮鎺у埗鍣ㄥ璞℃彃鍏ユ帶鍒跺櫒琛ㄤ腑锛堝強娣诲姞缁戝畾璁板綍锛�
+ * 4. 淇敼缁戝畾璁板綍璁剧疆澶囨敞
* 5. 鍒犻櫎娴佹氮鎺у埗鍣紙鐗╃悊鍒犻櫎锛�
+ *
* @param po
* @param bindingResult
* @return
@@ -72,26 +74,26 @@
@SsoAop()
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()){
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鍙傛暟
Long intakeId = po.getIntakeId();
- Long controllerId = po.getControllerId();
+ Long trampControllerId = po.getControllerId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
// 鏍规嵁缂栧彿鍒嗗埆鑾峰彇鍙栨按鍙ｈ褰曟暟銆佹祦娴帶鍒跺櫒淇℃伅锛屽垽鏂彇姘村彛鍙婃帶鍒跺櫒鏄惁瀛樺湪
Integer recIntke = Optional.ofNullable(intakeSv.getRecordCountOfIntake(intakeId)).orElse(0);
- PrControllerTramp prControllerTramp = intakeControllerSv.getTrampControllerInfo(controllerId);
+ PrControllerTramp prControllerTramp = intakeControllerSv.getTrampControllerInfo(trampControllerId);
//Map map_TrampController = Optional.ofNullable(intakeControllerSv.getTrampControllerInfo(controllerId)).orElse(new HashMap());
- if(recIntke == 0 || prControllerTramp == null) {
+ if (recIntke == 0 || prControllerTramp == null) {
return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
}
// 鏍规嵁鎺у埗鍣ㄧ紪鍙峰垽鏂鎺у埗鍣ㄦ槸鍚﹀瓨鍦ㄦ湭瑙ｇ粦璁板綍
- Integer recBinded = Optional.ofNullable(controllerSv.getBindedCount(controllerId)).orElse(0);
- if(recBinded > 0) {
+ Integer recBinded = Optional.ofNullable(controllerSv.getBindedCount(trampControllerId)).orElse(0);
+ if (recBinded > 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_BINDED.getMessage());
}
@@ -101,29 +103,33 @@
prController.setRtuAddr(prControllerTramp.getRtuAddr());
prController.setProtocol(prControllerTramp.getProtocol());
prController.setFindDt(prControllerTramp.getFindDt());
- prController.setAddWays((byte)1);
+ prController.setOrgTag(prControllerTramp.getOrgTag());
+ prController.setAddWays((byte) 1);
prController.setOperator(operator);
Date operateTime = new Date();
prController.setOperateDt(operateTime);
- prController.setDeleted((byte)0);
+ prController.setDeleted((byte) 0);
Integer rec_addController = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
- if(rec_addController == 0) {
+ if (rec_addController == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+// if (remarks != null || remarks !=""){
+// // 淇敼缁戝畾璁板綍
+// PrIntakeController prIntakeController = new PrIntakeController();
+// prIntakeController.setRemarks(remarks);
+// prIntakeController.setIntakeid(intakeId);
+//
+// Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
+// if (rec == 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);
+ intakeControllerSv.deleteTrampController(trampControllerId);
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
@@ -131,6 +137,7 @@
* 1. 鎺ユ敹鍙栨按鍙D鍙婃祦娴帶鍒跺櫒ID锛屽苟楠岃瘉鍙栨按鍙ｅ拰鎺у埗鍣ㄦ槸鍚﹀瓨鍦�
* 2. 娣诲姞瑙ｇ粦璁板綍
* 3. 鍒犻櫎鎺у埗鍣ㄥ閿�
+ *
* @param po
* @param bindingResult
* @return
@@ -147,15 +154,15 @@
@PostMapping(path = "unbind", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> unbind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
+ public BaseResponse<Boolean> unbind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鏍规嵁缂栧彿鍒嗗埆鑾峰彇鍙栨按鍙ｃ�佹帶鍒跺櫒鏈垹闄よ褰曟暟
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) {
+ if (recIntke == 0 || recController == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
}
@@ -169,23 +176,35 @@
PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
Date operateTime = new Date();
prIntakeController.setOperatedt(operateTime);
- prIntakeController.setOperatetype((byte)2);
+ prIntakeController.setOperatetype((byte) 2);
+ prIntakeController.setRemarks("瑙ｇ粦");
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
- if(rec == 0) {
+ if (rec == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+ }
+ //娣诲姞鍒版祦娴帶鍒跺櫒
+ PrController ControllerList = controllerSv.getByControllerId(po.getControllerId());
+ PrControllerTramp prControllerTramp = new PrControllerTramp();
+ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr());
+ prControllerTramp.setProtocol(ControllerList.getProtocol());
+ prControllerTramp.setFindDt(new Date());
+ prControllerTramp.setOrgTag(ControllerList.getOrgTag());
+ Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0);
+ if (rec_addControllerTramp == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ // 鍒犻櫎鎺у埗鍣�
+ Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteControllerByIdTwo(po.getControllerId())).orElse(0);
+ if (rec_deleteIntakeId == 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) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
* 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栫粦瀹氳褰曞垪琛�
+ *
* @param intakeId 鍙栨按鍙ｇ紪鍙�
* @return 鍙栨按鍙ｄ笅鎺у埗鍣ㄧ殑缁戝畾銆佽В缁戣褰�
*/
@@ -200,22 +219,23 @@
})
@GetMapping(path = "intake_binds")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByIntakeId(Long intakeId){
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByIntakeId(Long intakeId) {
try {
List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByIntakeId(intakeId)).orElse(new ArrayList<>());
- if(list.size() <= 0) {
+ if (list.size() <= 0) {
//鏃犵粦瀹氳褰曚篃杩斿洖鎴愬姛 浣嗘暟鎹负绌�
return BaseResponseUtils.buildSuccess(list);
}//鎴愬姛杩斿洖缁戝畾璁板綍鏁版嵁
return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
- log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ log.error("鏌ヨ寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栫粦瀹氳褰曞垪琛�
+ *
* @param controllerId 鎺у埗鍣ㄧ紪鍙�
* @return 涓庤鎺у埗鍣ㄧ浉鍏崇殑缁戝畾銆佽В缁戣褰�
*/
@@ -230,16 +250,109 @@
})
@GetMapping(path = "controller_binds")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByControllerId(Long controllerId){
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByControllerId(Long controllerId) {
try {
List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByControllerId(controllerId)).orElse(new ArrayList<>());
- if(list.size() <= 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_NO_RECORDS.getMessage());
+ if (list.size() <= 0) {
+ //鏃犵粦瀹氳褰曚篃杩斿洖鎴愬姛 浣嗘暟鎹负绌�
+ return BaseResponseUtils.buildSuccess(list);
}
return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
- log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ log.error("鏌ヨ寮傚父", e);
+ 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(intakeControllerSv.getTrampControllers(vo));
+ } 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);
+ }
+
+ /**
+ * 娓呯┖娴佹氮鎺у埗鍣�
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("emptyTrampController")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> emptyTrampController() {
+
+ Integer rows = intakeControllerSv.emptyTrampController();
+ if (rows == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
--
Gitblit v1.8.0