From 2d94a387de61c8a5b045266eadbf9806b045230f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 十一月 2025 13:57:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basDevp/basDevp.js | 2
src/main/java/com/zy/asrs/entity/BasDevp.java | 19 +++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 62 --------------------
src/main/webapp/views/basDevp/basDevp.html | 12 ++++
src/main/java/com/zy/core/MainProcess.java | 3 -
src/main/java/com/zy/core/task/InitLocMapScheduler.java | 70 +++++++++++++++++++++++
src/main/resources/mapper/BasDevpMapper.xml | 2
7 files changed, 103 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 202b513..e56c777 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -6,9 +6,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -90,9 +87,23 @@
@TableField("barcode_station_list")
private String barcodeStationList;
+ /**
+ * 鍏ュ簱绔欑偣鏁版嵁
+ */
+ @ApiModelProperty(value= "鍏ュ簱绔欑偣鏁版嵁")
+ @TableField("in_station_list")
+ private String inStationList;
+
+ /**
+ * 鍑哄簱绔欑偣鏁版嵁
+ */
+ @ApiModelProperty(value= "鍑哄簱绔欑偣鏁版嵁")
+ @TableField("out_station_list")
+ private String outStationList;
+
public BasDevp() {}
- public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList) {
+ public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList,String barcodeStationList,String inStationList,String outStationList) {
this.devpNo = devpNo;
this.status = status;
this.createBy = createBy;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 89b3b41..3a4b101 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,23 +1,8 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.BasMap;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.service.BasMapService;
-import com.zy.asrs.utils.Utils;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.enums.MapNodeType;
-import com.zy.core.enums.RedisKeyType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -26,49 +11,6 @@
@Service("mainService")
public class MainServiceImpl {
- @Autowired
- private BasMapService basMapService;
- @Autowired
- private RedisUtil redisUtil;
- //鍒濆鍖栧簱浣嶅湴鍥炬暟鎹粨鏋�
- public void initLocMap() {
- Object object = redisUtil.get(RedisKeyType.LOC_MAP_BASE.key);
- if (object != null) {
- return;
- }
-
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
- if (Cools.isEmpty(basMap)){
- //缂哄皯鍒濆鍖栧簱浣嶅湴鍥�
- return;
- }
-
- List<List<JSONObject>> dataList = JSON.parseObject(basMap.getData(), List.class);
- List<List<HashMap<String, Object>>> mapNodeList = new ArrayList<>();
- for (int i = 0; i < dataList.size(); i++) {
- List<JSONObject> row = dataList.get(i);
- List<HashMap<String, Object>> mapNodeRow = new ArrayList<>();
-
- for (int j = 0; j < row.size(); j++) {
- JSONObject map = row.get(j);
-
- HashMap<String, Object> mapNode = new HashMap<>();
- mapNode.put("id", i + "-" + j);
-
- String nodeType = map.getString("type");
- if("shelf".equals(nodeType)) {
- mapNode.put("value", MapNodeType.NORMAL_PATH.id);
- }else {
- mapNode.put("value", MapNodeType.DISABLE.id);
- }
-
- mapNodeRow.add(mapNode);
- }
- mapNodeList.add(mapNodeRow);
- }
-
- redisUtil.set(RedisKeyType.LOC_MAP_BASE.key, mapNodeList);
- }
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0ddb41a..3376856 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,9 +41,6 @@
continue;
}
- // 鍒濆鍖栧簱浣嶅湴鍥炬暟鎹粨鏋�
- mainService.initLocMap();
-
// 闂撮殧
Thread.sleep(200);
} catch (Exception e) {
diff --git a/src/main/java/com/zy/core/task/InitLocMapScheduler.java b/src/main/java/com/zy/core/task/InitLocMapScheduler.java
new file mode 100644
index 0000000..b8b2314
--- /dev/null
+++ b/src/main/java/com/zy/core/task/InitLocMapScheduler.java
@@ -0,0 +1,70 @@
+package com.zy.core.task;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.service.BasMapService;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.enums.MapNodeType;
+import com.zy.core.enums.RedisKeyType;
+
+@Component
+public class InitLocMapScheduler {
+
+ @Autowired
+ private BasMapService basMapService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+ //鍒濆鍖栧簱浣嶅湴鍥炬暟鎹粨鏋�
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void initLocMap() {
+ Object object = redisUtil.get(RedisKeyType.LOC_MAP_BASE.key);
+ if (object != null) {
+ return;
+ }
+
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ if (Cools.isEmpty(basMap)){
+ //缂哄皯鍒濆鍖栧簱浣嶅湴鍥�
+ return;
+ }
+
+ List<List<JSONObject>> dataList = JSON.parseObject(basMap.getData(), List.class);
+ List<List<HashMap<String, Object>>> mapNodeList = new ArrayList<>();
+ for (int i = 0; i < dataList.size(); i++) {
+ List<JSONObject> row = dataList.get(i);
+ List<HashMap<String, Object>> mapNodeRow = new ArrayList<>();
+
+ for (int j = 0; j < row.size(); j++) {
+ JSONObject map = row.get(j);
+
+ HashMap<String, Object> mapNode = new HashMap<>();
+ mapNode.put("id", i + "-" + j);
+
+ String nodeType = map.getString("type");
+ if("shelf".equals(nodeType)) {
+ mapNode.put("value", MapNodeType.NORMAL_PATH.id);
+ }else {
+ mapNode.put("value", MapNodeType.DISABLE.id);
+ }
+
+ mapNodeRow.add(mapNode);
+ }
+ mapNodeList.add(mapNodeRow);
+ }
+
+ redisUtil.set(RedisKeyType.LOC_MAP_BASE.key, mapNodeList);
+ }
+
+}
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 2ac3d4f..584d18a 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -14,6 +14,8 @@
<result column="memo" property="memo" />
<result column="station_list" property="stationList" />
<result column="barcode_station_list" property="barcodeStationList" />
+ <result column="in_station_list" property="inStationList" />
+ <result column="out_station_list" property="outStationList" />
</resultMap>
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 95e9da7..6bfbc6a 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -35,6 +35,8 @@
{ field: "memo", align: "center", title: "澶囨敞" },
{ field: "stationList", align: "center", title: "绔欑偣鏁版嵁" },
{ field: "barcodeStationList", align: "center", title: "鏉＄爜绔欑偣鏁版嵁" },
+ { field: "inStationList", align: "center", title: "鍏ュ簱绔欑偣鏁版嵁" },
+ { field: "outStationList", align: "center", title: "鍑哄簱绔欑偣鏁版嵁" },
{
fixed: "right",
diff --git a/src/main/webapp/views/basDevp/basDevp.html b/src/main/webapp/views/basDevp/basDevp.html
index bc793cf..868ac11 100644
--- a/src/main/webapp/views/basDevp/basDevp.html
+++ b/src/main/webapp/views/basDevp/basDevp.html
@@ -131,6 +131,18 @@
<input class="layui-input" name="barcodeStationList" placeholder="璇疯緭鍏ユ潯鐮佺珯鐐规暟鎹�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱绔欑偣鏁版嵁: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inStationList" placeholder="璇疯緭鍏ュ叆搴撶珯鐐规暟鎹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑哄簱绔欑偣鏁版嵁: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="outStationList" placeholder="璇疯緭鍏ュ嚭搴撶珯鐐规暟鎹�">
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1