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 | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 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 1c6ebae..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,15 +1,26 @@
package com.billion.main.da.service.impl;
-import java.util.Date;
-import java.util.List;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.billion.main.da.mapper.DaParamCollectionMapper;
-import com.billion.main.da.domain.DaParamCollection;
-import com.billion.main.da.service.IDaParamCollectionService;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Objects;
/**
* 鍙傛暟閲囬泦Service涓氬姟灞傚鐞�
@@ -17,11 +28,21 @@
* @author Billion-Yi
* @date 2024-11-20
*/
+@Slf4j
@Service
-public class DaParamCollectionServiceImpl extends ServiceImpl<DaParamCollectionMapper, DaParamCollection> implements IDaParamCollectionService
+public class DaParamCollectionServiceImpl implements IDaParamCollectionService
{
@Autowired
private DaParamCollectionMapper daParamCollectionMapper;
+
+ @Autowired
+ private IDaParamCollectionService daParamCollectionService;
+ @Resource
+ private SqlSessionFactory sqlSessionFactory;
+ @Autowired
+ public IOmOrderSchedulingService omOrderSchedulingService;
+
+
/**
* 鏌ヨ鍙傛暟閲囬泦
@@ -44,10 +65,6 @@
@Override
public List<DaParamCollection> selectDaParamCollectionList(DaParamCollection daParamCollection)
{
- if(ObjectUtil.isNotNull(daParamCollection.getTimeQuery())){
- daParamCollection.setStartTime(daParamCollection.getTimeQuery()[0]);
- daParamCollection.setStopTime(daParamCollection.getTimeQuery()[1]);
- }
return daParamCollectionMapper.selectDaParamCollectionList(daParamCollection);
}
@@ -60,8 +77,38 @@
@Override
public int insertDaParamCollection(DaParamCollection daParamCollection)
{
- daParamCollection.setCollectTime(new Date());
- 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;
}
/**
@@ -99,4 +146,24 @@
{
return daParamCollectionMapper.deleteDaParamCollectionById(id);
}
+ @Override
+ public void saveBeachDaParamCollection(List<DaParamCollection> list) {
+ // ExecutorType.SIMPLE: 杩欎釜鎵ц鍣ㄧ被鍨嬩笉鍋氱壒娈婄殑浜嬫儏銆傚畠涓烘瘡涓鍙ョ殑鎵ц鍒涘缓涓�涓柊鐨勯澶勭悊璇彞銆�
+ // ExecutorType.REUSE: 杩欎釜鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ャ��
+ // ExecutorType.BATCH: 杩欎釜鎵ц鍣ㄤ細鎵归噺鎵ц鎵�鏈夋洿鏂拌鍙�,濡傛灉 SELECT 鍦ㄥ畠浠腑闂存墽琛岃繕浼氭爣瀹氬畠浠槸 蹇呴』鐨�,鏉ヤ繚璇佷竴涓畝鍗曞苟鏄撲簬鐞嗚В鐨勮涓恒��
+
+ // 鍏抽棴session鐨勮嚜鍔ㄦ彁浜�
+ SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
+ try {
+ DaParamCollectionMapper userMapper = sqlSession.getMapper(DaParamCollectionMapper.class);
+ list.stream().forEach(DaParamCollection -> userMapper.insertDaParamCollection(DaParamCollection));
+ // 鎻愪氦鏁版嵁
+ sqlSession.commit();
+ sqlSession.rollback();
+ } catch (Exception e) {
+ sqlSession.rollback();
+ } finally {
+ sqlSession.close();
+ }
+ }
}
--
Gitblit v1.9.3