修复粮情数据转换

CZT

2023-12-15 f31db99e67cc3e4a4092b4957af1076b634e6b48

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java

@@ -23,7 +23,7 @@
/**
 * 温湿度检测数据同步
 *
 * @author chen
 * @author czt
 * @date 2022-09-07 14:41
 */
@Slf4j
@@ -66,7 +66,6 @@
                log.info("1302---同步数据：没有查询到需要同步的数据");
                return;
            }
            log.info(JSONObject.toJSONString(list));
            Date syncTime = new Date();
            Api1302 api1302;
            Api1105 api1105;
@@ -87,14 +86,14 @@

                api1302.setCfww(fz35Grain.getTempOut() == null ? 0.00: fz35Grain.getTempOut());
                if(null == fz35Grain.getHumidityOut() || fz35Grain.getHumidityOut() < 0){
                    api1302.setCfws(-1);
                    api1302.setCfws(0);
                }else {
                    api1302.setCfws(fz35Grain.getHumidityOut());
                }

                api1302.setCfnw(fz35Grain.getTempIn() == null ? 0.00: fz35Grain.getTempIn());
                if(null == fz35Grain.getHumidityIn() || fz35Grain.getHumidityIn() < 0){
                    api1302.setCfns(-1);
                    api1302.setCfns(0);
                }else {
                    api1302.setCfns(fz35Grain.getHumidityIn());
                }
@@ -102,6 +101,14 @@
                api1302.setLszgw(fz35Grain.getTempMax() == null ? 0.00: fz35Grain.getTempMax());
                api1302.setLspjw(fz35Grain.getTempAve() == null ? 0.00: fz35Grain.getTempAve());
                api1302.setLszdw(fz35Grain.getTempMin() == null ? 0.00: fz35Grain.getTempMin());

                //判断粮食最低温、平均温、最高温是否符合逻辑
                if(api1302.getLszdw() >= api1302.getLspjw()){
                    continue;
                }
                if(api1302.getLspjw() >= api1302.getLszgw()){
                    continue;
                }

                //温度集合
                if (StringUtils.isEmpty(fz35Grain.getCableCir())) {
@@ -112,7 +119,7 @@
                    api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
                }

                api1302.setZhgxsj(syncTime);
                api1302.setZhgxsj(fz35Grain.getReceiveDate());

                api1302.setBizId(fz35Grain.getBatchId());
                api1302.setKqdm(api1105.getKqdm());
@@ -148,10 +155,13 @@

        String[] points = point.split(",");
        String result = "";
        if (c * h * l > points.length) {
            return result;
        }
        for (int i = 1; i <= l; i++) {
            for (int j = 1; j <= h; j++) {
                for (int z = 1; z <= c; z++) {
                    result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);
                    result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);
                }
            }
        }
@@ -172,9 +182,15 @@
        int g = 0;  //圈根数
        int g1 = 1;  //圈起始根数
        int g2 = 0;  //圈截止根数

        int genNum = 0;
        for (String s : cab) {
            genNum += Integer.valueOf(s);
        }
        String[] points = point.split(",");
        String result = "";
        if (c * genNum > points.length) {
            return result;
        }
        for (int i = 1; i <= q; i++) {
            g1 += g2;
            g = Integer.valueOf(cab[i - 1]);