From 8dfb37b10ffb2fcb41c85b3fa266d1ef2874aebc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 30 十一月 2023 08:53:27 +0800
Subject: [PATCH] 修改电气管理PLC通讯逻辑
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 78 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 4f7ddb9..9e66cf1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -1,5 +1,6 @@
package com.example.springboot.controller;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -9,6 +10,7 @@
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
+import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -17,7 +19,6 @@
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
-
import org.springframework.web.bind.annotation.*;
@@ -36,6 +37,9 @@
@Autowired
SpianMapper spianMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
public Result selectAll() {
@@ -62,11 +66,14 @@
// 鏌ヨ杩�/鍑虹墖浠诲姟
@GetMapping("/loadinout")
- public Result selectinout(Integer types) {
+ public Result selectinout(Integer types) throws SQLException{
List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+
for (StorageCage storageCage : storageCageinout) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
}
+
Map<String, Object> map = new HashMap<>();
map.put("list", storageCageinout);
return Result.success(map);
@@ -137,10 +144,12 @@
// 鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
+ public Result SelectCageInfo(short cage) throws SQLException {
List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
for (StorageCage storageCage : cageinfo) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+
}
Map<String, Object> map = new HashMap<>();
map.put("cageinfo", cageinfo);
@@ -198,10 +207,16 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+ public Result SelectGlassByGlassID(String glassid) throws SQLException {
+ // north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+
+ north_glass_buffer1 north_glass_buffer1s=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
Map<String, Object> map = new HashMap<>();
+ if(glassid!=""){
+
map.put("form", north_glass_buffer1s);
+
+ }
return Result.success(map);
}
@@ -230,9 +245,9 @@
// 鏌ヨ鐜荤拑淇℃伅
@PostMapping("/SelectGlass")
- public Result SelectGlass(String orderid) {
+ public Result SelectGlass(String orderid) throws SQLException {
Map<String, Object> map = new HashMap<>();
- List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
+ List<north_glass_buffer1> glass = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("", orderid, "");
map.put("glass", glass);
return Result.success(map);
}
@@ -282,8 +297,10 @@
// 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
@PostMapping("/SelectAluminumFrameInfoById")
- public Result SelectAluminumFrameInfoById(String FrameBarcode) {
- List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
+ public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
+
+ // List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
+ List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("","",FrameBarcode);
String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
@@ -299,47 +316,12 @@
// 鏌ヨ鍑虹墖闃熷垪鏁版嵁
@PostMapping("/SelectProductionqueue")
- public Result SelectProductionqueue() {
+ public Result SelectProductionqueue() throws SQLException {
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
for (Out_slice out_slice : listoutslice) {
- out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
-
- //HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
- // HashMap map=new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_=out_slice.getState()+"-";
- // if (map.get(key_)==null) {
- // List<Out_slice> lists=new ArrayList<Out_slice>();
- // lists.add(out_slice);
- // map.put(key_, lists);
- // }else{
- // List<Out_slice> lists=(List<Out_slice>)map.get(key_);
- // lists.add(out_slice);
- // map.put(key_,lists);
- // }
- // }
- // System.out.println(map);
-
- // List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
- // List<Out_slice> list=new ArrayList<Out_slice>();
- // for (Out_slice out_slice : listskey) {
- // if (list.isEmpty()) {
- // list.add(out_slice);
- // }else{
- // for (int i=0;i<list.size();i++) {
- // Out_slice out_slice2=list.get(i);
- // if(out_slice.getID()>out_slice2.getID()){
- // continue;
- // }else{
- // list.add(i,out_slice2);
- // }
- // }
- // }
- // }
- //Collections.sort(listoutslice,new MultiFieldComparator());
-
Map<String, Object> maps = new HashMap<>();
maps.put("listoutslice", listoutslice);
return Result.success(maps);
--
Gitblit v1.8.0