元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
7 天以前 e5c29d6ac2b210a9385723598d79a42ae5a9679e 
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java


@@ -415,6 +415,11 @@


            myParam.setOpenType(openType);




            BaseResponse<Boolean> result = dealWithCommandResult(myParam);


            // 如果命令执行失败，则再次执行命令


            if(!result.isSuccess()) {


                myParam.setComId(new IDLongGenerator().generate());


                result = dealWithCommandResult(myParam);


            }




            Map map = new HashMap<>();


            map.put("success", result.isSuccess());


@@ -612,7 +617,14 @@


            myParam.setParam(param);


            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);


            myParam.setOperator(operator);


            //BaseResponse<Boolean> result = dealWithCommandResult(myParam);




            BaseResponse<Boolean> result = dealWithCommandResult(myParam);


            // 如果命令执行失败，则再次执行命令


            if(!result.isSuccess()) {


                myParam.setComId(new IDLongGenerator().generate());


                result = dealWithCommandResult(myParam);


            }




            Map map = new HashMap<>();


            map.put("success", result.isSuccess());


@@ -706,6 +718,7 @@


            irIntakeOperate.setOperateType(operatetype);


            irIntakeOperate.setCommandId(comId);


            irIntakeOperate.setIntakeId(intakeId);


            irIntakeOperate.setCommandResult((byte)1);




            Long id = addIntakeOperate(irIntakeOperate);


            if(id == null) {


@@ -783,7 +796,13 @@


            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);


            myParam.setOperator(operator);


            //return dealWithCommandResult(myParam);




            BaseResponse<Boolean> result = dealWithCommandResult(myParam);


            // 如果命令执行失败，则再次执行命令


            if(!result.isSuccess()) {


                myParam.setComId(new IDLongGenerator().generate());


                result = dealWithCommandResult(myParam);


            }




            Map map = new HashMap<>();


            map.put("success", result.isSuccess());