From 83ff02860cfc3cbe63cda138c638b6fd4ad51da1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 三月 2024 15:33:06 +0800
Subject: [PATCH] 库位地图
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 6 +-
src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java | 2
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 78 ++++++++++++++++---------
src/main/java/com/zy/asrs/controller/AgvMapController.java | 49 ++++++---------
src/main/java/com/zy/asrs/service/AgvLocMastService.java | 2
src/main/resources/application.yml | 2
7 files changed, 77 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 7a82554..b770419 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -101,9 +101,9 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- //agvLockMastService.clearLoc();
- //鍒濆鍖栦竴妤肩珯鐐�
- agvLockMastService.initLocFloor1();
+ agvLockMastService.clearLoc();
+ //鍒濆鍖栦簩妤煎簱浣�
+ agvLockMastService.initLocFloor2();
//鍒濆鍖栦笁妤肩珯鐐�
//agvLockMastService.initLocFloor3();
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index b1f74bf..bc2d9d3 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -49,6 +49,10 @@
@GetMapping("/map/getData/{floor}/{lev}/auth")
@ManagerAuth
public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {
+
+ //to do
+ floor = 2;
+
BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
@@ -58,16 +62,16 @@
List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev,floor);
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getRow1();
- Integer bay = 34 - locMast.getBay1();
+ Integer bay = locMast.getBay1();
int x = bay;
int y = row;
- ////1妤�
- //if(floor == 1){
- // x = generateMap1Row(row);
- // y = generateMap1Bay(bay);
- //}
+ //2妤�
+ if(floor == 2){
+ y = generateMap2Row(row);
+ //y = generateMap2Bay(bay);
+ }
////3妤�
//if(floor == 3){
// y = generateMap3Row(row);
@@ -90,34 +94,21 @@
return JSONObject.toJSONString(arrayLists);
}
- private Integer generateMap1Row(int row){
- int x = 21-row;
- if(row > 1){
- x --;
+ private Integer generateMap2Row(int row){
+ int x = row;
+ Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,20,22,24};
+ for(int i=0; i<rowAdd.length; i++){
+ if(row > rowAdd[i]){
+ x ++;
+ }
}
- if(row > 3){
- x --;
- }
- if(row > 5){
- x --;
- }
- if(row > 7){
- x --;
- }
- if(row > 9){
- x --;
- }
- if(row > 10){
- x --;
- }
- if(row > 12){
- x --;
- }
+ if(row >20) x += 9;
+
return x;
}
- private Integer generateMap1Bay(int bay){
+ private Integer generateMap2Bay(int bay){
int y = bay;
if(y > 28){
y ++;
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
index 96abd30..08be9dc 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
@@ -10,7 +10,7 @@
public interface AgvLocMastMapper extends BaseMapper<AgvLocMast>{
//@Delete("delete from agv_loc_mast")
- @Delete("delete from agv_loc_mast where floor = '3'")
+ @Delete("delete from agv_loc_mast")
public void deleteAll();
@Update("update agv_loc_mast set loc_type2 = ${locType2}" +
diff --git a/src/main/java/com/zy/asrs/service/AgvLocMastService.java b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
index b8e9f7c..c3dfff6 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -12,7 +12,7 @@
public void initLocFloor1();
- public void initLocFloor3();
+ public void initLocFloor2();
List<AgvLocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index 88f5250..b34b3e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -32,22 +32,9 @@
}
- public void initLocFloor3() {
- //3妤� 1-33鎺� 1-14鍒� 8灞� ------> 1-33鎺� 1-17鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
-//
-// //3妤� 1-27鎺� 15-34鍒� 8灞� ------> 1-26鎺� 18-25鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));
-//
-// //3妤� 1-25鎺� 35-46鍒� 8灞� ------> 1-25鎺� 26-35鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));
-//
-// //3妤� 3-25鎺� 47-60鍒� 8灞� ------> 1-23鎺� 36-70鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));
-
- //3妤� 3-23鎺� 71-72鍒� 8灞�
- this.insertBatch(getLocMastList(3, 23, 71, 72, 1, 8, 3));
-
+ public void initLocFloor2() {
+ //2妤� 1-25鎺� 1-33鍒� 1灞�
+ this.insertBatch(getLocMastList(1, 25, 1, 33, 1, 1, 2));
}
//鏍规嵁鎺掑垪灞傝幏鍙朅GV搴撲綅鍒楄〃
@@ -58,20 +45,9 @@
for (int bay = bayIndex; bay <= bayMax; bay++) {
for (int lev = levIndex; lev <= levMax; lev++) {
- if(!checkLocExist(row,bay,floor)){
+ if(!checkLocExistFloor2(row,bay)){
continue;
}
-
-// if(floor == 1 && (row == 8 || row == 9)){
-// if((bay >=8 && bay <=11)
-// || (bay >= 20 && bay <=23)
-// || (bay>=37 && bay <=39)
-// || (bay>=50 && bay <=52)
-// || (bay>=63 && bay <=64)
-// || (bay>=79 && bay <=80)){
-// continue;
-// }
-// }
AgvLocMast loc = new AgvLocMast();
String locRow = row < 10 ? "-00" + row : "-0" + row;
@@ -87,6 +63,7 @@
loc.setModiTime(now);
loc.setFirstTime(now);
loc.setAppeTime(now);
+ loc.setLocType1(initLocMastSts(row,bay));
agvLocMastList.add(loc);
}
}
@@ -95,6 +72,51 @@
return agvLocMastList;
}
+ private boolean checkLocExistFloor2(int row, int bay){
+ if(row <= 4 && bay >= 17){
+ return false;
+ }
+
+ if(row <= 7 && bay >= 26){
+ return false;
+ }
+
+ if(row >= 24 && bay >= 29){
+ return false;
+ }
+
+ if((row != 20 && row != 25) && (bay ==8 || bay ==22)){
+ return false;
+ }
+
+ if((row == 3 || row == 12 || row == 16 || row == 21) && (bay ==4 || bay ==9 || bay == 14 || bay == 20 || bay == 25 || bay ==30 || bay == 31)){
+ return false;
+ }
+
+ if(row == 21 && bay == 15){
+ return false;
+ }
+
+ return true;
+ }
+
+ private short initLocMastSts(int row, int bay){
+
+ if(row <= 11 && bay <= 14){
+ return 1;
+ }
+
+ if(row <= 7){
+ return 1;
+ }
+
+ if(row >= 21){
+ return 3;
+ }
+
+ return 2;
+ }
+
private boolean checkLocExist(int row, int bay, int floor){
//if(floor == 1 && (row == 2)){
// if((bay >=8 && bay <=11)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index efcdff9..3a0a601 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -75,7 +75,7 @@
putaway锛氫笂鏋�
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
*/
- @Scheduled(cron = "0/10 * * * * ? ")
+ //@Scheduled(cron = "0/10 * * * * ? ")
public void startPutwayWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c50515d..0e478a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.4.188:1433;databasename=phyzasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
#url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
--
Gitblit v1.9.1