Merge branch 'master' of http://lanpucloud.cn:1111/r/herb

zhuguifei

2025-11-14 87b161325d9186d8211a7d472ed04fa279f33954

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java

@@ -407,6 +407,8 @@
                    log.error("新增设备失败：数据库保存异常！equipment={}", addEqu);
                    return null;
                }
                redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS_LIST);
                redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS);
            } catch (Exception e) {
                e.printStackTrace();
            } finally {
@@ -520,15 +522,15 @@
        queryWrapper.last("LIMIT 1");
        DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);

        if (one == null) {
            one = new DryHerbFormula(realTimeDataVo);
            DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
            if (dryEquipment != null && dryEquipment.getType() != null) {
                one.setEqpType(dryEquipment.getType());
            }

            dryHerbFormulaService.save(one);
        }
//        if (one == null) {
//            one = new DryHerbFormula(realTimeDataVo);
//            DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
//            if (dryEquipment != null && dryEquipment.getType() != null) {
//                one.setEqpType(dryEquipment.getType());
//            }
//
//            dryHerbFormulaService.save(one);
//        }
        return one;
    }

@@ -668,9 +670,9 @@
                if (order != null) {
                    orderVo.setEnvHum(order.getEnvHum());
                    orderVo.setEnvTemp(order.getEnvTemp());
                    double watt = order.getWatt() - order.getDetailList().get(0).getWatt();
                    double watt = order.getWatt() - (order.getDetailList().size() > 0 ?order.getDetailList().get(0).getWatt():0);
                    orderVo.setWatt(orderVo.getWatt() == null ? watt : orderVo.getWatt() + watt);
                    double steam = order.getSteam() - order.getDetailList().get(0).getSteam();
                    double steam = order.getSteam() - ( order.getDetailList().size() > 0 ?order.getDetailList().get(0).getSteam():0);
                    orderVo.setSteam(orderVo.getSteam() == null ? steam : orderVo.getSteam() + steam);
                    orderVo.setOriginWeight(orderVo.getOriginWeight() == null ? order.getOriginWeight() : orderVo.getOriginWeight() + order.getOriginWeight());