From 67b0ccf9e6a77767bd5b0823bc80bee474f49f9b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 九月 2023 18:28:27 +0800
Subject: [PATCH] 新增数据库连接文件，逻辑优化
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 29 ++
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 10
springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 11
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 530 +++++++++++++++++++++++++++-------------------------
4 files changed, 309 insertions(+), 271 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 68fc478..65b6d28 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
@@ -1,15 +1,24 @@
package com.example.springboot.component;
+import java.sql.SQLException;
import java.util.List;
-import com.example.springboot.service.SpianService;
-import com.example.springboot.mapper.AlarmMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.SpianService;
+import com.example.springboot.entity.Glass;
+import com.example.springboot.mapper.AlarmMapper;
public class PlcHold extends Thread {
private AlarmMapper alarmMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
private SpianService spianService;
+
@Override
public void run() {
@@ -19,12 +28,20 @@
Thread.sleep(500);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
+ //\\ TODO Auto-generated catch block
e.printStackTrace();
}
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- //spianService.selectout("112");
-
+
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ try {
+ Glass glass=jdbcConnections.selectGlass(112);
+ //System.out.println(glass.getOrderId());
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
@@ -41,6 +58,7 @@
List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
//鑾峰彇鐜荤拑id
for(Short list1:datas1ListID){
+
spianService.selectAll((short)list1);
}
}
@@ -60,4 +78,5 @@
}
}
+
}
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 c6fea0c..8870607 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,22 +1,15 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+
@RestController
@RequestMapping("/spian")
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 76b6d90..697ba48 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
@@ -1,11 +1,11 @@
package com.example.springboot.mapper;
import org.apache.ibatis.annotations.*;
-import com.example.springboot.common.Result;
+
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
-import com.example.springboot.entity.StorageCage;
+
import java.util.List;
@@ -18,8 +18,8 @@
//@Select("(select*from storage_cage as a where a.state=0 and cage%2=0 ORDER BY id LIMIT 1)union (select a.* from storage_cage a inner join (select cage,if(shu2=1,shu3,shu5) as gezi from ( select cage, count(case when state1=1 and state2=0 then cell else null end)as shu1, count(case when state1=0 then cell else null end) as shu2, min(case when state1=1 and state2=0 then cell else null end) as shu3, min(case when state1=0 then cell else null end) as shu4, min(case when state1=0 or state2=0 then cell else null end) as shu5 from (select *,max(state) as state1,min(state) as state2 from storage_cage group by cage,cell) as a where cage%2!=0 GROUP BY cage HAVING shu2>1 or (shu2=1 and shu1>0) ) as sss limit 1)as b on a.cage=b.cage and a.cell=b.gezi and a.state=0 order by tier limit 1) ORDER BY id LIMIT 1;")
//鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
- @Select("select cage,COUNT(if(order_id=#{glassid},order_id,null))as orderid from storage_cage where (order_id=#{glassid} or ''='') GROUP BY cage ORDER BY orderid desc; ")
- List<StorageCage> selectAll(Short glassid);
+ @Select("select cage,COUNT(if(order_id=#{orderids},order_id,null))as orderid from storage_cage where (order_id=#{orderids} or ''='') GROUP BY cage ORDER BY orderid desc; ")
+ List<StorageCage> selectAll(Short orderids);
//鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
@Select("select cage,cell,tier,id,ROUND(id/2)as prcId from storage_cage where cage=#{cage1} and state=0 and width>=#{width} ORDER BY cell,tier LIMIT 1")
@@ -42,7 +42,7 @@
@Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
StorageCage selectOut(String orderId);
//鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
- @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
+ @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
StorageCage selectOut2(String glassid);
//鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 951216b..2d8f2f3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -5,7 +5,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -17,114 +16,120 @@
public class SpianService {
@Autowired
private SpianMapper spianMapper;
- @GetMapping("/all2")
- public Result selectout(String orderid){
- //瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
- List<String> adddresslist=new ArrayList<>();
- adddresslist.add("DB105.6");//鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");//鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");//鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");//鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
- List<Short> datas=new ArrayList<>();
- //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
- StorageCage cageout=spianMapper.selectOut(orderid);
- int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
- int cell =cageout.getCell();//鍑虹墖鏍煎彿
- int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
- int prcid=cageout.getPrcId();//prcid
- int prcid2;
- int ids;
- double glasswidth=cageout.getGlassWidth();
- //鍒ゆ柇鐜荤拑鍐呭鐗�
- if(tier==2){
- //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
- //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
-
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- return Result.success(datas);
- }
- else{
- //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
- int state= spianMapper.selectGlassState(cage,cell);
- //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
- if(state==0){
- return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
- }else{
- //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
- if(cage<6){
- StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
- if(cagecell==null){
- return Result.success(cagecell);
- }
- //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峆RCID
- ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
- //鏇存崲鐜荤拑鐨勭瀛�
- spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
- //濉叆璋冩嫧鏁版嵁
- datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
- datas.add((short)prcid2);
- datas.add((short)2);
- datas.add((short)1);
- //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);
- datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
- //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-
- return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-
- }else{//绗煎瓙鍙峰ぇ浜�5鏃�
- StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
- if(cagecell==null){
- return Result.success(cagecell);
- }
- //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峱rcID
- ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
- //濉叆璋冩嫧鏁版嵁
- datas.add((short)prcid);
- datas.add((short)prcid2);
- datas.add((short)2);
- datas.add((short)1);
- //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
- spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
- //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);
- datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
- //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
- //濉叆鍑虹墖鏁版嵁
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-
- }
-
- }
- }
-
-}
- @GetMapping("/all")
- //杩涚墖浠诲姟,浼犺鍗昳d
- //鎸夎鍗曚紭鍏堣繘鐗�
- public Result selectAll(Short glassid){
- //return spianMapper.selectAll();
+ // @GetMapping("/all2")
+ public Result selectout(String orderid) {
+ // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+ List<String> adddresslist = new ArrayList<>();
+ adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas = new ArrayList<>();
+ // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
+ StorageCage cageout = spianMapper.selectOut(orderid);
+ int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+ int cell = cageout.getCell();// 鍑虹墖鏍煎彿
+ int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
+ int prcid = cageout.getPrcId();// prcid
+ int prcid2;
+ int ids;
+ double glasswidth = cageout.getGlassWidth();
+ // 鍒ゆ柇鐜荤拑鍐呭鐗�
+ if (tier == 2) {
+ // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+ // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(datas);
+ } else {
+ // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+ int state = spianMapper.selectGlassState(cage, cell);
+ // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+ if (state == 0) {
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
+ } else {
+ // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+ if (cage < 6) {
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+
+ return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
+ } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ // 杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+ // 濉叆鍑虹墖鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
+ }
+
+ }
+ }
+
+ }
+
+ // @GetMapping("/all")
+ // 杩涚墖浠诲姟,浼犺鍗昳d
+ // 鎸夎鍗曚紭鍏堣繘鐗�
+ public Short selectAll(Short glassid) {
+
int cage1;
int cells;
int ids;
@@ -132,156 +137,177 @@
int tiers;
int prctier;
- Glass glasslist=spianMapper.selectGlass(glassid);
- double widths=glasslist.getWidth();
- Short orderids=glasslist.getOrderId();
+ Glass glasslist = spianMapper.selectGlass(glassid);
+ if (glasslist == null) {
+ return (300);
+ }
+ double widths = glasslist.getWidth();
+ Short orderids = glasslist.getOrderId();
- List<String> adddresslist=new ArrayList<>();
- adddresslist.add("DB105.0");//杩涚墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.2");//杩涚墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.4");//杩涚墖绗肩幓鐠冩暟
- adddresslist.add("DB105.12");//杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
- List<Short> datas=new ArrayList<>();
+ List<String> adddresslist = new ArrayList<>();
+ adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas = new ArrayList<>();
- //String orderid="A001";
- //鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
- List<StorageCage> storageCage=spianMapper.selectAll(glassid);
- if(storageCage==null){
- return Result.success(storageCage);
- }
+ // String orderid="A001";
+ // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+ List<StorageCage> storageCage = spianMapper.selectAll(orderids);
+ if (storageCage == null) {
+ return (400);
+ }
for (StorageCage storageCage2 : storageCage) {
- //淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
- cage1=storageCage2.getCage();
- //鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
- int cages=spianMapper.selectCage(cage1);
- //鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
- StorageCage cages1=spianMapper.selectCage1(cage1,widths);
- ids=cages1.getId();//鏁版嵁搴揑D
- tiers=cages1.getTier();//鍐呭鐗�
- cells=cages1.getCell();//鏍煎瓙鍙�
- prcid=cages1.getPrcId();//浼犵粰prc鐨勭洰鏍囧湴id
- prctier=spianMapper.selectsum(cage1, cells);//浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
- //鏈夊悎閫傜┖鏍兼椂杩涚墖
- if(cages>1 &&cages1.getTier()!=null){
- //鎵ц杩涚墖
- datas.add((short)1000);
- datas.add((short)prcid);
- datas.add((short)prctier);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- //鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
-
- spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
- return Result.success(cages1);
+ // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+ cage1 = storageCage2.getCage();
+ // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+ int cages = spianMapper.selectCage(cage1);
+ // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
+ StorageCage cages1 = spianMapper.selectCage1(cage1, widths);
+ if (cages1 != null) {
+ ids = cages1.getId();// 鏁版嵁搴揑D
+ tiers = cages1.getTier();// 鍐呭鐗�
+ cells = cages1.getCell();// 鏍煎瓙鍙�
+ prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ prctier = spianMapper.selectsum(cage1, cells);// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
+ // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+ if (cages > 1 && cages1.getTier() != null) {
+ // 鎵ц杩涚墖
+ datas.add((short) 1000);
+ datas.add((short) prcid);
+ datas.add((short) prctier);
+ datas.add((short) 1);
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+
+ return (200);
+ }
}
-
-
- }
- return Result.success("涓嶅彲杩涚墖");
-
+
+ }
+ return (300);
+
}
- @GetMapping("/all2")
- public Result selectout2(String glassid){
- //瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
- List<String> adddresslist=new ArrayList<>();
- adddresslist.add("DB105.6");//鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");//鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");//鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");//鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
- List<Short> datas=new ArrayList<>();
- //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
- StorageCage cageout=spianMapper.selectOut2(glassid);
- int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
- int cell =cageout.getCell();//鍑虹墖鏍煎彿
- int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
- int prcid=cageout.getPrcId();//prcid
- int prcid2;
- int ids;
- double glasswidth=cageout.getGlassWidth();
- //鍒ゆ柇鐜荤拑鍐呭鐗�
- if(tier==2){
- //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
- //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
-
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- return Result.success(datas);
- }
- else{
- //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
- int state= spianMapper.selectGlassState(cage,cell);
- //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
- if(state==0){
- return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
- }else{
- //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
- if(cage<6){
- StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
- if(cagecell==null){
- return Result.success(cagecell);
+ // @GetMapping("/all2")
+ public Result selectout2(String glassid) {
+ // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+ List<String> adddresslist = new ArrayList<>();
+ adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas = new ArrayList<>();
+ // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
+ StorageCage cageout = spianMapper.selectOut2(glassid);
+ int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+ int cell = cageout.getCell();// 鍑虹墖鏍煎彿
+ int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
+ int prcid = cageout.getPrcId();// prcid
+ int prcid2;
+ int ids;
+ double glasswidth = cageout.getGlassWidth();
+ // 鍒ゆ柇鐜荤拑鍐呭鐗�
+ if (tier == 2) {
+ // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+ // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(datas);
+ } else {
+ // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+ int state = spianMapper.selectGlassState(cage, cell);
+ // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+ if (state == 0) {
+ return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
+ } else {
+ // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+ if (cage < 6) {
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+
+ return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
+ } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ // 杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+ // 濉叆鍑虹墖鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
}
- //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峆RCID
- ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
- //鏇存崲鐜荤拑鐨勭瀛�
- spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
- //濉叆璋冩嫧鏁版嵁
- datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
- datas.add((short)prcid2);
- datas.add((short)2);
- datas.add((short)1);
- //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);
- datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
- //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-
- return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-
- }else{//绗煎瓙鍙峰ぇ浜�5鏃�
- StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
- if(cagecell==null){
- return Result.success(cagecell);
- }
- //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峱rcID
- ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
- //濉叆璋冩嫧鏁版嵁
- datas.add((short)prcid);
- datas.add((short)prcid2);
- datas.add((short)2);
- datas.add((short)1);
- //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
- spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
- //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);
- datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
- //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
- //濉叆鍑虹墖鏁版嵁
- datas.add((short)prcid);
- datas.add((short)1000);
- datas.add((short)1);
- datas.add((short)1);
- S7control.getinstance().WriteWord(adddresslist, datas);
- return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-
- }
-
- }
+
+ }
}
-
-}
-
+
+ }
+
+ /*** 淇敼鐢ㄦ埛* @throws SQLException */
+ // public static int updateUser(Glass user) throws SQLException {conn =
+ // getConn();
+ // String sql = "update t_user set name=?,gender=?,age=?,score=?"+ " where
+ // id=?";ps = conn.prepareStatement(sql);
+ // ps.setString(1, user.getName());ps.setString(2, user.getGender());
+ // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());ps.setInt(5,
+ // user.getId());return ps.executeUpdate();}
+ // /*** 澧炲姞鐢ㄦ埛* @throws SQLException */
+ // public static int insertUser(User user) throws SQLException {
+ // conn = getConn();
+ // String sql = "insert into t_user(name,gender,age,score)"+ " values(?,?,?,?)";
+ // ps = conn.prepareStatement(sql);ps.setString(1,
+ // user.getName());ps.setString(2, user.getGender());
+ // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());return
+ // ps.executeUpdate();
+ // }
+
}
--
Gitblit v1.8.0