From 67160f099f6b03531c4f337f434bd26dee0750e6 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 26 三月 2025 18:53:05 +0800
Subject: [PATCH] -
---
billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
index 1fb1c1a..0b7459f 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java
@@ -1,9 +1,16 @@
package com.billion.main.da.service.impl;
-import com.billion.common.utils.DateUtils;
+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;
@@ -11,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涓氬姟灞傚鐞�
@@ -19,6 +28,7 @@
* @author Billion-Yi
* @date 2024-11-20
*/
+@Slf4j
@Service
public class DaParamCollectionServiceImpl implements IDaParamCollectionService
{
@@ -27,9 +37,10 @@
@Autowired
private IDaParamCollectionService daParamCollectionService;
-
@Resource
private SqlSessionFactory sqlSessionFactory;
+ @Autowired
+ public IOmOrderSchedulingService omOrderSchedulingService;
@@ -54,11 +65,6 @@
@Override
public List<DaParamCollection> selectDaParamCollectionList(DaParamCollection daParamCollection)
{
- if(daParamCollection.getDateConditions()!=null){
- String[] conditions = daParamCollection.getDateConditions();
- daParamCollection.setStartTime(conditions[0]);
- daParamCollection.setEndTime(conditions[1]);
- }
return daParamCollectionMapper.selectDaParamCollectionList(daParamCollection);
}
@@ -71,8 +77,38 @@
@Override
public int insertDaParamCollection(DaParamCollection daParamCollection)
{
- daParamCollection.setCreateTime(DateUtils.getNowDate());
- 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;
}
/**
--
Gitblit v1.9.3