取水口综合信息优化代码

liurunyu

2025-02-06 5872dc75850327c61d2b5b9f6bd1f3b46d325990

取水口综合信息优化代码

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoAllRound/Ar4BaseMapper.java

@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoAllRound;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase;
import com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoAllRound/Ar4RemoteMapper.java

@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoAllRound;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
import com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoAllRound/Ar4StatisticsMapper.java

@@ -1,8 +1,7 @@
package com.dy.pipIrrGlobal.daoAllRound;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.VoAllRound.*;
import io.swagger.v3.oas.models.security.SecurityScheme;
import com.dy.pipIrrGlobal.voAllRound.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeAmountDay.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeAmountMonth.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java
@@ -1,12 +1,9 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @Author: liurunyu

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeBase.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeLossDay.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeLossMonth.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossMonth.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeOpenCloseValve.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.VoAllRound;
package com.dy.pipIrrGlobal.voAllRound;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper">

    <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase">
    <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase">
        select
        itb.id   as id,
        itb.name as num,

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4RemoteMapper">

    <select id="alarmLastInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote">
    <select id="alarmLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
        select
        CONCAT(
        IF(alarm_loss = 1, '漏损报警，', ''),
@@ -15,7 +15,7 @@
        where intake_id = #{intakeId,jdbcType=BIGINT}
    </select>

    <select id="openCloseValveLastInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote">
    <select id="openCloseValveLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
        select
        op_dt AS lastOpenDt,
        cl_dt AS lastCloseDt
@@ -23,7 +23,7 @@
        where intake_id = #{intakeId,jdbcType=BIGINT}
    </select>

    <select id="lossLastInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote">
    <select id="lossLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
        select
        dt AS lossDt,
        loss_amount AS lossAmount

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4StatisticsMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4StatisticsMapper">

    <select id="openCloseRecords" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeOpenCloseValve">
    <select id="openCloseRecords" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeOpenCloseValve">
        select
        tb.intake_id as intakeId,
        sec.id as clientId,
@@ -31,7 +31,7 @@
    </select>


    <select id="lossDayRecords" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeLossDay">
    <select id="lossDayRecords" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeLossDay">
        select
        tb.intake_id as intakeId,
        tb.dt AS dt,
@@ -47,7 +47,7 @@
    </select>


    <select id="lossMonthRecords" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeLossMonth">
    <select id="lossMonthRecords" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeLossMonth">
        select
        tb.intake_id as intakeId,
        CONCAT(tb.year, '-', tb.month) AS dt,
@@ -64,7 +64,7 @@



    <select id="amountDayRecords" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeAmountDay">
    <select id="amountDayRecords" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeAmountDay">
        select
        tb.intake_id as intakeId,
        tb.dt AS dt,
@@ -82,7 +82,7 @@
    </select>


    <select id="amountMonthRecords" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeAmountMonth">
    <select id="amountMonthRecords" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeAmountMonth">
        select
        tb.intake_id as intakeId,
        CONCAT(tb.year, '-', tb.month) AS dt,

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java

@@ -3,9 +3,8 @@
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.VoArIntakeBase;
import com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -41,7 +40,7 @@
    /**
     * ç»¼åˆä¿¡æ¯
     * å–水口基本信息
     * @return æ‰€æœ‰ç‰‡åŒºæ•°æ®
     * @return å–水口基本信息
     */
    @Operation(summary = "综合信息", description = "取水口基本信息")
    @ApiResponses(value = {

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseSv.java

@@ -1,7 +1,6 @@
package com.dy.pipIrrBase.allRound;

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase;
import com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase;
import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,7 +4,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
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;

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

@@ -4,11 +4,9 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandBackParam;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
import com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote;
import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
import com.dy.pipIrrGlobal.daoAllRound.Ar4RemoteMapper;
import com.dy.pipIrrGlobal.daoAllRound.Ar4StatisticsMapper;
import com.dy.pipIrrGlobal.rtuMw.CodeLocal;
import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
import lombok.extern.slf4j.Slf4j;

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/allRound/Ar4StatisticsCtrl.java

@@ -4,7 +4,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.VoAllRound.*;
import com.dy.pipIrrGlobal.voAllRound.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/allRound/Ar4StatisticsSv.java

@@ -1,8 +1,7 @@
package com.dy.pipIrrStatistics.allRound;

import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.VoAllRound.*;
import com.dy.pipIrrGlobal.voAllRound.*;
import com.dy.pipIrrGlobal.daoAllRound.Ar4StatisticsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

 pipIrr-platform/Îĵµ/»Ûͼ½úÄþϵͳ.txt

New file
@@ -0,0 +1,3 @@
http://jngq.dyzhsw.com/saas
账户:  zhubaomin
密码:  Zbm@123321