From 0aca0ade32b616d92017c384979dbe752c3f2582 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 15 一月 2025 15:53:11 +0800
Subject: [PATCH] 修改统计中sql的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 4 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 24 ++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteCtrl.java | 64 ++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/说明.txt | 1
4 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index af1172a..6c5d694 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -653,7 +653,7 @@
inta.name AS intakeNum,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN (SELECT intake_id
+ INNER JOIN (SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
@@ -671,7 +671,7 @@
inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
- LEFT JOIN(SELECT intake_id
+ INNER JOIN(SELECT intake_id
FROM rm_open_close_valve_history
WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
) his ON his.intake_id = inta.id
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteCtrl.java
new file mode 100644
index 0000000..b110125
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteCtrl.java
@@ -0,0 +1,64 @@
+package com.dy.pipIrrRemote.allRound;
+
+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.VoAllRound.VoArIntakeRemote;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/1/14 16:59
+ * @Description
+ */
+@Slf4j
+@Tag(name = "鏈夊叧杩滅▼鎿嶄綔淇℃伅鐨勭患鍚�", description = "鏈夊叧杩滅▼鎿嶄綔淇℃伅鐨勭患鍚�")
+@RestController
+@RequestMapping(path = "ar4Remote")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class Ar4RemoteCtrl {
+
+ private Ar4RemoteSv sv;
+
+ @Autowired
+ private void setSv(Ar4RemoteSv sv) {
+ this.sv = sv;
+ }
+
+ /**
+ * 缁煎悎淇℃伅
+ * 鍙栨按鍙ｅ熀鏈俊鎭�
+ * @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 = VoArIntakeRemote.class))}
+ )
+ })
+ @GetMapping(path = "intakeInfo")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<VoArIntakeRemote>> intakeInfo(Long intakeId) {
+ if (intakeId == null || intakeId.longValue() == 0L) {
+ return BaseResponseUtils.buildException("鍙栨按鍙d涓嶈兘涓虹┖");
+ }
+ QueryResultVo<VoArIntakeRemote> res = this.sv.intakeInfo(intakeId);
+ return BaseResponseUtils.buildSuccess(res);
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
new file mode 100644
index 0000000..ce1b11d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
@@ -0,0 +1,24 @@
+package com.dy.pipIrrRemote.allRound;
+
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/1/14 16:59
+ * @Description
+ */
+@Slf4j
+@Service
+public class Ar4RemoteSv {
+
+ /**
+ * 鍙栨按鍙ｅ熀鏈俊鎭�
+ * @return 鍙栨按鍙ｅ熀鏈俊鎭�
+ */
+ public QueryResultVo<VoArIntakeRemote> intakeInfo(Long intakeId){
+ return null ;
+ }
+}
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/\350\257\264\346\230\216.txt"
new file mode 100644
index 0000000..3129cac
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/\350\257\264\346\230\216.txt"
@@ -0,0 +1 @@
+allRound浠ｈ〃缁煎悎
\ No newline at end of file
--
Gitblit v1.8.0