From 3f23422c13226ce37150afed0b4d8d0309da45d3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:24:40 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
index be64195..64add0c 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
@@ -1,13 +1,24 @@
package com.billion.main.da.service.impl;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.utils.http.HttpUtils;
+import com.billion.main.constant.Constants;
import com.billion.main.da.domain.DaStationCollection;
+import com.billion.main.da.domain.CollectTrack;
import com.billion.main.da.mapper.DaStationCollectionMapper;
import com.billion.main.da.service.IDaStationCollectionService;
+import com.billion.main.om.domain.OmOrderScheduling;
+import com.billion.main.om.service.IOmOrderSchedulingService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.List;
+import java.util.Objects;
/**
* 杩囩珯閲囬泦Service涓氬姟灞傚鐞�
@@ -15,12 +26,13 @@
* @author HDY
* @date 2025-02-12
*/
+@Slf4j
@Service
public class DaStationCollectionServiceImpl extends ServiceImpl<DaStationCollectionMapper, DaStationCollection> implements IDaStationCollectionService
{
@Autowired
private DaStationCollectionMapper daStationCollectionMapper;
-
+ public IOmOrderSchedulingService omOrderSchedulingService;
/**
* 鏌ヨ杩囩珯閲囬泦
*
@@ -51,12 +63,65 @@
* @param daStationCollection 杩囩珯閲囬泦
* @return 缁撴灉
*/
+// @Override
+// public int insertDaStationCollection(DaStationCollection daStationCollection)
+// {
+//// EngineData engineData = new EngineData();
+//// engineData.setEngineType("1");
+//// String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData));
+// return daStationCollectionMapper.insertDaStationCollection(daStationCollection);
+// }
+
+
@Override
- public int insertDaStationCollection(DaStationCollection daStationCollection)
- {
-// EngineData engineData = new EngineData();
-// engineData.setEngineType("1");
-// String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData));
+ public int insertDaStationCollection(DaStationCollection daStationCollection) {
+ String url = "http://172.40.161.71:8890/Interaction/CollectTrack";
+ OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
+ // 鍒涘缓EngineData瀵硅薄骞惰缃瓧娈靛��
+ CollectTrack collectTrack = new CollectTrack();
+
+ omOrderScheduling.setSfcCode(daStationCollection.getSfcCode());
+ if(Objects.equals(daStationCollection.getLocationCode(), Constants.PLC1.toString()) ||
+ Objects.equals(daStationCollection.getLocationCode(), Constants.C005) ||
+ Objects.equals(daStationCollection.getLocationCode(), Constants.C060))
+ {omOrderScheduling.setRemarks("Head");}
+ else if(Objects.equals(daStationCollection.getLocationCode(), Constants.PLC2.toString()) ||
+ Objects.equals(daStationCollection.getLocationCode(), Constants.OP005) ||
+ Objects.equals(daStationCollection.getLocationCode(), Constants.OP310))
+ {omOrderScheduling.setRemarks("Body");}
+ else if(Objects.equals(daStationCollection.getLocationCode(), Constants.P010))
+ {omOrderScheduling.setRemarks("Pre");}
+ List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
+
+ collectTrack.setOrderNumber(omOrderSchedulingList.get(0).getWorkOrderNo());
+ collectTrack.setStationName(daStationCollection.getLocationCode());
+ // 澶勭悊鏃ユ湡鏃堕棿瀛楁
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ collectTrack.setInsertTime(sdf.format(daStationCollection.getInboundTime()));
+ String factoryNumber = daStationCollection.getSfcCode();
+ collectTrack.setFactoryNumber(factoryNumber);
+ // EngineType璁剧疆涓篎actoryNumber鍘婚櫎鍚庝節浣�
+ // 鍋囪姝ゅ涓哄彇factoryNumber鐨勫墠閮ㄥ垎浣滀负EngineType
+ String engineType = daStationCollection.getSfcCode().length() > 9 ? daStationCollection.getSfcCode().substring(0, daStationCollection.getSfcCode().length() - 9) : daStationCollection.getSfcCode();
+ collectTrack.setEngineType(engineType);
+ // EngineNumber璁剧疆涓篎actoryNumber鐨勫悗涔濅綅
+ // 鍋囪姝ゅ涓哄彇factoryNumber鐨勫悗涔濅綅瀛楃
+ String engineNumber = daStationCollection.getSfcCode().length() >= 9 ? daStationCollection.getSfcCode().substring(daStationCollection.getSfcCode().length() - 9) : daStationCollection.getSfcCode();
+ collectTrack.setEngineNumber(engineNumber);
+ // CycleTime璁剧疆涓簅utboundTime鍑忓幓inboundTime鐨勬椂闂村樊锛堟牸寮忓寲涓哄瓧绗︿覆锛�
+ long cycleTimeMillis = daStationCollection.getOutboundTime().getTime() - daStationCollection.getInboundTime().getTime();
+ long cycleTimeSeconds = cycleTimeMillis / 1000; // 鍋囪浠ョ涓哄崟浣�
+ collectTrack.setCycleTime(String.valueOf(cycleTimeSeconds));
+ collectTrack.setFlag(Integer.parseInt(daStationCollection.getStatus()));
+ // 鍙戦�丳OST璇锋眰
+ try {
+ HttpResponse response = HttpRequest.post(url).body(JSONUtil.toJsonStr(collectTrack)).execute();
+ log.info("鎺ㄩ�佹垚鍔燂紝鍝嶅簲鎶ユ枃: {}", response);
+ } catch (Exception e) {
+ // 璁板綍鏃ュ織
+ log.error("鎺ㄩ�佸け璐ワ紝 sfcCode: {}",collectTrack.getFactoryNumber());
+ }
+ // 鏃犺鎺ㄩ�佹垚鍔熶笌鍚︼紝閮界户缁墽琛屾暟鎹簱鎻掑叆鎿嶄綔
return daStationCollectionMapper.insertDaStationCollection(daStationCollection);
}
--
Gitblit v1.9.3