兼容机台自建配方，实时数据通过mqtt转发

bsw215583320

2024-11-01 e2a02c09b9d087a49ae5dd9f70856967390237de

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

@@ -97,6 +97,10 @@
            // 根据租户id和工单号查询数据库是否有记录，有则返回，没有则新增一条再返回
            orderVo = getOrSaveDryOrderVoDB(realTimeDataVo);
        }
        if (orderVo == null) {
            log.error("工单不存在，工单号："+realTimeDataVo.getWorkorder()+",设备：" + realTimeDataVo.getMachineid() +",药材：" + realTimeDataVo.getName());
            return Result.error("工单不存在");
        }

        // 2 更新工单实时数据
        // 2.1 将工单中的数据替换为最新数据
@@ -126,7 +130,7 @@
        orderVo.setState_valve(realTimeDataVo.getState_valve());
        orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
        orderVo.setEqp_status(realTimeDataVo.getEqp_status());
        orderVo.setEqp_state(realTimeDataVo.getEqp_state());
//        orderVo.setEqp_state(realTimeDataVo.getEqp_state());
        orderVo.setWarning(realTimeDataVo.getEqp_warning());
        orderVo.setFault(realTimeDataVo.getEqp_fault());
        orderVo.setLevel(realTimeDataVo.getLevel());
@@ -232,7 +236,6 @@
     * @param realTimeDataVo
     * @return
     */
    @NotNull
    private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) {
        DryOrderVo orderVo;
        // 查询药材
@@ -242,6 +245,10 @@

        // 创建新工单
        orderVo = new DryOrderVo(realTimeDataVo);
        if (herbFormula == null) {
            log.error("未找到药材："+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",机台：" + realTimeDataVo.getMachineid());
            return null;
        }
        orderVo.setHerbId(herbFormula.getId());
        orderVo.setEquId(equ.getId());
        DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class);
@@ -275,12 +282,14 @@
    private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
        LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryHerbFormula::getCode, realTimeDataVo.getIndex());
        queryWrapper.eq(DryHerbFormula::getName, realTimeDataVo.getName());
        DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
//        if (one == null) {
//            one = new DryHerb(realTimeDataVo);
//            herbService.save(one);
//        }
        if (one == null) {
            one = new DryHerbFormula(realTimeDataVo);
            DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
            one.setEqpType(dryEquipment.getType());
            dryHerbFormulaService.save(one);
        }
        return one;
    }

@@ -318,7 +327,7 @@
    public Result<?> queryMachineRealTImeData(RealTimeDataVo realTimeDataVo) {
        TenantContext.setTenant(realTimeDataVo.getTenantid()+"");

        // 查询所有机台查询组装
        // 查询所有机台,查询语句组装
        LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryEquipment::getEnable, "Y");
@@ -351,9 +360,11 @@
                            dList.add(50d);
                        }

                    } else {
                        // 如果没有生产，效率置0
                        dList.add(0d);
                    }
                    // 如果没有生产，效率置0
                    dList.add(0d);

                });
            }