From c2fccb01b972176dc3da5a497b5e904025e9e98d Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 15:06:51 +0800
Subject: [PATCH] Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 72 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index a28e5cd..aa8d0f9 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -8,14 +8,20 @@
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IoSession;
+import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.config.mqtoken.UserTokenContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.dry.common.CacheConstants;
import org.jeecg.modules.dry.entity.*;
import org.jeecg.modules.dry.service.*;
import org.jeecg.modules.dry.socket.ServerHandler;
import org.jeecg.modules.dry.socket.SocketServerConfig;
+import org.jeecg.modules.dry.util.DryUtil;
import org.jeecg.modules.dry.vo.*;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,13 +58,31 @@
private IDryProdRecordService prodRecordService;
@Autowired
- private IoAcceptor ioAcceptor;
+ private CommonAPI commonAPI;
+
+ private String token;
+
+
+
+ public String getTemporaryToken() {
+ if (token == null) {
+ RedisUtil redisUtil = SpringContextUtils.getBean(RedisUtil.class);
+ // 妯℃嫙鐧诲綍鐢熸垚Token
+ token = JwtUtil.sign("admin", "b668043e3ea4bc2d");
+ // 璁剧疆Token缂撳瓨鏈夋晥鏃堕棿涓� 5 鍒嗛挓
+ redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+ redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 5 * 60 * 1000);
+ }
+
+ return token;
+ }
@Override
@Transactional
public Result<?> realTimeDataHandle(RealTimeDataVo realTimeDataVo) {
TenantContext.setTenant(realTimeDataVo.getTenantid()+"");
- log.info("瀹炴椂鏁版嵁锛�"+realTimeDataVo.toString());
+ // log.info("瀹炴椂鏁版嵁锛�"+realTimeDataVo.toString());
+
// 1 鏌ヨ鎴栧垱寤哄伐鍗�
// 1.1 浠巖edis鍙栧嚭宸ュ崟缂撳瓨
@@ -99,12 +123,12 @@
orderVo.setState_windbox(realTimeDataVo.getState_windbox());
orderVo.setState_valve(realTimeDataVo.getState_valve());
orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
+ orderVo.setEqp_status(realTimeDataVo.getEqp_status());
+ orderVo.setEqp_state(realTimeDataVo.getEqp_state());
+ orderVo.setWarning(realTimeDataVo.getEqp_warning());
+ orderVo.setFault(realTimeDataVo.getEqp_fault());
+ orderVo.setLevel(realTimeDataVo.getLevel());
- String fault = realTimeDataVo.getFault();
-// String[] split = fault.split(",");
-// for (String s : split) {
-//
-// }
DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
// 2.2 淇濆瓨宸ュ崟鍚按鐜囧彉鍖� 鎴� 閲嶉噺鍙樺寲
@@ -293,6 +317,7 @@
LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
+
queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
queryWrapper.eq(DryEquipment::getEnable, "Y");
@@ -361,4 +386,37 @@
// });
return Result.OK();
}
+
+
+ @Override
+ public Result<?> queryWorkshopStatistics(RealTimeDataVo realTimeDataVo) {
+ LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
+ queryWrapper.eq(DryEquipment::getEnable, "Y");
+ List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper);
+ DryOrderVo orderVo = new DryOrderVo();
+ if (dryEquipments != null && dryEquipments.size() > 0) {
+ dryEquipments.stream().forEach(item -> {
+ DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
+ if (order != null) {
+ orderVo.setEnvHum(order.getEnvHum());
+ orderVo.setEnvTemp(order.getEnvTemp());
+ double watt = order.getWatt() - order.getDetailList().get(0).getWatt();
+ orderVo.setWatt(orderVo.getWatt()==null? watt : orderVo.getWatt() + watt);
+ double steam = order.getSteam() - order.getDetailList().get(0).getSteam();
+ orderVo.setSteam(orderVo.getSteam()==null? steam : orderVo.getSteam() + steam);
+ orderVo.setOriginWeight(orderVo.getOriginWeight()==null? order.getOriginWeight(): orderVo.getOriginWeight() + order.getOriginWeight());
+
+ double yield = order.getOriginWeight()*(1-(order.getInitial()/100))/(1-(order.getTarget()/100));
+ orderVo.setYield(orderVo.getYield()==null? yield: orderVo.getYield() + yield);
+ double sub = order.getOriginWeight() - order.getYield();
+ orderVo.setReduce(orderVo.getReduce()==null? sub: orderVo.getReduce() + sub);
+
+
+ }
+ });
+ }
+ //redisUtil.get(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode()
+ return Result.OK(orderVo);
+ }
}
--
Gitblit v1.9.3