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

Administrator

2024-05-20 b5742c2a79bdcc9ef276a7a671fcaa07a7fe5d7c

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

 pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java

@@ -1,7 +1,7 @@
package com.dy.pipIrrMwTestWeb;

import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrMwTestWeb.test.Command;
import com.dy.pipIrrMwTestWeb.test.CommandCtrl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
@@ -28,22 +28,13 @@
                })
        }
)
public class PipIrrMwTestWebApplication implements CommandLineRunner {
public class PipIrrMwTestWebApplication{

    @Autowired
    private Command test ;
    private CommandCtrl test ;

    public static void main(String[] args) {
        SpringApplication.run(PipIrrMwTestWebApplication.class, args);
    }
    /**
     * Spring容器启动完成后，执行下面方法
     * @param args 参数
     * @throws Exception 异常
     */
    @Override
    public void run(String... args) throws Exception {
        BaseResponse res = test.test() ;
        System.out.println(res.toString());
    }

}

 pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java

File was renamed from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Command.java
@@ -3,25 +3,30 @@
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.webUtil.BaseResponse;
import org.springframework.stereotype.Component;
import com.dy.common.webUtil.BaseResponseUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

/**
 * @Author: liurunyu
 * @Date: 2024/5/14 14:20
 * @Description
 */
@Component
public class Command extends ComSupport {
@Slf4j
@RestController
@RequestMapping(path="com")
@SuppressWarnings("unchecked")//java版本越高，对泛型约束越严，所以配置SuppressWarnings("unchecked")
public class CommandCtrl extends ComSupport {

