From ea058e1343bfbc3093eb2e6b8e0148a335cb511c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 一月 2024 08:37:35 +0800
Subject: [PATCH] 《取水口控制器及测控数据关系》文档修改。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index bd9311f..6002806 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -81,7 +81,7 @@
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
- * @param controllerCode 鎺у埗鍣ㄧ紪鍙�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@Operation(summary = "鑾峰緱鎺у埗鍣ㄨ褰�", description = "杩斿洖鍙栨帶鍒跺櫒鏁版嵁")
@@ -95,9 +95,9 @@
})
@GetMapping(path = "controller_list")
@SsoAop()
- public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){
+ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
try {
- List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
if(list.size() <= 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
}
@@ -126,17 +126,23 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
+ //public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid PrController po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- PrController prController = DtoToPojo.INSTANCT.po2vo(po);
+ //PrController prController = DtoToPojo.INSTANCT.po2vo(po);
+ //Date operateTime = new Date();
+ //prController.setOperatedt(operateTime);
+ //prController.setDeleted((byte)0);
+ //prController.setReporttime(operateTime);
+
Date operateTime = new Date();
- prController.setOperatedt(operateTime);
- prController.setDeleted((byte)0);
- prController.setReporttime(operateTime);
- Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
+ po.setOperateDt(operateTime);
+ po.setDeleted((byte)0);
+ po.setFindDt(operateTime);
+ Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
if(rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
}
--
Gitblit v1.8.0