Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-29 a0f875081e27e737b7802bdb2a5b4e1bd6e58c47

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/bak/application-database-pj.yml

File was deleted

 pipIrr-platform/pipIrr-global/bak/application-database-sp.yml

File was deleted

 pipIrr-platform/pipIrr-global/bak/application-database-ym.yml

File was deleted

 pipIrr-platform/pipIrr-global/bak/application-database.yml

File was deleted

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java

@@ -13,13 +13,9 @@
    public static final Integer no = 0 ;
    public static final String YES = "1" ;
    public static final String NO = "0" ;

    // é¡¹ç›®ç¼–号
    public static final Integer projectCode_ym = 100;
    public static final Integer projectCode_pj = 101;

    // åè®®åˆ—表
    public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
//
//    // åè®®åˆ—表
//    public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};

    public static List<String[]> yesNo(){
        List<String[]> list = new ArrayList<>() ;
@@ -51,53 +47,6 @@
        }
        return null ;
    }
//
//    // 1、刷卡开阀；2刷卡关阀；3、中心站开阀；4、中心站关阀；5、欠费关阀；
//    // 6、流量计故障关阀；7、紧急关阀；8、用户远程开阀；9、用户远程关阀；
//    // 16，用户开阀后管道内没有水，自动关阀。管道不出水自动关阀
//    public static final Integer valveOpenByIC = 1 ;//刷卡开阀
//    public static final Integer valveCloseByIC = 2 ;//刷卡关阀
//    public static final Integer valveOpenByCenter = 3 ;//中心站开阀
//    public static final Integer valveCloseByCenter = 4 ;//中心站关阀
//    public static final Integer valveCloseByFee = 5 ;//欠费关阀
//    public static final Integer valveCloseByFlowMeterFault = 6 ;//流量计故障关阀
//    public static final Integer valveCloseByEmergency = 7 ;//紧急关阀
//    public static final Integer valveOpenByRemoteUser = 8 ;//用户远程开阀
//    public static final Integer valveCloseByRemoteUser = 9 ;//用户远程关阀；
//    public static final Integer valveCloseByNoWater = 16 ;//管道无水自动关阀；
//
//    public static Map<Integer, String> openCloseValveTypes(){
//        Map<Integer, String> map = new HashMap<>() ;
//        map.put(valveOpenByIC, "刷卡开阀");
//        map.put(valveCloseByIC , "刷卡关阀") ;
//        map.put(valveOpenByCenter , "中心站开阀") ;
//        map.put(valveCloseByCenter , "中心站关阀") ;
//        map.put(valveCloseByFee , "欠费关阀") ;
//        map.put(valveCloseByFlowMeterFault , "流量计故障关阀") ;
//        map.put(valveCloseByEmergency , "紧急关阀") ;
//        map.put(valveOpenByRemoteUser , "用户远程开阀") ;
//        map.put(valveCloseByRemoteUser , "用户远程关阀") ;
//        map.put(valveCloseByNoWater , "管道无水自动关阀") ;
//        return map ;
//    }
//    public static String openCloseValveTypeName(Integer type){
//        if(type != null){
//            return switch (type.intValue()) {
//                case 1 -> "刷卡开阀";
//                case 2 -> "刷卡关阀";
//                case 3 -> "中心站开阀";
//                case 4 -> "中心站关阀";
//                case 5 -> "欠费关阀";
//                case 6 -> "流量计故障关阀";
//                case 7 -> "紧急关阀";
//                case 8 -> "用户远程开阀";
//                case 9 -> "用户远程关阀";
//                case 16 -> "管道无水自动关阀";
//                default -> "未知";
//            };
//        }
//        return null ;
//    }


}

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

@@ -21,7 +21,7 @@
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long comId;

    private String commandName;
    private String commandName; //命令名称

    private String intakeName;

@@ -35,7 +35,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date resultTime;

    private String result;
    private String state;//执行状态

    private String userName;
    private String result;//命令结果

    private String userName;//操作人
}

 pipIrr-platform/pipIrr-global/src/main/resources/application-database(¿ª·¢²âÊÔ---µ¥Êý¾Ý¿â).yml

