From 67cbfd8f7c2ed9598eef92470313f3cf31028ea1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 11 三月 2025 08:39:33 +0800
Subject: [PATCH] 2.13-3-7号 现场标注线调试更改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
index b3e5ebe..8822899 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
@@ -1,14 +1,13 @@
package com.mes;
+import cn.hutool.core.bean.BeanUtil;
+import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.md.entity.*;
import com.mes.md.mapper.*;
-import com.mes.md.service.AccountService;
-import com.mes.md.service.PrimitiveTaskService;
-import com.mes.md.service.ProjectService;
-import com.mes.md.service.TaskingService;
+import com.mes.md.service.*;
import com.mes.tools.HexConversion;
import com.mes.utils.HexUtil;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +26,7 @@
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author : yanzhixin
@@ -69,12 +69,78 @@
@Autowired
KBBTLensSortingMapper kBBTLensSortingMapper;
+ @Autowired
+ KBBTProgramsOperationLogBPMapper kBBTProgramsOperationLogBPMapper;
+
+ @Autowired
+ KBBTProgramsOperationLogBPService kBBTProgramsOperationLogBPService;
+
+ @Autowired
+ TaskingLogMapper taskingLogMapper;
+
+ @Autowired
+ TaskingLogService taskingLogService;
+ /**
+ * 娴嬭瘯 鎻愪氦鎶ュ伐 浠ュ強鐜荤拑鏁版嵁
+ */
+ @Test
+ public void reportTaskingLog() {
+ taskingLogService.reportTaskingLog();
+ }
+ /**
+ * 娴嬭瘯 鎵爜鍚庡簱浣�
+ */
+ @Test
+ public void testInset() {
+
+ // 浠庢暟鎹簱涓煡璇㈠嚭鐨勫璞￠泦鍚�
+ List<Tasking> listTasking = taskingMapper.selectList(new QueryWrapper<Tasking>());
+ List<KBBTProgramsOperationLogBP> abc =kBBTProgramsOperationLogBPMapper.selectList(new QueryWrapper<KBBTProgramsOperationLogBP>());
+ // 鍒ょ鏄惁涓虹┖
+ if (CollectionUtils.isNotEmpty(listTasking)) {
+ // 杩涜鎷嗚В灏佽
+ List<KBBTProgramsOperationLogBP> stationDictVOS = listTasking.stream().map(item -> {
+ KBBTProgramsOperationLogBP newData = new KBBTProgramsOperationLogBP();
+ newData.setGlassId(item.getGlassId());
+ newData.setState(item.getState());
+ newData.setWorkState(item.getWorkState());
+ newData.setGlassState(item.getGlassState());
+ newData.setState(item.getState());
+ newData.setScanId(item.getScanId());
+ newData.setProgramId(item.getProgramId());
+ newData.setBatchNumber(item.getBatchNumber()==null?"":item.getBatchNumber());
+ newData.setTaskType(item.getTaskType());
+ newData.setLength(item.getLength());
+ newData.setWidth(item.getWidth());
+ newData.setThickness(item.getThickness());
+ newData.setDrawingMarking(item.getDrawingMarking());
+ //newData.setIsMarking(item.getIsMarking());//鏄惁鎵撴爣锛�0涓嶆墦鏍� 1鎵撴爣
+ newData.setIsSilkScreen(item.getIsSilkScreen());
+ newData.setIsWorking(1);
+ newData.setSilkScreenX(item.getSilkScreenX());
+ newData.setSilkScreenY(item.getSilkScreenY());
+ newData.setR_1_1(item.getR_1_1());
+ newData.setR_1_2(item.getR_1_2());
+ newData.setR_2_1(item.getR_2_1());
+ newData.setR_2_2(item.getR_2_2());
+ newData.setR_3_1(item.getR_3_1());
+ newData.setR_3_2(item.getR_3_2());
+ newData.setR_4_1(item.getR_4_1());
+ newData.setR_4_2(item.getR_4_2());
+ newData.setCreateDate(new Date());
+ kBBTProgramsOperationLogBPMapper.insert(newData);
+ return newData;
+ }).collect(Collectors.toList());
+ log.info("淇濆瓨鏁版嵁鏄惁鎴愬姛锛歿},{}",stationDictVOS);
+ }
+
+ }
+
/**
* 娴嬭瘯 鎵爜鍚庡簱浣�
*/
@Test
public void testStr() {
-
//鍒涘缓Calendar瀹炰緥
Calendar cal = Calendar.getInstance();
//璁剧疆褰撳墠鏃堕棿
@@ -104,7 +170,7 @@
public void testSaoMa() {
try {
// 鍒涘缓TCP瀹㈡埛绔苟杩炴帴鍒版湇鍔″櫒
- String serverAddress = "192.168.1.8";
+ String serverAddress = "10.36.164.19";
int serverPort = 2001;
Socket clientSocket = new Socket(serverAddress, serverPort);
// 鍒涘缓杈撳叆娴佸拰杈撳嚭娴�
--
Gitblit v1.8.0