元谋二期后端软件系统
parent: 4d20a0de | 补丁 | 提交 | ignore whitespace
liurunyu
2024-07-26 113850144f0ff9358fd278c9077ff3396bcb4c38 
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
7个文件已修改
66 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java


@@ -58,7 +58,8 @@


    /**


     * 开阀类型


     */


    private Byte openType;


    //private Byte openType;


    private String openType;




    /**


     * 开阀订单号


@@ -104,7 +105,8 @@


    /**


     * 关阀类型


     */


    private Byte closeType;


    //private Byte closeType;


    private String closeType;




    /**


     * 关阀报中本地用水量




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


@@ -5,9 +5,9 @@


            #name: pj


            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://192.168.40.166: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://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull


#            url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?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/application-database-sp.yml


@@ -5,9 +5,9 @@


      #name: sp


      type: com.alibaba.druid.pool.DruidDataSource


      driverClassName: com.mysql.cj.jdbc.Driver


#      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://192.168.40.166: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


      url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull


#      url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?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/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://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull


            url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull


#            url: jdbc:mysql://8.140.179.55: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/application-global.yml


@@ -72,7 +72,7 @@




pipIrr:


    global:


        dev: true   #是否开发阶段，true或false


        dev: false   #是否开发阶段，true或false


        dsName: ym  #开发阶段，设置临时的数据库名称


    mw:


        webPort: 8070




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


@@ -444,7 +444,14 @@


      oh.op_ic_card_no AS openIcNum,


      oh.op_ic_card_addr AS openIcAddr,


      oh.op_dt AS openTime,


      oh.op_type AS openType,


    CASE


      WHEN oh.op_type = 1 THEN "刷卡开阀"


      WHEN oh.op_type = 3 THEN "中心站开阀"


      WHEN oh.op_type = 5 THEN "欠费关阀"


      WHEN oh.op_type = 8 THEN "用户远程开阀"


      WHEN oh.op_type = 11 THEN "开关阀卡开阀"


      ELSE "未知"


    END AS openType,


      oh.op_order_no AS openOrderNo,


      oh.op_total_amount AS openTotalAmount,


      oh.op_remain_money AS openRemainMoney,


@@ -453,7 +460,19 @@


      oh.cl_ic_card_no AS closeIcNum,


      oh.cl_ic_card_addr AS closeIcAddr,


      oh.cl_dt AS closeTime,


      oh.cl_type AS closeType,


    CASE


      WHEN oh.cl_type = 2 THEN "刷卡关阀"


      WHEN oh.cl_type = 4 THEN "中心站关阀"


      WHEN oh.cl_type = 5 THEN "欠费关阀"


      WHEN oh.cl_type = 6 THEN "流量计故障关阀"


      WHEN oh.cl_type = 7 THEN "紧急关闭"


      WHEN oh.cl_type = 9 THEN "用户远程关阀"


      WHEN oh.cl_type = 10 THEN "开关阀卡关阀"


      WHEN oh.cl_type = 12 THEN "黑名单命令关阀"


      WHEN oh.cl_type = 13 THEN "用户远程定时关阀"


      WHEN oh.cl_type = 14 THEN "用户远程定量关阀"


      ELSE "未知"


    END AS closeType,


      oh.cl_this_amount AS closeThisAmount,


      oh.cl_this_time AS thisTime,


      oh.cl_this_money AS thisMoney,




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


@@ -464,7 +464,14 @@


      oh.op_ic_card_no AS openIcNum,


      oh.op_ic_card_addr AS openIcAddr,


      oh.op_dt AS openTime,


      oh.op_type AS openType,


    CASE


      WHEN oh.op_type = 1 THEN "刷卡开阀"


      WHEN oh.op_type = 3 THEN "中心站开阀"


      WHEN oh.op_type = 5 THEN "欠费关阀"


      WHEN oh.op_type = 8 THEN "用户远程开阀"


      WHEN oh.op_type = 11 THEN "开关阀卡开阀"


      ELSE "未知"


    END AS openType,


      oh.op_order_no AS openOrderNo,


      oh.op_total_amount AS openTotalAmount,


      oh.op_remain_money AS openRemainMoney,


@@ -473,7 +480,19 @@


      oh.cl_ic_card_no AS closeIcNum,


      oh.cl_ic_card_addr AS closeIcAddr,


      oh.cl_dt AS closeTime,


      oh.cl_type AS closeType,


    CASE


      WHEN oh.cl_type = 2 THEN "刷卡关阀"


      WHEN oh.cl_type = 4 THEN "中心站关阀"


      WHEN oh.cl_type = 5 THEN "欠费关阀"


      WHEN oh.cl_type = 6 THEN "流量计故障关阀"


      WHEN oh.cl_type = 7 THEN "紧急关闭"


      WHEN oh.cl_type = 9 THEN "用户远程关阀"


      WHEN oh.cl_type = 10 THEN "开关阀卡关阀"


      WHEN oh.cl_type = 12 THEN "黑名单命令关阀"


      WHEN oh.cl_type = 13 THEN "用户远程定时关阀"


      WHEN oh.cl_type = 14 THEN "用户远程定量关阀"


      ELSE "未知"


    END AS closeType,


      oh.cl_this_amount AS closeThisAmount,


      oh.cl_this_time AS thisTime,


      oh.cl_this_money AS thisMoney,