@@ -4,5 +4,5 @@
    main:
        allow-bean-definition-overriding: true #设置为true时，后定义的bean会覆盖之前定义的相同名称的bean
    datasource: #配置数据源
        #多个数据源名称在此配置，要求与spring。datasource。[ym][pj]中的一致
        #多个数据源名称在此配置，要求与spring。datasource。[ym][sp][test]中的一致
        names: ym

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

File was renamed from pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
@@ -1,18 +1,18 @@
# æ•°æ®æºé…ç½®
spring:
    datasource: #配置数据源
        pj:
            #name: pj
        sp:
            #name: sp
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:
                # æ•°æ®æºåç§°ï¼šå½“存在多个数据源时，设置名字可以很方便的来进行区分,默认自动生成名称，格式是："DataSource-" + System.identityHashCode(this)
                name: druid-mysql-pj
                name: druid-mysql-sp
                #配置初始化大小、最小、最大
                initialSize: 10
                minIdle: 10

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

@@ -4,5 +4,5 @@
    main:
        allow-bean-definition-overriding: true #设置为true时，后定义的bean会覆盖之前定义的相同名称的bean
    datasource: #配置数据源
        #多个数据源名称在此配置，要求与spring。datasource。[ym][pj]中的一致
        #多个数据源名称在此配置，要求与spring。datasource。[ym][sp]中的一致
        names: ym

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(test²âÊÔϵͳ).yml

@@ -289,7 +289,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -309,7 +309,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(ymԪıϵͳ).yml

@@ -289,7 +289,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -309,7 +309,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(¿ª·¢²âÊÔ---166PC»ú).yml

@@ -291,7 +291,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -311,7 +311,7 @@
        comSendUrl: "http://192.168.40.166:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -348,7 +348,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

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

@@ -295,7 +295,7 @@
#项目编号
#projectCode:
#    ym: 100
#    pj: 101
#    sp: 101

#项目配置
project:
@@ -315,7 +315,7 @@
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
    sp:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -352,7 +352,7 @@
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
    sp:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -50,11 +50,11 @@
                <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
            </irrigateProfile>
        </org1>
        <org2 tag="pj" name="片角" enable="false">
        <org2 tag="sp" name="沙盘" enable="true">
            <districts>
                <province name="云南省" num="53" level="0">
                    <city name="丽江市" num="23" level="1">
                        <country name="永胜县" num="28" level="2" />
                <province name="甘肃省" num="53" level="0">
                    <city name="酒泉市" num="23" level="1">
                        <country name="大禹集团" num="28" level="2" />
                    </city>
                </province>
            </districts>

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

@@ -275,8 +275,6 @@
        SELECT COUNT(*) AS recordCount
        FROM rm_command_history his
                 INNER JOIN pr_intake inta ON inta.id = his.intake_id
                 LEFT JOIN se_client cli ON cli.id = his.operator
                 LEFT JOIN ba_user user ON user.id = his.operator
        <where>
            <if test="intakeId != null">
                AND his.intake_id = #{intakeId}
@@ -296,17 +294,17 @@
    <!--根据指定条件获取命令日志历史记录-->
    <select id="getCommandHistories" resultType="com.dy.pipIrrGlobal.voRm.VoCommand">
        SELECT his.com_id                  AS comId,
               his.command_name            AS commandName,
               CONCAT(his.command_name, '(', his.command_code, ')') AS commandName,
               inta.name                   AS intakeName,
               his.rtu_addr                AS rtuAddr,
               his.protocol,
               his.protocol                AS protocol,
               his.send_time               AS sendTime,
               his.result_time             AS resultTime,
               (CASE
                    WHEN his.result = 1 THEN '成功'
                    ELSE '失败'
                   END)                    AS result,
               his.result_text,
                   END)                    AS state,
               his.result_text             AS result,
               IFNULL(cli.name, user.name) AS userName
        FROM rm_command_history his
                 INNER JOIN pr_intake inta ON inta.id = his.intake_id
