Merge branch 'herb' into cloud

bsw215583320

2024-11-07 e62ffd3aaa1ba27b63885f8a3c8610ed283245d6

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

@@ -8,16 +8,23 @@
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IoSession;
import org.apache.shiro.SecurityUtils;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
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.constant.MqttConstant;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
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.mqtt.MqttUtil;
import org.jeecg.modules.dry.service.*;
import org.jeecg.modules.dry.socket.ServerHandler;
import org.jeecg.modules.dry.socket.SocketServerConfig;
@@ -25,9 +32,11 @@
import org.jeecg.modules.dry.vo.*;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.security.auth.login.LoginContext;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.net.Socket;
@@ -49,6 +58,9 @@
    private IDryHerbService herbService;

    @Autowired
    private IDryHerbFormulaService dryHerbFormulaService;

    @Autowired
    private IDryEquipmentService equipmentService;

    @Autowired
@@ -57,12 +69,14 @@
    @Autowired
    private IDryProdRecordService prodRecordService;

    @Autowired
    private CommonAPI commonAPI;

    private String token;

    @Value(value = "${jeecg.mqtt.role}")
    private String role;

    @Autowired
    private MqttUtil mqttUtil;

    public String getTemporaryToken() {
        if (token == null) {
@@ -96,6 +110,10 @@
            // 根据租户id和工单号查询数据库是否有记录，有则返回，没有则新增一条再返回
            orderVo = getOrSaveDryOrderVoDB(realTimeDataVo);
        }
        if (orderVo == null) {
            log.error("工单不存在，工单号："+realTimeDataVo.getWorkorder()+",设备：" + realTimeDataVo.getMachineid() +",药材：" + realTimeDataVo.getName());
            return Result.error("工单不存在");
        }

        // 2 更新工单实时数据
        // 2.1 将工单中的数据替换为最新数据
@@ -125,7 +143,7 @@
        orderVo.setState_valve(realTimeDataVo.getState_valve());
        orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
        orderVo.setEqp_status(realTimeDataVo.getEqp_status());
        orderVo.setEqp_state(realTimeDataVo.getEqp_state());
//        orderVo.setEqp_state(realTimeDataVo.getEqp_state());
        orderVo.setWarning(realTimeDataVo.getEqp_warning());
        orderVo.setFault(realTimeDataVo.getEqp_fault());
        orderVo.setLevel(realTimeDataVo.getLevel());
@@ -231,17 +249,26 @@
     * @param realTimeDataVo
     * @return
     */
    @NotNull
    private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) {
        DryOrderVo orderVo;
        // 查询药材
        DryHerb herb =  queryHerbByIndexTenant(realTimeDataVo);

        // 查询设备
        DryEquipment equ = queryEquipmentByCodeTenant(realTimeDataVo);
        if (equ == null) {
            log.error("未找到设备："+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",机台：" + realTimeDataVo.getMachineid());
            return null;
        }
        // 查询药材
        DryHerbFormula herbFormula =  queryHerbByIndexTenant(realTimeDataVo);

        if (herbFormula == null) {
            log.error("未找到药材："+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",机台：" + realTimeDataVo.getMachineid());
            return null;
        }
        // 创建新工单
        orderVo = new DryOrderVo(realTimeDataVo);
        orderVo.setHerbId(herb.getId());

        orderVo.setHerbId(herbFormula.getId());
        orderVo.setEquId(equ.getId());
        DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class);
        boolean save = dryOrderService.save(dryOrder);
@@ -260,8 +287,24 @@
        queryWrapper.eq(DryEquipment::getCode, realTimeDataVo.getMachineid());
        DryEquipment one = equipmentService.getOne(queryWrapper);
        if (one == null) {
            one = new DryEquipment(realTimeDataVo);
            equipmentService.save(one);
            log.error(role+"保存实时数据，未找到设备："+realTimeDataVo.getMachineid());
//            one = new DryEquipment(realTimeDataVo);
//            equipmentService.save(one);
            if (MqttConstant.ROLE_ADMIN.equals(role)) {
                MqttMessage mqttMessage = new MqttMessage();
                mqttMessage.setQos(0);
                JSONObject object = new JSONObject();
                object.put("code", realTimeDataVo.getMachineid());
                object.put("tenantId", realTimeDataVo.getTenantid());
                mqttMessage.setPayload(object.toJSONString().getBytes());
                try {
                    mqttUtil.getMqttClient().publish(MqttConstant.SERVICE_REQ_PREFIX ,mqttMessage);
                }catch (MqttException e) {
                    e.printStackTrace();
                }

            }
            return null;
        }
        return one;
    }
@@ -271,14 +314,16 @@
     * @param realTimeDataVo
     * @return
     */
    private DryHerb queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
        LambdaQueryWrapper<DryHerb> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryHerb::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryHerb::getCode, realTimeDataVo.getIndex());
        DryHerb one = herbService.getOne(queryWrapper);
    private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
        LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid());
        queryWrapper.eq(DryHerbFormula::getName, realTimeDataVo.getName());
        DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
        if (one == null) {
            one = new DryHerb(realTimeDataVo);
            herbService.save(one);
            one = new DryHerbFormula(realTimeDataVo);
            DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
            one.setEqpType(dryEquipment.getType());
            dryHerbFormulaService.save(one);
        }
        return one;
    }
@@ -317,47 +362,57 @@
    public Result<?> queryMachineRealTImeData(RealTimeDataVo realTimeDataVo) {
        TenantContext.setTenant(realTimeDataVo.getTenantid()+"");


        // 查询所有机台,查询语句组装
        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<>();

        // 效率列表，用于效率对比
        List<Double> dList = new ArrayList<>();
        // 查询当前机台工单
        DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid());
            try {
        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();


                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();

                            if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
                                DecimalFormat df = new DecimalFormat("#.00");
                                dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
                            } else {
                                dList.add(50d);
                            }

                        if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
                            DecimalFormat df = new DecimalFormat("#.00");
                            dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
                        } else {
                            dList.add(50d);
                        }

                    } else {
                        // 如果没有生产，效率置0
                        dList.add(0d);
                    });
                }
                if (orderVo != null) {
                    orderVo.setCompEqpNum(list);
                    orderVo.setCompEqpEffic(dList);
                }
            }catch (Exception e) {
                e.printStackTrace();
                    }

                });
            }

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

@@ -425,4 +480,9 @@
        //redisUtil.get(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode()
        return Result.OK(orderVo);
    }

    @Override
    public Result<?> statisticsDataHandle(StatisticsDataVo statsDataVo) {
        return null;
    }
}