修改

hdy

2025-03-29 1717a12c83db01e3b31ea9ed913e5bacaf9edbf3

 billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java

@@ -1,8 +1,16 @@
package com.billion.main.da.service.impl;

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.billion.main.constant.Constants;
import com.billion.main.da.domain.CollectQualityData;
import com.billion.main.da.domain.DaParamCollection;
import com.billion.main.da.mapper.DaParamCollectionMapper;
import com.billion.main.da.service.IDaParamCollectionService;
import com.billion.main.om.domain.OmOrderScheduling;
import com.billion.main.om.service.IOmOrderSchedulingService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
@@ -10,7 +18,9 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Objects;

/**
 * 参数采集Service业务层处理
@@ -18,6 +28,7 @@
 * @author Billion-Yi
 * @date 2024-11-20
 */
@Slf4j
@Service
public class DaParamCollectionServiceImpl implements IDaParamCollectionService
{
@@ -26,9 +37,10 @@

    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    @Resource
    private SqlSessionFactory sqlSessionFactory;
    @Autowired
    public IOmOrderSchedulingService omOrderSchedulingService;



@@ -65,7 +77,38 @@
    @Override
    public int insertDaParamCollection(DaParamCollection daParamCollection)
    {
        return daParamCollectionMapper.insertDaParamCollection(daParamCollection);
        String url = "http://172.40.161.71:8890/Interaction/CollectQualityData";
        OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
        CollectQualityData collectQualityData = new CollectQualityData();
        omOrderScheduling.setSfcCode(daParamCollection.getSfcCode());
        if(Objects.equals(daParamCollection.getLocationCode(), Constants.PLC1.toString()) ||
                Objects.equals(daParamCollection.getLocationCode(), Constants.C005) ||
                Objects.equals(daParamCollection.getLocationCode(), Constants.C060))
        {omOrderScheduling.setRemarks("Head");}
        else if(Objects.equals(daParamCollection.getLocationCode(), Constants.PLC2.toString()) ||
                Objects.equals(daParamCollection.getLocationCode(), Constants.OP005) ||
                Objects.equals(daParamCollection.getLocationCode(), Constants.OP310))
        {omOrderScheduling.setRemarks("Body");}
        else if(Objects.equals(daParamCollection.getLocationCode(), Constants.P010))
        {omOrderScheduling.setRemarks("Pre");}
        List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
        daParamCollectionMapper.insertDaParamCollection(daParamCollection);
        collectQualityData.setOrderNumber(omOrderSchedulingList.get(0).getWorkOrderNo());
        collectQualityData.setStationName(daParamCollection.getLocationCode());
        collectQualityData.setEngineNumber(daParamCollection.getSfcCode());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        collectQualityData.setInsertTime(sdf.format(daParamCollection.getCollectTime()));
        collectQualityData.setDetectionName(daParamCollection.getParamName());
        collectQualityData.setActualValue(daParamCollection.getParamValue());

        try {
            HttpResponse response = HttpRequest.post(url).body(JSONUtil.toJsonStr(collectQualityData)).execute();
            log.info("推送成功，响应报文: {}", response);
        } catch (Exception e) {
            // 记录日志
            log.error("推送失败， sfcCode: {}",collectQualityData.getFactoryNumber());
        }
        return 0;
    }

    /**