修改统计中sql的bug

liurunyu

2025-01-15 0aca0ade32b616d92017c384979dbe752c3f2582

修改统计中sql的bug

 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

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteCtrl.java

New file
@@ -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版本越高，对泛型约束越严，所以配置SuppressWarnings("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("取水口id不能为空");
        }
        QueryResultVo<VoArIntakeRemote> res = this.sv.intakeInfo(intakeId);
        return BaseResponseUtils.buildSuccess(res);
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java

New file
@@ -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 ;
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/˵Ã÷.txt

New file
@@ -0,0 +1 @@
allRound代表综合