From 44b8aac231886b27e20a0797ee1a253250c6026e Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 九月 2023 17:11:00 +0800
Subject: [PATCH] 增加数据库进出片sql语句，获取通讯信息数据，调整逻辑判断
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 7 +++++--
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 4 +++-
springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 5e776f9..28a4104 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -18,7 +18,7 @@
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -26,7 +26,10 @@
List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
-
+
+ //鍒ゆ柇杩涚墖璇锋眰
+ List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
index 0b0e6d2..c7a1c97 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
@@ -1,6 +1,7 @@
package com.example.springboot.controller;
import com.example.springboot.common.Result;
+import com.example.springboot.component.S7control;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.SpianService;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@RestController
@@ -30,6 +32,9 @@
//鍑虹墖浠诲姟
@GetMapping("/all2")
public Result selectdd(String orderid){
+
+
+
//鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout=spianMapper.selectOut(orderid);
int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
@@ -52,6 +57,17 @@
if(cage<6){
StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
//鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ List<String> adddresslist=new ArrayList<>();
+ adddresslist.add("DB105.6");
+ adddresslist.add("DB105.8");
+ adddresslist.add("DB105.10");
+ adddresslist.add("DB105.14");
+ List<Short> datas=new ArrayList<>();
+ datas.add((short)0);
+ datas.add((short)0);
+ datas.add((short)0);
+ datas.add((short)0);
+ S7control.getinstance().WriteWord(adddresslist, datas);
return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
//鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
}else{
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index c8dc1a5..f9f24bf 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -40,7 +40,9 @@
//鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
@Select("select cage,cell,max(state)as shu from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
-
+ //淇敼绗煎瓙淇℃伅(杩涚墖)
+ @Update("update storage_cage set state=1,width=width #{width},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{glasswidth} where cage=#{cage} and cell=#{cell} and tier=#{tier}");
+
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
--
Gitblit v1.8.0