From 3f98ccf49e7ffc098689c37237bd1dceed651ca1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 419 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 342 insertions(+), 77 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 aea9709..c773316 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,110 +1,375 @@
package com.example.springboot.controller;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.logging.log4j.util.PropertySource.Comparator;
import org.springframework.beans.factory.annotation.Autowired;
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.SpianService;
import com.example.springboot.common.Result;
+import com.example.springboot.component.S7control;
+import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
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.*;
+
@RestController
@RequestMapping("/home")
public class HomeController {
- @Autowired
- HomeMapper homeMapper;
+ @Autowired
+ HomeMapper homeMapper;
- @Autowired
- HomeService storageRackService;
+ @Autowired
+ HomeService storageRackService;
- @Autowired
- SpianService spianService;
+ @Autowired
+ SpianService spianService;
- @GetMapping("/load")
- public Result selectAll(){
- List<StorageCage> storageCagelist=homeMapper.selectAll();
- Map<String, Object> map = new HashMap<>();
- map.put("list",storageCagelist);
- return Result.success(map);
+ @Autowired
+ SpianMapper spianMapper;
+
+ // 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
+ @GetMapping("/load")
+ public Result selectAll() {
+ List<StorageCage> storageCagelist = homeMapper.selectAll();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCagelist);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
+ @GetMapping("/loads")
+ public Result selectRack() {
+ List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
+ List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
+ List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
+ List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list1", storageCagelist1);
+ map.put("list2", storageCagelist2);
+ map.put("list3", storageCagelist3);
+ map.put("list4", storageCagelist4);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ杩�/鍑虹墖浠诲姟
+ @GetMapping("/loadinout")
+ public Result selectinout(Integer types) {
+ List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+ for (StorageCage storageCage : storageCageinout) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCageinout);
+ return Result.success(map);
+ }
+
+ // 鎸夎鍗曞嚭鐗�
+ @GetMapping("/InsertOrder")
+ public Result InsertOrder(String orderid) {
+ short result = homeMapper.SelectOrder(orderid);
+ Map<String, Object> map = new HashMap<>();
+ if (result > 0) {
+ homeMapper.updateOrder();
+ homeMapper.InsertOrder(orderid);
+ map.put("message", "200");
+ } else {
+ map.put("message", "500");
+ }
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
+ @GetMapping("/Addglassid")
+ public Result Addglassid(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ short taskno = homeMapper.SelectInTask();
+ if (taskno > 0) {
+ map.put("message2", "500");
+ } else {
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
+ }
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
+ @GetMapping("/UpdateTask")
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ homeMapper.UpdateTask(types);
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ if (types == 0) {
+ homeMapper.UpdateCageTask1(glassid);
+ S7control.getinstance().WriteWord("DB105.14", (short) 0);
+ } else {
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
+ }
+ map.put("message3", "200");
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鎶ヨ淇℃伅
+ @GetMapping("/SelectAlarmmgInfo")
+ public Result SelectAlarmmgInfo() {
+ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+ Map<String, Object> map = new HashMap<>();
+ map.put("alarmmg", alarmmg);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐞嗙墖绗艰鎯�
+ @GetMapping("/SelectCageInfo")
+ public Result SelectCageInfo(short cage) {
+ List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
+ for (StorageCage storageCage : cageinfo) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("cageinfo", cageinfo);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
+ @GetMapping("/DeleteByGlassID")
+ public Result DeleteByGlassID(String glassid) {
+ StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+ homeMapper.DeleteByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message3", "200");
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
+ @GetMapping("/OutByGlassID")
+ public Result OutByGlassID(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ }
+ } else {
+ map.put("message2", "500");
}
- @GetMapping("/loads")
- public Result selectRack(){
- List<StorageCage> storageCagelist1=homeMapper.selectRack1();
- List<StorageCage> storageCagelist2=homeMapper.selectRack2();
- List<StorageCage> storageCagelist3=homeMapper.selectRack3();
- List<StorageCage> storageCagelist4=homeMapper.selectRack4();
- Map<String, Object> map = new HashMap<>();
- map.put("list1",storageCagelist1);
- map.put("list2",storageCagelist2);
- map.put("list3",storageCagelist3);
- map.put("list4",storageCagelist4);
- return Result.success(map);
+ return Result.success(map);
+ }
+
+ // 鍔犺浇灏忚溅浣嶇疆
+ @GetMapping("/Loadcarlist")
+ public Result Loadcarlist() {
+ List<CarPosition> carlist = homeMapper.Loadcarlist();
+ Map<String, Object> map = new HashMap<>();
+ map.put("carlist", carlist);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ纭瀵嗙爜
+ @GetMapping("/SelectPassword")
+ public Result SelectPassword() {
+ String pwdct = homeMapper.SelectPassword();
+ Map<String, Object> map = new HashMap<>();
+ map.put("password", pwdct);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
+ @GetMapping("/SelectGlassByGlassID")
+ public Result SelectGlassByGlassID(String glassid) {
+ north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("form", north_glass_buffer1s);
+ return Result.success(map);
+ }
+
+ // 鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+ @GetMapping("/Disabled")
+ public Result Disabled(short cage, short cell, short disabled) {
+ homeMapper.Disabled(cage, cell, disabled);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+ @PostMapping("/Inglassid")
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody north_glass_buffer1 north_glass_buffer1s) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(north_glass_buffer1s.getbarcode());
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
+ spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
+ }
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐜荤拑淇℃伅
+ @PostMapping("/SelectGlass")
+ public Result SelectGlass(String orderid) {
+ Map<String, Object> map = new HashMap<>();
+ List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
+ map.put("glass", glass);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @PostMapping("/InsertQueueGlassId")
+ public Result InsertQueueGlassId(String glassid, Short id) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.InsertQueueGlassId(glassid, id);
+ //璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianMapper.selectAll(glassid);
+ map.put("message", "200");
+ }
+ return Result.success(map);
+ }
+
+ // 纭鎵爜浣嶇幓鐠冧俊鎭�
+ @PostMapping("/UpdateQueueState")
+ public Result UpdateQueueState() {
+ homeMapper.UpdateQueueState();
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 娓呴櫎涓婄墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteQueueGlass")
+ public Result DeleteQueueGlass(String id) {
+ homeMapper.DeleteQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
+ @PostMapping("/SelectGlassNo")
+ public Result SelectGlassNo(String orderid) {
+ Short count = homeMapper.SelectGlassNo(orderid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("count", count);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
+ @PostMapping("/SelectAluminumFrameInfoById")
+ public Result SelectAluminumFrameInfoById(String FrameBarcode) {
+ List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(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()));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("listAluminumFrame", listAluminumFrame);
+ map.put("flip", flip);
+ return Result.success(map);
+ }
+
+
+
+ // 鏌ヨ鍑虹墖闃熷垪鏁版嵁
+ @PostMapping("/SelectProductionqueue")
+ public Result SelectProductionqueue() {
+ List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
+ for (Out_slice out_slice : listoutslice) {
+ out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
-
- @GetMapping("/loadinout")
- public Result selectinout(Integer types){
- List<StorageCage> storageCageinout=homeMapper.selectinout(types);
- Map<String, Object> map = new HashMap<>();
- map.put("list",storageCageinout);
- return Result.success(map);
- }
+ //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);
- @GetMapping("/InsertOrder")
- public Result InsertOrder(String orderid){
- short result=homeMapper.SelectOrder(orderid);
- Map<String, Object> map = new HashMap<>();
- if(result>0){
- homeMapper.updateOrder();
- homeMapper.InsertOrder(orderid);
- map.put("message","200");
- }else{
- map.put("message","500");
- }
- return Result.success(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());
- @GetMapping("/Addglassid")
- public Result Addglassid(short glassid){
- Map<String, Object> map = new HashMap<>();
- short taskno=homeMapper.SelectOutTask();
- if(taskno>0){
- map.put("message2","500");
- }else{
- map.put("message2","200");
- //璋冪敤浼嶄笂鐗囧嚱鏁�
- spianService.selectAll(glassid);
- }
- return Result.success(map);
- }
+ Map<String, Object> maps = new HashMap<>();
+ maps.put("listoutslice", listoutslice);
+ return Result.success(maps);
+ }
- @GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types,Integer shelfrack){
- Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types,shelfrack);
- if(types==0){
- homeMapper.UpdateCageTask1(shelfrack);
- }else{
- homeMapper.UpdateCageTask2(shelfrack);
- }
- map.put("message3","200");
- return Result.success(map);
- }
+ // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteProductionQueueGlass")
+ public Result DeleteProductionQueueGlass(Short id) {
+ homeMapper.DeleteProductionQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
- @GetMapping("/SelectAlarmmgInfo")
- public Result SelectAlarmmgInfo(){
- List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
- Map<String, Object> map = new HashMap<>();
- map.put("alarmmg",alarmmg);
- return Result.success(map);
+ //
+ @PostMapping("/AddOutSliceS")
+ 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]);
+ }
}
-
+ System.out.println(AluminumFrames);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0