实时数据增加字段

baoshiwei

2023-06-30 aa1cceece8b421c6f3647bfeddb9188562e2f77f

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

@@ -9,10 +9,7 @@
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.dry.common.CacheConstants;
import org.jeecg.modules.dry.entity.DryEquipment;
import org.jeecg.modules.dry.entity.DryHerb;
import org.jeecg.modules.dry.entity.DryOrder;
import org.jeecg.modules.dry.entity.DryOrderTrend;
import org.jeecg.modules.dry.entity.*;
import org.jeecg.modules.dry.service.*;
import org.jeecg.modules.dry.vo.DryOrderTrendVo;
import org.jeecg.modules.dry.vo.DryOrderVo;
@@ -42,6 +39,9 @@

    @Autowired
    private RedisUtil redisUtil;

    @Autowired
    private IDryProdRecordService prodRecordService;

    @Override
    @Transactional
@@ -90,6 +90,55 @@
        orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
        DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
        // 2.2 保存工单含水率变化 或 重量变化

        if(realTimeDataVo.getReport_flag()) {
            DryProdRecord prodRecord = new DryProdRecord();
            prodRecord.setReportHeadName(realTimeDataVo.getReport_head_name());
            prodRecord.setReportHeadBatch(realTimeDataVo.getReport_head_batch());
            prodRecord.setReportHeadNum(realTimeDataVo.getReport_head_num());
            prodRecord.setReportHeadMachine(realTimeDataVo.getReport_head_machine());
            prodRecord.setReportHeadAccepter(realTimeDataVo.getReport_head_accepter());
            prodRecord.setReportHeadDate(realTimeDataVo.getReport_head_date());
            prodRecord.setReportHeadLeader(realTimeDataVo.getReport_head_leader());
            prodRecord.setReportHeadTecher(realTimeDataVo.getReport_head_techer());

            prodRecord.setReportCheckField(realTimeDataVo.getReport_check_field()?1:0);
            prodRecord.setReportCheckFile(realTimeDataVo.getReport_check_file()?1:0);
            prodRecord.setReportCheckTag(realTimeDataVo.getReport_check_tag()?1:0);
            prodRecord.setReportCheckTool(realTimeDataVo.getReport_check_tool()?1:0);
            prodRecord.setReportCheckMan(realTimeDataVo.getReport_check_man());
            prodRecord.setReportCheckStatus(realTimeDataVo.getReport_check_status()?1:0);
            prodRecord.setReportCheckQa(realTimeDataVo.getReport_check_qa());
            prodRecord.setReportCheckRecord(realTimeDataVo.getReport_check_record());

            prodRecord.setReportProductView(realTimeDataVo.getReport_product_view()?1:0);
            prodRecord.setReportProductWind(realTimeDataVo.getReport_product_wind()?1:0);
            prodRecord.setReportProductSun(realTimeDataVo.getReport_product_sun()?1:0);
            prodRecord.setReportProductLowDry(realTimeDataVo.getReport_product_low_dry()?1:0);
            prodRecord.setReportProductDry(realTimeDataVo.getReport_product_dry()?1:0);
            prodRecord.setReportProductStart(realTimeDataVo.getReport_product_start());
            prodRecord.setReportProductEnd(realTimeDataVo.getReport_product_end());
            prodRecord.setReportProductTotal(realTimeDataVo.getReport_product_total());
            prodRecord.setReportProductCheck(realTimeDataVo.getReport_product_check()?1:0);
            prodRecord.setReportProductMan1(realTimeDataVo.getReport_product_man1());
            prodRecord.setReportProductMan2(realTimeDataVo.getReport_product_man2());
            prodRecord.setReportProductWeight(realTimeDataVo.getReport_product_weight());
            prodRecord.setReportProductWaste(realTimeDataVo.getReport_product_waste());
            prodRecord.setReportProductUse(realTimeDataVo.getReport_product_use());
            prodRecord.setReportProductQa(realTimeDataVo.getReport_product_qa());

            prodRecord.setReportCleanMachine(realTimeDataVo.getReport_clean_machine()?1:0);
            prodRecord.setReportCleanWaste(realTimeDataVo.getReport_clean_waste()?1:0);
            prodRecord.setReportCleanTool(realTimeDataVo.getReport_clean_tool()?1:0);
            prodRecord.setReportCleanDoor(realTimeDataVo.getReport_clean_door()?1:0);
            prodRecord.setReportCleanBox(realTimeDataVo.getReport_clean_box()?1:0);
            prodRecord.setReportCleanRecord(realTimeDataVo.getReport_clean_record()?1:0);
            prodRecord.setReportCleanDate(realTimeDataVo.getReport_clean_date());
            prodRecord.setReportCleanMan(realTimeDataVo.getReport_clean_man());
            prodRecord.setReportCleanConfirm(realTimeDataVo.getReport_clean_confirm()?1:0);
            prodRecord.setReportCleanQa(realTimeDataVo.getReport_clean_qa());
            prodRecordService.save(prodRecord);
        }
        saveOrderTrendVo(trendVo, orderVo);
        orderVo.setTrendVo(trendVo);
        orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());