设备类型增加效率和均耗绑定

bsw215583320

2024-04-16 3ee30263eb9bb5f7bf1228ea45ce5d498fb3cdef

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

@@ -100,6 +100,7 @@
        // 2 更新工单实时数据
        // 2.1 将工单中的数据替换为最新数据
        realTimeDataVo.setOrderId(orderVo.getId());

        orderVo.setInitial(realTimeDataVo.getMoisture1());
        orderVo.setDryTime(realTimeDataVo.getTime3());
        orderVo.setDelay(realTimeDataVo.getDelay());
@@ -186,7 +187,7 @@
        orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());
        // 2.3 更新到redis缓存
        redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(),
                realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 600000);
                realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 60*60);
        return Result.ok();
    }

@@ -219,6 +220,7 @@
            }
        // 3 数据库没有则新增一条数据
        } else {

            orderVo = saveNewOrder(realTimeDataVo);
        }
        return orderVo;
@@ -288,7 +290,7 @@
     */
    private void saveOrderTrendVo(DryOrderTrendVo trendVo, DryOrderVo orderVo) {
        //判断 实时含水率 或 实时重量有没有变化，有变化则更新
        if(orderVo.getTrendVo() == null
        if(orderVo.getTrendVo() == null && trendVo != null && trendVo.getWeight() > 0
                || trendVo.getWeight() < orderVo.getTrendVo().getWeight()
                ) {
            DryOrder byId = dryOrderService.getById(orderVo.getId());
@@ -318,8 +320,9 @@

        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<>();
@@ -332,17 +335,20 @@
                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) {
                            double v = order.getOriginWeight() - order.getYield();
                            list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
                            if (v > 0 && order.getDryTime()>0) {
                            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 / order.getDryTime() * 60)));
                                dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
                            } else {
                                dList.add(50d);
                            }

                        }
                        dList.add(0d);
                    });
                }
                if (orderVo != null) {