herb.git - Gitblit

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

			@Autowired
			private CommonAPI commonAPI;

			private String token;

			@@ -317,26 +315,29 @@
			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");
			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 {


			// 如果有可用机台
			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();

			@@ -348,12 +349,17 @@
			}

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

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