修改RTU升级文件CRC16计算的bug

liurunyu

2025-01-21 5b89937212db0c507145187313eb5b326220f47b

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java

@@ -1,9 +1,23 @@
package com.dy.pipIrrRemote.allRound;

import com.alibaba.fastjson2.JSON;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandBackParam;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
import com.dy.pipIrrGlobal.rtuMw.CodeLocal;
import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import java.util.HashMap;
import java.util.List;

/**
 * @Author: liurunyu
@@ -12,13 +26,58 @@
 */
@Slf4j
@Service
public class Ar4RemoteSv {
public class Ar4RemoteSv extends Web2RtuMw {

    @Autowired
    private Ar4BaseMapper baseDao;

    @Autowired
    private Environment env;

    @Autowired
    private RestTemplate restTemplate;

    /**
     * 取水口基本信息
     * @return 取水口基本信息
     */
    public QueryResultVo<VoArIntakeRemote> intakeInfo(Long intakeId){
        VoArIntakeRemote rVo = new VoArIntakeRemote() ;

        String rtuAddr = null ;
        List<String> rtuAddrs = baseDao.intakeRtuAddr(intakeId) ;
        if(rtuAddrs != null && rtuAddrs.size() > 0){
            rtuAddr = rtuAddrs.get(0) ;
        }
        if(rtuAddr != null){
            //向通信中间件发关命令，查询部分RTU在线情况
            Command com = this.createInnerCommand(CodeLocal.onLinePart);
            com.setParam(rtuAddr) ;
            String rqUrl = this.get2MwRequestUrl(this.env, ContextComSend) ;
            BaseResponse res = sendPostRequest2Mw(restTemplate, rqUrl, com) ;
            if(res != null){
                if(res.isSuccess()){
                    Command reCom = JSON.parseObject(res.getContent() == null ? null : JSON.toJSONString(res.getContent()), Command.class) ;
                    CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : JSON.toJSONString(reCom.param), CommandBackParam.class) ;
                    if(bakParam != null){
                        if(bakParam.getSuccess().booleanValue()){
                            //通信中间件成功返回命令结果
                            HashMap<String, Boolean> onLineMap = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), HashMap.class);
                            if(onLineMap != null && onLineMap.size() > 0){
                                rVo.onLine = onLineMap.get(rtuAddr) ;
                            }
                        }
                    }else{
                        log.error("通信中间件返回内部命令结果中不包含CommandBackParam类型参数");
                    }
                }else{
                    log.error("通信中间件返回内部命令执行失败" + (res.getMsg() == null? "" : ("，" + res.getMsg()))) ;
                }
            }else{
                log.error("通信中间件返回内部命令结果为null");
            }
        }

        return null ;
    }
}