From ca1ae93196be366e707647c42e3039512a2cf45f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十一月 2024 14:00:24 +0800
Subject: [PATCH] 字段显示，结束任务功能更新，界面调整，测量显示
---
springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
index b70f990..9a4cc37 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
@@ -42,14 +42,23 @@
List<GlassInfo> Results = new ArrayList<GlassInfo>();
// 鑾峰彇鍖归厤璁剧疆
MeasureSetting MeasureSetting = MeasureSettingMapper.SelectMeasureSetting(line);
+ System.out.println("鑾峰彇鍖归厤璁剧疆:"+MeasureSetting);
if (height > 0 && width > 0 && MeasureSetting != null) {
// 鏈夋晥鍙傛暟 璇锋眰=1 闀�/瀹�>0
double maxheight = height + MeasureSetting.getErrorHeight();
double minheight = height - MeasureSetting.getErrorHeight();
double maxwidth = width + MeasureSetting.getErrorWidth();
double minwidth = width - MeasureSetting.getErrorWidth();
- // 鏌ヨ褰撳墠娴嬮噺鏁版嵁
- List<GlassInfo> GlassInfos = GlassInfoMapper.selectGlassInfos(maxwidth, minwidth, maxheight, minheight);
+ Integer Thickness = MeasureSetting.getThickness();
+ String Films = MeasureSetting.getFilms();
+ // 鏌ヨ褰撳墠娴嬮噺鏁版嵁
+ List<GlassInfo> GlassInfos = GlassInfoMapper.selectGlassInfos(maxwidth, minwidth, maxheight, minheight,Thickness,Films);
+ System.out.println("鍘氬害"+Thickness+"鑶�"+Films);
+ System.out.println("GlassInfos鏁伴噺:"+GlassInfos.size());
+ if(Thickness==0||Films==""){
+ System.out.println("鍘氬害"+Thickness+"鑶�"+Films);
+ return null;
+ }
List types = new ArrayList<>();
for (int i = 0; i < GlassInfos.size(); i++) {
Integer glasstype = GlassInfos.get(i).getGlasstype();
@@ -63,21 +72,25 @@
}
// 鍖归厤閫昏緫
- public GlassInfo Normal(double width, double height, String line) {
+ public boolean Normal(double width, double height, String line) {
List<Queue> ErrowQueues= QueueMapper.selectErrorQueues();
if (ErrowQueues.size()>0) {
- //System.out.println("鏈夊尮閰嶅け璐ユ暟鎹湭鍘婚櫎");
- return new GlassInfo();
+ System.out.println("鏈夊尮閰嶅け璐ユ暟鎹湭鍘婚櫎");
+ return false;
}
+ //鏌ヨ褰撳墠棰嗗彇鐨勪换鍔�
List<GlassInfo> Result = NormalGlassInfo(width, height, "1");
+ System.out.println("Result:"+Result);
if (Result.size() == 1) {
// 鍖归厤鎴愬姛 灏变竴绉嶇被鍨� 娣诲姞鏁版嵁
GlassInfo GlassInfo = Result.get(0);
- QueueMapper.insert(GlassInfo.getGlassid(), width, height, 1);
+ int insertCount=QueueMapper.insert(GlassInfo.getId(), width, height, 1);
GlassInfoMapper.updatemeasurenumber(GlassInfo.getId());
+
+ System.out.println("娣诲姞鏉℃暟锛�"+insertCount);
System.out.println("鍖归厤鎴愬姛");
System.out.println(GlassInfo.getGlassid());
- return GlassInfo;
+ return true;
} else if (Result.size() > 1) {
// 鍖归厤澶辫触 鍖归厤鍒板鏉＄鍚堢殑鏁版嵁 娣诲姞鏁版嵁
QueueMapper.insertMatchFailure(width, height, 0);
@@ -88,7 +101,7 @@
QueueMapper.insertMatchFailure(width, height, -1);
System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
}
- return new GlassInfo();
+ return false;
}
// Execl琛ㄦ牸 浼犲叆鏂囦欢璺緞
--
Gitblit v1.8.0