From d837bbfa526db9a42f511fc0f7fba9c7d9b60cb8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 27 三月 2024 13:45:33 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java | 4
zy-asrs-wcs/src/main/resources/mapper/core/MotionMapper.xml | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionStsServiceImpl.java | 8 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java | 4
zy-asrs-wcs/src/main/resources/mapper/core/MotionCtgMapper.xml | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java | 10 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionStsService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionStsController.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java | 31 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionCtgMapper.java | 4
zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionCtgService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionCtgController.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionController.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 7 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionStsMapper.java | 4
/dev/null | 5 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionSts.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 5 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java | 21 ----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionCtgServiceImpl.java | 8 +-
31 files changed, 93 insertions(+), 88 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionController.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionController.java
index 7e4227c..402cb8b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.controller;
+package com.zy.asrs.wcs.core.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionCtgController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionCtgController.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionCtgController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionCtgController.java
index eb1761a..2d6a456 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionCtgController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionCtgController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.controller;
+package com.zy.asrs.wcs.core.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
-import com.zy.asrs.wcs.rcs.entity.MotionCtg;
-import com.zy.asrs.wcs.rcs.service.MotionCtgService;
+import com.zy.asrs.wcs.core.entity.MotionCtg;
+import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionStsController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionStsController.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionStsController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionStsController.java
index 1c4cce3..aa335c2 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionStsController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionStsController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.controller;
+package com.zy.asrs.wcs.core.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
-import com.zy.asrs.wcs.rcs.entity.MotionSts;
-import com.zy.asrs.wcs.rcs.service.MotionStsService;
+import com.zy.asrs.wcs.core.entity.MotionSts;
+import com.zy.asrs.wcs.core.service.MotionStsService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
similarity index 94%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
index b51d92c..4d64132 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
@@ -1,35 +1,21 @@
-package com.zy.asrs.wcs.rcs.entity;
+package com.zy.asrs.wcs.core.entity;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.zy.asrs.wcs.core.BuildSupport;
-import com.zy.asrs.wcs.core.entity.DeviceCtg;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.DeviceCtgService;
-import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
-import com.zy.asrs.wcs.rcs.service.MotionCtgService;
-import com.zy.asrs.wcs.rcs.service.MotionStsService;
+import com.zy.asrs.wcs.core.service.MotionCtgService;
+import com.zy.asrs.wcs.core.service.MotionStsService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -38,7 +24,6 @@
import com.zy.asrs.wcs.system.service.HostService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("rcs_motion")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
similarity index 99%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
index e4bc14c..9262b7e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.entity;
+package com.zy.asrs.wcs.core.entity;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionSts.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionSts.java
similarity index 99%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionSts.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionSts.java
index 0b970a9..b763a13 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionSts.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionSts.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.entity;
+package com.zy.asrs.wcs.core.entity;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index 08e117f..4f7ef93 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -3,7 +3,6 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.Task;
-import com.zy.asrs.wcs.core.model.enums.LiftCodeType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.model.enums.WorkZoneType;
@@ -12,12 +11,10 @@
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
-import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
-import com.zy.asrs.wcs.rcs.service.MotionService;
-import com.zy.asrs.wcs.rcs.thread.LiftThread;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
index 86a7415..99337f9 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
@@ -3,8 +3,8 @@
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.core.service.MotionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java
index 254b7e5..a245cc2 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.core.kernel.command;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java
index 35ccf8c..90f38d8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.core.kernel.command;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
index 52006b7..beb76a3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
@@ -14,11 +14,11 @@
import com.zy.asrs.wcs.core.utils.*;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionCtgMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionCtgMapper.java
similarity index 74%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionCtgMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionCtgMapper.java
index bd7c363..c7464a3 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionCtgMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionCtgMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.rcs.mapper;
+package com.zy.asrs.wcs.core.mapper;
-import com.zy.asrs.wcs.rcs.entity.MotionCtg;
+import com.zy.asrs.wcs.core.entity.MotionCtg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionMapper.java
similarity index 86%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionMapper.java
index 7f66193..acb035a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.rcs.mapper;
+package com.zy.asrs.wcs.core.mapper;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionStsMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionStsMapper.java
similarity index 74%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionStsMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionStsMapper.java
index 28a82a9..c888992 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionStsMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionStsMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.rcs.mapper;
+package com.zy.asrs.wcs.core.mapper;
-import com.zy.asrs.wcs.rcs.entity.MotionSts;
+import com.zy.asrs.wcs.core.entity.MotionSts;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java
index 18c91ed..ad73d9b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java
@@ -2,8 +2,8 @@
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wcs.rcs.entity.MotionCtg;
-import com.zy.asrs.wcs.rcs.service.MotionCtgService;
+import com.zy.asrs.wcs.core.entity.MotionCtg;
+import com.zy.asrs.wcs.core.service.MotionCtgService;
import static com.zy.asrs.wcs.core.model.enums.DeviceCtgType.*;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java
index 4f2346c..47bc91b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java
@@ -3,8 +3,8 @@
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wcs.rcs.entity.MotionSts;
-import com.zy.asrs.wcs.rcs.service.MotionStsService;
+import com.zy.asrs.wcs.core.entity.MotionSts;
+import com.zy.asrs.wcs.core.service.MotionStsService;
public enum MotionStsType {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionCtgService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionCtgService.java
similarity index 67%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionCtgService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionCtgService.java
index a2aa422..9d4d68a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionCtgService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionCtgService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.rcs.service;
+package com.zy.asrs.wcs.core.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.rcs.entity.MotionCtg;
+import com.zy.asrs.wcs.core.entity.MotionCtg;
public interface MotionCtgService extends IService<MotionCtg> {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionService.java
similarity index 89%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionService.java
index 70fbca0..a84797f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionService.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.rcs.service;
+package com.zy.asrs.wcs.core.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+import com.zy.asrs.wcs.core.entity.Motion;
import java.util.List;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionStsService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionStsService.java
similarity index 67%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionStsService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionStsService.java
index e5d6c65..1d28970 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionStsService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionStsService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.rcs.service;
+package com.zy.asrs.wcs.core.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.rcs.entity.MotionSts;
+import com.zy.asrs.wcs.core.entity.MotionSts;
public interface MotionStsService extends IService<MotionSts> {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 6089dc4..bda1a5f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -5,8 +5,8 @@
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.rcs.News;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.core.service.MotionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionCtgServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionCtgServiceImpl.java
similarity index 71%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionCtgServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionCtgServiceImpl.java
index 01c2ffb..cb589b7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionCtgServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionCtgServiceImpl.java
@@ -1,9 +1,9 @@
-package com.zy.asrs.wcs.rcs.service.impl;
+package com.zy.asrs.wcs.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper;
-import com.zy.asrs.wcs.rcs.entity.MotionCtg;
-import com.zy.asrs.wcs.rcs.service.MotionCtgService;
+import com.zy.asrs.wcs.core.mapper.MotionCtgMapper;
+import com.zy.asrs.wcs.core.entity.MotionCtg;
+import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
similarity index 93%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
index 8f20651..efef568 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.rcs.service.impl;
+package com.zy.asrs.wcs.core.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,11 +6,11 @@
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.DeviceCtgService;
-import com.zy.asrs.wcs.rcs.mapper.MotionMapper;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.mapper.MotionMapper;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wcs.rcs.service.MotionStsService;
+import com.zy.asrs.wcs.core.service.MotionStsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionStsServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionStsServiceImpl.java
similarity index 71%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionStsServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionStsServiceImpl.java
index 42826ec..f5d8b97 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionStsServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionStsServiceImpl.java
@@ -1,9 +1,9 @@
-package com.zy.asrs.wcs.rcs.service.impl;
+package com.zy.asrs.wcs.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wcs.rcs.mapper.MotionStsMapper;
-import com.zy.asrs.wcs.rcs.entity.MotionSts;
-import com.zy.asrs.wcs.rcs.service.MotionStsService;
+import com.zy.asrs.wcs.core.mapper.MotionStsMapper;
+import com.zy.asrs.wcs.core.entity.MotionSts;
+import com.zy.asrs.wcs.core.service.MotionStsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
index e4048b9..c0a5e5a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
@@ -7,7 +7,7 @@
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.service.MotionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
new file mode 100644
index 0000000..0518fca
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.wcs.core.timer;
+
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DeviceTimer {
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ public synchronized void executeShuttle() {
+
+ }
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ public synchronized void executeLift() {
+
+ }
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ public synchronized void executeConveyor() {
+
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
index c4ed1af..84edc5b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java
@@ -10,8 +10,8 @@
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.core.service.MotionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 70f77a0..cddb6df 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -1,8 +1,6 @@
package com.zy.asrs.wcs.core.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.service.CommonService;
-import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.entity.Task;
@@ -18,12 +16,11 @@
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
-import com.zy.asrs.wcs.rcs.service.MotionService;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Date;
import java.util.List;
/**
diff --git a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/MotionCtgMapper.xml
similarity index 70%
rename from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/core/MotionCtgMapper.xml
index 8f1dc40..da01cb5 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/MotionCtgMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionCtgMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/MotionMapper.xml
similarity index 69%
rename from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/core/MotionMapper.xml
index 48a3024..f6b64ba 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/MotionMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionMapper">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionMapper">
- <select id="selectOfTop1" resultType="com.zy.asrs.wcs.rcs.entity.Motion">
+ <select id="selectOfTop1" resultType="com.zy.asrs.wcs.core.entity.Motion">
select * from rcs_motion
where 1=1
and uuid = #{uuid}
@@ -11,7 +11,7 @@
limit 0,1
</select>
- <select id="selectOfNext" resultType="com.zy.asrs.wcs.rcs.entity.Motion">
+ <select id="selectOfNext" resultType="com.zy.asrs.wcs.core.entity.Motion">
select * from rcs_motion
where 1=1
and uuid = #{uuid}
diff --git a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml
similarity index 70%
copy from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml
index 8f1dc40..82039d9 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionStsMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionStsMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionStsMapper.xml
deleted file mode 100644
index ae52319..0000000
--- a/zy-asrs-wcs/src/main/resources/mapper/rcs/MotionStsMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionStsMapper">
-
-</mapper>
--
Gitblit v1.9.1