From 75d9e7005aa720f03cfc438f4ad48595a66dcc58 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 一月 2024 16:08:20 +0800
Subject: [PATCH] 1.获取补卡记录2.修改取水口是否绑定查询和地址查询3查询返回取水口ID
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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 4f15979..30a1954 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
@@ -1,5 +1,6 @@
package com.dy.pipIrrProject.controller;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
@@ -81,7 +82,7 @@
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
- * @param controllerCode 鎺у埗鍣ㄧ紪鍙�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@Operation(summary = "鑾峰緱鎺у埗鍣ㄨ褰�", description = "杩斿洖鍙栨帶鍒跺櫒鏁版嵁")
@@ -95,9 +96,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,18 +127,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.setOnlinestate((byte)2);
- 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());
}
@@ -174,6 +180,34 @@
}
/**
+ * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�
+ * @return
+ */
+ @Operation(summary = "鑾峰緱鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｈ褰�", description = "杩斿洖鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｆ暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鎺у埗鍣ㄦ暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "nobinding_intakes")
+ @SsoAop()
+ public BaseResponse<JSONArray> getNoBindingIntakes(){
+ try {
+ JSONArray array = controllerSv.getNoBindingIntakes();
+ if(array.size() <= 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_BINDING_INTAKE.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(array);
+ } catch (Exception e) {
+ log.error("鏌ヨ鎺у埗鍣ㄥ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
* 瀵煎嚭鎺у埗鍣ㄥ垪琛�
* @param response
* @param vo
--
Gitblit v1.8.0