优化代码

liurunyu

2024-12-05 e48d097ca0532090a7a109af4c2c9c6e1b288a34

优化代码

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

@@ -65,7 +65,7 @@
            }
        } catch (Exception e) {
            log.error("命令执行异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
            return BaseResponseUtils.buildErrorMsg(e.getMessage());
        }
    }


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

@@ -61,7 +61,7 @@
     * @param rtuAddr
     * @return
     */
    public RtuStatus rtuStatus(String rtuAddr){
    public RtuStatus rtuStatus(String rtuAddr) throws Exception{
        //向通信中间件发关命令，查询部分RTU在线情况
        RtuStatus rtuStatus = null ;
        Command com = this.createInnerCommand(CodeLocal.oneRtuStates);
@@ -75,16 +75,23 @@
                if(bakParam != null){
                    if(bakParam.getSuccess().booleanValue()){
                        //通信中间件成功返回命令结果
                        rtuStatus = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), RtuStatus.class);
                        if(reCom.getAttachment() != null){
                            rtuStatus = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), RtuStatus.class);
                        }else{
                            throw new Exception("通信中间件未掌握该RTU的状态，可能该RTU未上线") ;
                        }
                    }
                }else{
                    log.error("通信中间件返回内部命令结果中不包含CommandBackParam类型参数");
                    throw new Exception("通信中间件执行命令出错") ;
                }
            }else{
                log.error("通信中间件返回内部命令执行失败" + (res.getMsg() == null? "" : ("，" + res.getMsg()))) ;
                throw new Exception("通信中间件执行命令出错" + (res.getMsg() == null? "" : ("，" + res.getMsg()))) ;
            }
        }else{
            log.error("通信中间件返回内部命令结果为null");
            throw new Exception("通信中间件执行命令出错，返回内部命令结果为null") ;
        }
        return rtuStatus ;
    }