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

liurunyu

2024-07-22 8b6e17ec0bb67544f45324df64d2c566eeda9b26

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java

@@ -97,6 +97,7 @@

    /**
     * 生成订单号
     *
     * @return
     */
    public String generateOrderNo() {
@@ -114,6 +115,7 @@

    /**
     * 根据取水口ID或阀控器地址获取阀控器对象
     *
     * @param intakeId
     * @return
     */
@@ -133,6 +135,7 @@

    /**
     * 创建命令日志对象
     *
     * @param comId 主键
     * @param commandCode 功能码
     * @param rtuAddr 阀控器地址
@@ -158,6 +161,7 @@

    /**
     * 构造命令对象
     *
     * @param comId 命令ID
     * @param commandCode 功能码
     * @param rtuAddr RTU地址
@@ -181,15 +185,23 @@

    /**
     * 处理回调内容
     *
     * @param comId
     * @return
     */
    protected BaseResponse<Data> dealWithCallBack(Long comId) {
        CompletableFuture<Data> featureObject = new CompletableFuture<>();
        features.put(comId, featureObject);
    protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
        CompletableFuture<Data> feature = new CompletableFuture<>();
        features.put(comId, feature);
        try {
            CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
            System.out.println("receive result ID:" + comId);
            // 发送命令
            JSONObject response_SendCom = (JSONObject) JSON.toJSON(sendCom2Mw(com));
            if (response_SendCom == null || !response_SendCom.getString("code").equals("0001")) {
                // 请求失败，RTU未上线，清除feature
                features.remove(comId);
                JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
                return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
            }

            Data resultData = feature.get(180, TimeUnit.SECONDS);
            features.remove(comId);
            Long commandId = Long.parseLong(resultData.getCommandId());
@@ -211,6 +223,7 @@

    /**
     * 发送命令
     *
     * @return
     */
    protected BaseResponse sendCom2Mw(Command com){
@@ -231,6 +244,7 @@

    /**
     * 构造命令、发送命令并处理请求结果及执行结果
     *
     * @param po
     * @return
     */
@@ -255,11 +269,12 @@
        rmCommandHistoryMapper.insert(rmCommandHistory);
        comId = rmCommandHistory.getComId();

        // 发送命令
        JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
        if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
            // 请求成功, 处理回调
            BaseResponse response_CallBack = dealWithCallBack(comId);
        /**
         * 处理回调
         * feature准备就绪后发送命令
         * 命令发送后立即阻塞等待回调
         */
        BaseResponse response_CallBack = dealWithCallBack(comId, com);

            // 回调异常
            if(!response_CallBack.getCode().equals("0001")) {
@@ -324,22 +339,9 @@
                seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
            }

            // 回调返回的内容
        // 回调返回的内容，回调结果写入命令日志表的任务由中间件完成
            Data myData = (Data)response_CallBack.getContent();

            // 更新命令日志：执行结果、返回结果时间、结果内容
            //rmCommandHistory = new RmCommandHistory();
            //rmCommandHistory.setComId(comId);
            //rmCommandHistory.setResult((byte)1);
            //rmCommandHistory.setResultTime(new Date());
            //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
            //rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);

            return BaseResponseUtils.buildSuccess(myData) ;
        } else {
            // 请求失败
            JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
            return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
        }

    }
}