Merge remote-tracking branch 'origin/master'

ws

2023-09-28 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990

Merge remote-tracking branch 'origin/master'

 igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java

@@ -51,7 +51,9 @@
    @Autowired
    private ExeOrderService exeOrderService;

    public static Map<String, Map<String, String>> contextMap = new HashMap<>();
    public static String result = "";

    public static Map<String, String> contextMap = new HashMap<>();

    public static double ERROR_CHECK_TAG = -100.0;

@@ -62,6 +64,10 @@
    public static double MAX_TEMP = -50.0;
    public static double MIN_TEMP = 50.0;

    public static void main(String[] args) {
        String str = "00000000FFEB90FEAA41E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF";
        System.out.println(str.substring(9*2, 10*2));
    }
    /**
     * 00000000FFEB90FEAA 41 E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     *
@@ -69,12 +75,21 @@
     */
    public void analysis(String ip, int port, String hexStr) {

        ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
        result += hexStr;
        if(result.length() < 1066*2){
            log.info("分机------->>平台，报文长度不够，等待下一包数据");
            return;
        }

        log.info("分机------->>平台：信息报文={}", reMessage);
        //封装数据
        ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
        reMessage.setIp(ip);
        reMessage.setPort(port);
        log.info("分机------->>平台：粮情完整报文信息={}", reMessage);

        if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
            log.error("分机------->>平台，解析粮情失败：报文起始符={}错误，不解析", reMessage.getStartStr());
            return;
        }

        //根据分机地址获取分机信息
@@ -100,8 +115,7 @@
            return;
        }

        DepotConf depotConf = commonService.getCacheDepotConf(
                exeRequest.getCompanyId(), exeRequest.getDepotId());
        DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
        if (null == depotConf) {
            String info = "粮情解析失败:分机=" + ser.getName() + "没有获取到粮情参数配置信息。";
            log.error("分机------>>>平台：" + info);
@@ -646,7 +660,7 @@
        return msg.getSerId() + "_" + curPacket;
    }

    private String buildContextKey(ReMessage msg, String depotId) {
        return msg.getCompanyId() + "_" + msg.getSerId() + "_" + depotId;
    private String buildContextKey(String companyId, String serId) {
        return companyId + "_" + serId;
    }
}

 igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java

@@ -28,13 +28,29 @@
        ReMessage message = new ReMessage();
        message.setStrMsg(strMsg);
        //设置起始符
        message.setStartStr(strMsg.substring(0, 9*2-1));
        message.setStartStr(strMsg.substring(0, 9*2));

        //设置粮情分机地址
        String str = strMsg.substring(9*2-1, 10*2-1);
        String str = strMsg.substring(9*2, 10*2);
        int i = BytesUtil.hexToInt(str);
        String serId = String.valueOf(i - BeiboGrainServerUtils.BM);
        message.setSerId(serId);
        str = String.valueOf(i - BeiboGrainServerUtils.BM);
        message.setSerId(str);

        //粮情数据
        str = strMsg.substring(10*2, 1034*2);
        message.setGrainStr(str);

        //温度数据
        str = strMsg.substring(1034*2, 1052*2);
        message.setThStr(str);

        //扩充数据
        str = strMsg.substring(1052*2, 1062*2);
        message.setExpand(str);

        //检验码
        str = strMsg.substring(1062*2);
        message.setHexCrc16(str);

        return message;
    }