From 86eb351c3eda127933902c927623c043eeb7210b Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:00:47 +0800
Subject: [PATCH] 测试后修改地址，添加界面缺少的下发与读写功能
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 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 c773316..565ae8d 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
@@ -13,7 +13,7 @@
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
-import com.example.springboot.service.MultiFieldComparator;
+// import com.example.springboot.service.MultiFieldComparator;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -24,7 +24,6 @@
import com.example.springboot.entity.Out_slice;
import org.springframework.web.bind.annotation.*;
-
@RestController
@RequestMapping("/home")
@@ -227,8 +226,9 @@
if (result > 0) {
map.put("message", "300");
} else {
- homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
- spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
+ // homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
+ // spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage,
+ // cell);
}
return Result.success(map);
}
@@ -251,8 +251,8 @@
map.put("message", "300");
} else {
homeMapper.InsertQueueGlassId(glassid, id);
- //璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianMapper.selectAll(glassid);
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianMapper.selectAll(glassid);
map.put("message", "200");
}
return Result.success(map);
@@ -289,18 +289,16 @@
@PostMapping("/SelectAluminumFrameInfoById")
public Result SelectAluminumFrameInfoById(String FrameBarcode) {
List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
- String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
+ String flip = homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
- north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
- north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
+ // north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
+ // north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
}
Map<String, Object> map = new HashMap<>();
map.put("listAluminumFrame", listAluminumFrame);
map.put("flip", flip);
return Result.success(map);
}
-
-
// 鏌ヨ鍑虹墖闃熷垪鏁版嵁
@PostMapping("/SelectProductionqueue")
@@ -310,40 +308,40 @@
out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
-
- //HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
+
+ // 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);
- // }
+ // 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);
- // }
- // }
- // }
+ // 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());
+ // }
+ // }
+ // }
+ // Collections.sort(listoutslice,new MultiFieldComparator());
Map<String, Object> maps = new HashMap<>();
maps.put("listoutslice", listoutslice);
@@ -359,12 +357,12 @@
return Result.success(map);
}
- //
+ //
@PostMapping("/AddOutSliceS")
- public Result AddOutSliceS(@RequestBody String[][] AluminumFrames ) {
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) {
for (String[] item : AluminumFrames) {
- if(item[1]=="true"){
- homeMapper.AddOutSliceS(item[0],item[2],item[3],item[4],item[5]);
+ if (item[1] == "true") {
+ homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5]);
}
}
System.out.println(AluminumFrames);
--
Gitblit v1.8.0