    /**
     * 连接通信中间件测试
     * @return
     */
    public BaseResponse test(){
    @GetMapping(path = "test")
    public BaseResponse<String> test() {
        //return this.connect() ;//连接通信中间件测试
        //return this.cdXY(CodeV202404.cd_97) ;//发送固定参数的命令
        //return this.cd65(1) ;
        return this.cd15() ;
        return this.cdXY(CodeV202404.cd_30) ;//发送固定参数XY的命令
        //return this.cd55(1) ;
        //return this.cd15() ;
        //return this.cd16() ;
        //return this.cd22() ;
        //return this.cd31() ;
    }

    /**
@@ -40,20 +45,20 @@
    //设置终端地址(AFN=0x10H)
    private BaseResponse cd10(){
        ComCd10Vo comVo = new ComCd10Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.rtuNewAddr = Command.rtuAddr ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.rtuNewAddr = CommandCtrl.rtuAddr ;
        return this.sendCom2Mw(this.command(CodeV202404.cd_10, comVo, null)) ;
    }
     //远程用户充值 (AFN=0x15H)
    private BaseResponse cd15(){
        ComCd15Vo comVo = new ComCd15Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.icCardAddr = Command.icCardAddr ;//IC卡地址(8位数字或字母)
        comVo.icCardNo = Command.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.chargeMoney = 12.34 ;//单位:元  2位小数点(最大值 99999999.99)
        comVo.chargeWater = 43.21 ;//单位:m3  2位小数点(最大值 99999999.99)
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.icCardAddr = CommandCtrl.icCardAddr ;//IC卡地址(8位数字或字母)
        comVo.icCardNo = CommandCtrl.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.chargeMoney = 20.0 ;//单位:元  2位小数点(最大值 99999999.99)
        comVo.chargeWater = 20.0 ;//单位:m3  2位小数点(最大值 99999999.99)
        comVo.flowNo = "123456789012" ;//流水号（12位数字）

        return this.sendCom2Mw(this.command(CodeV202404.cd_15, comVo, null)) ;
@@ -61,18 +66,18 @@
    //设置设备终端剩余水量和剩余金额报警值 (AFN=0x16H)
    private BaseResponse cd16(){
        ComCd16Vo comVo = new ComCd16Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.waterAlarm = 10 ;//剩余水量报警值,单位:m3。整数，取值范围0~9999
        comVo.moneyAlarm = 11 ;//剩余金额报警值,单位:元。整数，取值范围0~9999
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.waterAlarm = 100 ;//剩余水量报警值,单位:m3。整数，取值范围0~9999
        comVo.moneyAlarm = 3 ;//剩余金额报警值,单位:元。整数，取值范围0~9999

        return this.sendCom2Mw(this.command(CodeV202404.cd_16, comVo, null)) ;
    }
    //设置设备终端IP地址 (AFN=0x21H)
    private BaseResponse cd21(){
        ComCd21Vo comVo = new ComCd21Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.channel = 1 ;//IP通道号(取值范围 1、2).
        comVo.ip = "111.222.123.321" ;//IP（例如 125.235.35.89）
        comVo.port = 60000 ;///端口号（0~65536）
@@ -82,8 +87,8 @@
    //设置机井年最大开采量和水位下限 (AFN=0x22H)
    private BaseResponse cd22(){
        ComCd22Vo comVo = new ComCd22Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.maxAmountYear = 12345 ;//机井年最大用水量单位：m3 整数，取值范围0~99999999
        comVo.limitLevel = 123.4; //水位下限 单位：m 取值范围:0~9999.99

@@ -92,8 +97,8 @@
    //设置设备终端域名(AFN=0x23H)
    private BaseResponse cd23(){
        ComCd23Vo comVo = new ComCd23Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.channel = 1 ;//IP通道号(取值范围 1、2).
        comVo.domain = "www.baidu.com" ;//域名（例如 dayuyanjiuyuan.to），最大长度42字符
        comVo.port = 60000 ;///端口号（0~65536）
@@ -103,8 +108,8 @@
    //设置设备终端注册号(AFN=0x24H)
    private BaseResponse cd24(){
        ComCd24Vo comVo = new ComCd24Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.registerNo = "102030405060708090" ;//域名（例如 dayuyanjiuyuan.to），最大长度42字符

        return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
@@ -112,8 +117,8 @@
    //设置设备终端年用水量(AFN=0x24H)
    private BaseResponse cd26(){
        ComCd26Vo comVo = new ComCd26Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.ipChannel = 1  ;//IP通道号 0x01:1通道 0x02:2通道.
        comVo.maxAmountYear = 123456  ;//设备终端年用水量 单位：m3 整数，取值范围0~99999999

@@ -122,8 +127,8 @@
    //设置设备终端用水有效(AFN=0x31H)
    private BaseResponse cd31(){
        ComCd31Vo comVo = new ComCd31Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.valid = false ;//有效性

        return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
@@ -131,8 +136,8 @@
    //查询遥测终端充值记录 (AFN=0x55H)
    private BaseResponse cd55(int page){
        ComCd55Vo comVo = new ComCd55Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.page = page ;//分页（取值范围1、2、3、4、5、6、7、8、9）

        return this.sendCom2Mw(this.command(CodeV202404.cd_55, comVo, null)) ;
@@ -140,34 +145,34 @@
    //查询设备终端用户用水记录(AFN=0x65H)
    private BaseResponse cd65(int page){
        ComCd65Vo comVo = new ComCd65Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.page = page ;
        return this.sendCom2Mw(this.command(CodeV202404.cd_65, comVo, null)) ;
    }
    //查询控制器IP地址(AFN=0x86H)
    private BaseResponse cd86(){
        ComCd86Vo comVo = new ComCd86Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.channel = 1 ;//IP通道号(取值范围 1、2).
        return this.sendCom2Mw(this.command(CodeV202404.cd_86, comVo, null)) ;
    }
    //查询控制器域名(AFN=0x87H)
    private BaseResponse cd87(){
        ComCd87Vo comVo = new ComCd87Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.channel = 1 ;//IP通道号(取值范围 1、2).
        return this.sendCom2Mw(this.command(CodeV202404.cd_87, comVo, null)) ;
    }
    //平台/APP远程开启水泵/阀门(AFN=0x92H/AFN=0xA2H)
    private BaseResponse cd92(){
        ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        //comVo.icCardAddr = Test.icCardAddr ;//IC卡地址(8位数字或字母)
        comVo.icCardNo = Command.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.icCardNo = CommandCtrl.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.waterRemain = 123.45 ;//单位:元  2位小数点(最大值 99999999.99)
        comVo.moneyRemain = 234.56 ;//单位:m3  2位小数点(最大值 99999999.99)
        comVo.waterPrice = 0.8 ;//水量单价 单位:元, 2个小数点
@@ -179,10 +184,10 @@
    //平台/APP远程开启水泵/阀门(AFN=0x92H/AFN=0xA2H)
    private BaseResponse cdA2(){
        ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        //comVo.icCardAddr = Test.icCardAddr ;//IC卡地址(8位数字或字母)
        comVo.icCardNo = Command.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.icCardNo = CommandCtrl.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.waterRemain = 123.45 ;//单位:元  2位小数点(最大值 99999999.99)
        comVo.moneyRemain = 234.56 ;//单位:m3  2位小数点(最大值 99999999.99)
        comVo.waterPrice = 0.8 ;//水量单价 单位:元, 2个小数点
@@ -195,9 +200,9 @@
   //平台/APP远程关闭水泵/阀门(AFN=0x93H/AFN=0xA3H)
    private BaseResponse cd93(){
        ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.icCardNo = Command.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.icCardNo = CommandCtrl.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.orderNo = "1234567890123456" ;//订单号（16位数字）

        return this.sendCom2Mw(this.command(CodeV202404.cd_93, comVo, null)) ;
@@ -205,9 +210,9 @@
    //平台/APP远程关闭水泵/阀门(AFN=0x93H/AFN=0xA3H)
    private BaseResponse cdA3(){
        ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
        comVo.controllerType = Command.controllerType ;
        comVo.projectNo = Command.projectNo  ;
        comVo.icCardNo = Command.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.controllerType = CommandCtrl.controllerType ;
        comVo.projectNo = CommandCtrl.projectNo  ;
        comVo.icCardNo = CommandCtrl.icCardNo ;//用户卡序列号（17位数字）（6字节BCD，2字节HEX）
        comVo.orderNo = "1234567890123456" ;//订单号（16位数字）

        return this.sendCom2Mw(this.command(CodeV202404.cd_A3, comVo, null)) ;