更改配置及筒仓偏移量

CZT

2023-10-11 564295458c720206db9b5194b90481b711f4b010

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java

@@ -68,12 +68,19 @@
     */
    public void analysis(String sessionKey, IoMessage message) throws Exception {

        String companyId = ContextUtil.getDefaultCompanyId();
        //FZZY云服务器-许昌军粮
        if("1000".equals(companyId)){
            companyId = "5323";
        }
        message.setCompanyId(companyId);
        //注册
        if (BhznGrainV1ServerUtils.FUNCTION_ID_F1.equals(message.getFunctionId())) {
            //DO NOTHING

            log.info("主机------->>平台：注册信息报文={}", message);
            DeviceSer ser = coreSerService.getCacheSerBySn("5323",message.getAddr());

            DeviceSer ser = coreSerService.getCacheSerBySn(message.getCompanyId(), message.getAddr());
            if(ser!= null ){
                ser.setIp(message.getIp());
                ser.setPort(message.getPort());
@@ -111,7 +118,7 @@

            //根据分机地址获取分机信息

            DeviceSer ser = coreSerService.getCacheSer("5323", message.getAddr());
            DeviceSer ser = coreSerService.getCacheSer(message.getCompanyId(), message.getAddr());
            if (ser == null) {
                replayGrain(message);
                log.error("主机-------->>平台，解析粮情失败，未获取到系统粮情主机配置：" + message.getAddr());
@@ -158,7 +165,7 @@
            int cableY = 1;
            int cableX = 1;

            if(DepotType.TYPE_01.equals(depot.getDepotType())){
            if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
                cableZ = Integer.valueOf(attCable[0]);
                cableY = Integer.valueOf(attCable[1]);
                cableX = Integer.valueOf(attCable[2]);
@@ -239,7 +246,7 @@
        int cableY = 1;
        int cableX = 1;

        if(DepotType.TYPE_01.equals(depot.getDepotType())){
        if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
            cableZ = Integer.valueOf(attCable[0]);
            cableY = Integer.valueOf(attCable[1]);
            cableX = Integer.valueOf(attCable[2]);
@@ -326,7 +333,7 @@
        int cableY = 1;
        int cableX = 1;

        if(DepotType.TYPE_01.equals(depot.getDepotType())){
        if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
            cableZ = Integer.valueOf(attCable[0]);
            cableY = Integer.valueOf(attCable[1]);
            cableX = Integer.valueOf(attCable[2]);
@@ -476,7 +483,7 @@
    private void analysisTh(IoMessage message) {
        try {
            THDto th = new THDto();
            th.setCompanyId("5323");
            th.setCompanyId(message.getCompanyId());
            String data = message.getContent();
            String houseNo = data.substring(0, 2);
            String t = data.substring(4, 8);