#
Junjie
2025-11-19 2d94a387de61c8a5b045266eadbf9806b045230f
#
1个文件已添加
6个文件已修改
170 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/BasDevp.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/task/InitLocMapScheduler.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasDevpMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/basDevp/basDevp.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/basDevp/basDevp.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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);
    }
}
src/main/java/com/zy/core/MainProcess.java
@@ -41,9 +41,6 @@
                        continue;
                    }
                    // 初始化库位地图数据结构
                    mainService.initLocMap();
                    // 间隔
                    Thread.sleep(200);
                } catch (Exception e) {
src/main/java/com/zy/core/task/InitLocMapScheduler.java
New file
@@ -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);
    }
}
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>
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",
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>