@@ -327,7 +325,7 @@
                AND his.send_time BETWEEN #{timeStart} AND #{timeStop}
            </if>
        </where>
        ORDER BY his.send_time DESC
        ORDER BY his.com_id DESC
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test
user:
    defaultTrueRandomFalsePassword: true #true:采用默认密码，false:系统产生随机密码
    defaultPassword: "abc_123"

 pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java

@@ -228,16 +228,7 @@
     */
    public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
        // å®Œå–„查询起止时间
        String timeStart = query.getTimeStart();
        String timeStop = query.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            query.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            query.setTimeStop(timeStop);
        }
        query.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(query);


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Addr.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Addr extends DtoBase {
    public static final long serialVersionUID = 202405221656001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java

@@ -3,6 +3,7 @@
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -12,6 +13,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Alarm extends DtoBase {
    public static final long serialVersionUID = 202407041337001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java

@@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

@@ -13,6 +14,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class AutomaticClose extends DtoBase {
    public static final long serialVersionUID = 202407231039001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Card.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Card extends DtoBase {
    public static final long serialVersionUID = 202406291102001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CollectPeriod.java

@@ -4,6 +4,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -13,6 +14,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class CollectPeriod extends DtoBase {
    public static final long serialVersionUID = 202407201038001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/CommandGet.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class CommandGet extends DtoBase {
    public static final long serialVersionUID = 202407041401001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Domain.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Domain extends DtoBase {
    public static final long serialVersionUID = 202407050857001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DrivenWell.java

@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -10,6 +11,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class DrivenWell extends DtoBase {
    public static final long serialVersionUID = 202407041644001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Recharge.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Recharge extends DtoBase {
    public static final long serialVersionUID = 202406260745001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java

@@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class Usability extends DtoBase {
    public static final long serialVersionUID = 202407021101001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java

@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -10,6 +11,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class ValveOpen extends DtoBase{
    public static final long serialVersionUID = 202405231531001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/WaterConsumption.java

@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.common.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -10,6 +11,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class WaterConsumption extends DtoBase {
    public static final long serialVersionUID = 202407050835001L;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/OnLineIntakesQO.java

@@ -4,6 +4,7 @@
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -13,6 +14,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class OnLineIntakesQO extends QueryConditionVo {
    /**
     * ä¸­é—´ä»¶è¿”回的RTU在线情况对象数组

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java

@@ -42,4 +42,15 @@
     * æŸ¥è¯¢æˆªæ­¢æ—¶é—´
     */
    private String timeStop;


    public void completionTime(){
        if(timeStart != null && !timeStart.trim().equals("")) {
            timeStart = timeStart + " 00:00:00";
        }
        if(timeStop != null && !timeStop.trim().equals("")) {
            timeStop = timeStop + " 23:59:59";
        }

    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/QueryVo.java

@@ -2,6 +2,7 @@

import com.dy.common.webUtil.QueryConditionVo;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author ZhuBaoMin
@@ -11,6 +12,7 @@
 */

@Data
@EqualsAndHashCode(callSuper=true)
public class QueryVo extends QueryConditionVo {
    /**
     * å–水口编号

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java

@@ -238,7 +238,6 @@
        Integer projectNo1 = Integer.valueOf(projectNo);
        String projectNo3 = String.format("%02x", projectNo1);
        map.put("projectNo", projectNo3);
        //map.put("projectCode", Constant.projectCode_ym);
        map.put("cardNum", cardNum);
        return BaseResponseUtils.buildSuccess(map) ;
    }

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    include: global, database, database-ym, database-pj, database-test
    include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management:
@@ -13,4 +13,4 @@
        context-path: /statistics #web访问上下文路径
        context-parameters:
            #GenerateIdSetSuffixListener中应用，取值范围是0-99
            IdSuffix: ${pipIrr.statistics.IdSuffix}
            IdSuffix: ${pipIrr.statistics.idSuffix}

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
    profiles:
        include: global, database, database-ym, database-pj, database-test
        include: global, database, database-ym, database-sp, database-test

#actutor的web端口
management: