Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

昨天 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java

@@ -3,24 +3,28 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.config.ConveyorProperties;
import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.utils.HttpGo;
import com.zy.acs.manager.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.ConveyorStaDto;
import com.zy.acs.manager.core.integrate.dto.HttpResult;
import com.zy.acs.manager.manager.entity.IntegrationRecord;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.IntegrationDirectionType;
import com.zy.acs.manager.manager.enums.StaReserveType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.IntegrationRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@Slf4j
@Service
@@ -28,6 +32,10 @@

    @Autowired
    private ConveyorProperties conveyorProperties;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private IntegrationRecordService integrationRecordService;

    private HttpGo http;

@@ -46,9 +54,10 @@
    @Override
    public boolean allowAgvWork(Sta sta, Task task, Segment seg, StaReserveType type) {
        final String staNo = sta.getStaNo();
        Date now = new Date();

        // url
        String url = this.http.buildUrl(conveyorProperties.getHost(), conveyorProperties.getPort(), "/cv/station/query");
        String url = this.http.buildUrl(conveyorProperties.getHost(), conveyorProperties.getPort(), conveyorProperties.getUrl());
        // headers
        Map<String, String> headers = new HashMap<>();
        // params
@@ -56,10 +65,33 @@
        List<String> list = new ArrayList<>();
        list.add(staNo);
        params.put("staNos", list);

        IntegrationRecord integrationRecord = new IntegrationRecord(
                String.valueOf(snowflakeIdWorker.nextId()).substring(3),    // 编号
                NamespaceType.RCS_TASK_REPORT.name,    // 名称空间
                conveyorProperties.getUrl(),    // 接口地址
                null,    // 平台密钥
                Constants.RCS,    // 调用方标识
                IntegrationDirectionType.OUTBOUND.value,    // 方向[非空]
                String.valueOf(now.getTime()),    // 时间戳
                conveyorProperties.getHost(),    // 客户端IP
                JSON.toJSONString(params),    // 请求内容
                null,    // 响应内容
                null,    // 异常内容
                0,    // 结果
                null,    // 耗时
                StatusType.ENABLE.val,    // 状态
                now,    // 添加时间[非空]
                now,    // 修改时间[非空]
                null    // 备注
        );

        // do request
        HttpResult<List<ConveyorStaDto>> result;
        try {
            result = postForResult(url, headers, params);
            integrationRecord.setResponse(JSON.toJSONString(result));

            Integer code = result.getCode();
            if (null == code || 200 != code) {
                return false;
@@ -96,13 +128,19 @@
                    return false;
                }
            }

            integrationRecord.setResult(1);
        } catch (Exception e) {
            log.error("Conveyor query failed, FAIL-OPEN. staNo={}, taskId={}, type={}",
                    sta.getStaNo(),
                    task.getSeqNum(),
                    type,
                    e);
            integrationRecord.setErr(e.getMessage());
            return false;
        } finally {
            integrationRecord.setCostMs((int) (System.currentTimeMillis() - now.getTime()));
            integrationRecordService.syncRecord(integrationRecord);
        }
        // ok
        return true;