liurunyu
2024-08-29 7ed80ed1085e5350f2a1eea7ebb6a3e76a19043d
完善代码,删除重复类
2个文件已修改
2个文件已删除
134 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverterConfig.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -19,10 +19,13 @@
 * @Description
 */
public class ComSupportP206V202404 {
    protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ;
    protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
    protected static final String mwIp = "romq9311819.vicp.fun" ; //http://romq9311819.vicp.fun:16583
    protected static final String mwPort = "16583" ;
    protected static String rtuAddr = "37142501020100215" ;
    protected static String mwUrlTest = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/test" ;
    protected static String mwUrlSendCom = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/send" ;
    protected static String rtuAddr = "41162810400100001" ;
    protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
    protected static String controllerType = "57" ;//控制器类型
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
@@ -18,23 +18,56 @@
public class CommandP206V202404Ctrl extends ComSupportP206V202404 {
    @GetMapping(path = "test")
    public BaseResponse<String> test() {
        //return this.connect() ;//连接通信中间件测试
        //return this.cdXY(CodeV202404.cd_9C) ;//发送固定参数XY的命令
        //return this.cd55(1) ;
        //return this.cd15() ;
        //return this.cd16() ;
        //return this.cd21() ;
        //return this.cd22() ;
        //return this.cd23() ;
        //return this.cd24() ;
        //return this.cd26() ;
        //return this.cd31() ;
        //return this.cd86() ;
        //return this.cd87() ;
        return this.cd92() ;
        //return this.cd93() ;
        //return this.cd9C() ;
    public BaseResponse<String> test(String com) {
        BaseResponse<String> rt = null ;
        if(com == null){
            rt = this.connect() ;//连接通信中间件测试
        }else{
            try{
                if(com.equals("10")){
                    rt = this.cd10() ;
                }else if(com.equals("15")){
                    rt = this.cd15() ;
                }else if(com.equals("16")){
                    rt = this.cd16() ;
                }else if(com.equals("21")){
                    rt = this.cd21() ;
                }else if(com.equals("22")){
                    rt = this.cd22() ;
                }else if(com.equals("23")){
                    rt = this.cd23() ;
                }else if(com.equals("24")){
                    rt = this.cd24() ;
                }else if(com.equals("26")){
                    rt = this.cd26() ;
                }else if(com.equals("31")){
                    rt = this.cd31() ;
                }else if(com.equals("55")){
                    rt = this.cd55(1) ;
                }else if(com.equals("65")){
                    rt = this.cd65(1) ;
                }else if(com.equals("86")){
                    rt = this.cd86() ;
                }else if(com.equals("87")){
                    rt = this.cd87() ;
                }else if(com.equals("92")){
                    rt = this.cd92() ;
                }else if(com.equals("93")){
                    rt = this.cd93() ;
                }else if(com.equals("9C")){
                    rt = this.cd9C() ;
                }else if(com.equals("A2")){
                    rt = this.cdA2() ;
                }else if(com.equals("A3")){
                    rt = this.cdA3() ;
                }else{
                    rt = this.cdXY(com) ;//发送固定参数XY的命令, 例命令CodeV202404.cd_9C
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        return rt ;
    }
    /**
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java
File was deleted
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverterConfig.java
File was deleted