Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb

bsw215583320

2024-04-16 c2fccb01b972176dc3da5a497b5e904025e9e98d

 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 从redis取出工单缓存
@@ -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);
    }
}