From 3ee30263eb9bb5f7bf1228ea45ce5d498fb3cdef Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 14:41:13 +0800
Subject: [PATCH] 设备类型增加效率和均耗绑定

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java |   92 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 78 insertions(+), 14 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..5a5b52f 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鍙栧嚭宸ュ崟缂撳瓨
@@ -76,6 +100,7 @@
         // 2 鏇存柊宸ュ崟瀹炴椂鏁版嵁
         // 2.1 灏嗗伐鍗曚腑鐨勬暟鎹浛鎹负鏈�鏂版暟鎹�
         realTimeDataVo.setOrderId(orderVo.getId());
+
         orderVo.setInitial(realTimeDataVo.getMoisture1());
         orderVo.setDryTime(realTimeDataVo.getTime3());
         orderVo.setDelay(realTimeDataVo.getDelay());
@@ -99,12 +124,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 淇濆瓨宸ュ崟鍚按鐜囧彉鍖� 鎴� 閲嶉噺鍙樺寲
@@ -162,7 +187,7 @@
         orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());
         // 2.3 鏇存柊鍒皉edis缂撳瓨
         redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(),
-                realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 600000);
+                realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 60*60);
         return Result.ok();
     }
 
@@ -195,6 +220,7 @@
             }
         // 3 鏁版嵁搴撴病鏈夊垯鏂板涓�鏉℃暟鎹�
         } else {
+
             orderVo = saveNewOrder(realTimeDataVo);
         }
         return orderVo;
@@ -264,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());
@@ -293,8 +319,10 @@
 
 
         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<>();
@@ -307,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) {
@@ -361,4 +392,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