新增配方记录功能并优化相关实体和VO

baoshiwei

2024-10-25 a3344947e1ff54fcae8f09140ab0d05e2ba26f31

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

@@ -49,6 +49,9 @@
    private IDryHerbService herbService;

    @Autowired
    private IDryHerbFormulaService dryHerbFormulaService;

    @Autowired
    private IDryEquipmentService equipmentService;

    @Autowired
@@ -57,8 +60,6 @@
    @Autowired
    private IDryProdRecordService prodRecordService;

    @Autowired
    private CommonAPI commonAPI;

    private String token;

@@ -235,13 +236,13 @@
    private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) {
        DryOrderVo orderVo;
        // 查询药材
        DryHerb herb =  queryHerbByIndexTenant(realTimeDataVo);
        DryHerbFormula herbFormula =  queryHerbByIndexTenant(realTimeDataVo);
        // 查询设备
        DryEquipment equ = queryEquipmentByCodeTenant(realTimeDataVo);

        // 创建新工单
        orderVo = new DryOrderVo(realTimeDataVo);
        orderVo.setHerbId(herb.getId());
        orderVo.setHerbId(herbFormula.getId());
        orderVo.setEquId(equ.getId());
        DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class);
        boolean save = dryOrderService.save(dryOrder);
@@ -271,15 +272,15 @@
     * @param realTimeDataVo
     * @return
     */
    private DryHerb queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
        LambdaQueryWrapper<DryHerb> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryHerb::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryHerb::getCode, realTimeDataVo.getIndex());
        DryHerb one = herbService.getOne(queryWrapper);
        if (one == null) {
            one = new DryHerb(realTimeDataVo);
            herbService.save(one);
        }
    private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
        LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryHerbFormula::getCode, realTimeDataVo.getIndex());
        DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
//        if (one == null) {
//            one = new DryHerb(realTimeDataVo);
//            herbService.save(one);
//        }
        return one;
    }

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


        // 查询所有机台查询组装
        LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();

         queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryEquipment::getEnable, "Y");
        queryWrapper.orderByAsc(DryEquipment::getCode);

        // 查询所有机台
        List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper);
        // 机台列表，用于效率对比
        List<String> list = new ArrayList<>();

        // 效率列表，用于效率对比
        List<Double> dList = new ArrayList<>();
        // 查询当前机台工单
        DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid());
            try {
        try {
            // 如果有可用机台
            if (dryEquipments != null && dryEquipments.size() > 0) {
                // 查询其它机台工单
                dryEquipments.stream().forEach(item -> {
                    // 获取工单
                    DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
                    list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
                    if (order != null) {
                        // 计算干燥效率，用于对比
                        DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1);
                        double v = order.getOriginWeight() - dryOrderTrendVo.getWeight();


                if (dryEquipments != null && dryEquipments.size() > 0) {
                    dryEquipments.stream().forEach(item -> {
                        DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
                        list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
                        if (order != null) {
                            DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1);
                            double v = order.getOriginWeight() - dryOrderTrendVo.getWeight();

                            if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
                                DecimalFormat df = new DecimalFormat("#.00");
                                dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
                            } else {
                                dList.add(50d);
                            }

                        if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
                            DecimalFormat df = new DecimalFormat("#.00");
                            dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
                        } else {
                            dList.add(50d);
                        }
                        dList.add(0d);
                    });
                }
                if (orderVo != null) {
                    orderVo.setCompEqpNum(list);
                    orderVo.setCompEqpEffic(dList);
                }
            }catch (Exception e) {
                e.printStackTrace();

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

            if (orderVo != null) {
                // 将效率对比数据放入当前机台实时数据中返回
                orderVo.setCompEqpNum(list);
                orderVo.setCompEqpEffic(dList);
                // 查询近十次效率和能能耗平均
                dryOrderService.queryRecentOrderAvg(orderVo);
            }
        }catch (Exception e) {
            e.printStackTrace();
        }
        return Result.ok(orderVo);
    }

@@ -425,4 +434,9 @@
        //redisUtil.get(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode()
        return Result.OK(orderVo);
    }

    @Override
    public Result<?> statisticsDataHandle(StatisticsDataVo statsDataVo) {
        return null;
    }
}