2024-10-18 朱宝民 待关阀列表

zhubaomin

2024-10-18 e170c6e3119d6e26f7142b26394350a855e89bb0

2024-10-18 朱宝民 待关阀列表

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java

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

import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

/**
@@ -11,22 +12,46 @@
 */

@Data
@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned"})
public class VoUnclosedValve implements BaseEntity {
    private static final long serialVersionUID = 202405241634001L;

    //private String commandCode;

    /**
     * 取水口编号
     */
    private String intakeNum;

    /**
     * 是否在线
     */
    private Boolean isOnLine;

    /**
     * 阀控器地址
     */
    private String rtuAddr;

    /**
     * 虚拟卡编号
     */
    private String vcNum;

    /**
     * 订单号
     */
    private String orderNo;

    /**
     * 状态
     */
    private String state;

    /**
     * 是否计划性开阀
     */
    private Boolean planned;

    //private Date openTime;
}

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml

@@ -5,9 +5,9 @@
            #name: ym
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:

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

@@ -212,10 +212,13 @@
            'toClose'                  AS state,
            CASE
                WHEN com.command_code = 'A1' OR com.command_code = 'A2' THEN 0
            END AS planned
                ELSE 0
            END AS planned,
            com.send_time AS sendTime
        FROM rm_command_history com
            INNER JOIN pr_intake inta ON inta.id = com.intake_id
            INNER JOIN JSON_TABLE(
            INNER JOIN pr_controller con ON com.rtu_addr = con.rtuAddr
            INNER JOIN pr_intake inta ON con.intakeId = inta.id
            LEFT JOIN JSON_TABLE(
<!--                '[{"rtuAddr":"620201000030","isOnLine":true}]',-->
                #{onLineMap},
                '$[*]' COLUMNS (
@@ -233,7 +236,9 @@
                AND param ->> '$.orderNo' = com.param ->> '$.orderNo'
            )
        </where>
        GROUP BY inta.name, rtus.isOnLine, com.rtu_addr, com.param ->> '$.icCardNo', com.command_code
        GROUP BY inta.name, rtus.isOnLine, com.rtu_addr, com.param ->> '$.icCardNo', com.command_code, com.send_time
        ORDER BY com.send_time DESC
        LIMIT 1
    </select>

    <!--根据取水口ID获取该取水口未关阀参数-->

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java

@@ -111,7 +111,7 @@
                jsonArray.add(jsonObject);
            }

            System.out.println(jsonArray);
            System.out.println(jsonArray.toJSONString());
            List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator);
            if(res != null) {
                return res;