From eb73160dca035ca64aa5fc777b437682c0fe6dc8 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 27 三月 2024 14:49:48 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/RedisUtil.java | 8 --
zy-asrs-wcs/src/main/resources/application.yml | 6 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java | 6 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java | 9 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/RedisConfig.java | 98 ++++++++++++++++++++++++++++++++
6 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/RedisConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/RedisConfig.java
new file mode 100644
index 0000000..2cac152
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/RedisConfig.java
@@ -0,0 +1,98 @@
+package com.zy.asrs.wcs.common.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * Redis閰嶇疆绫�
+ * Created by vincent on 2019-12-23
+ */
+@Configuration
+//@EnableCaching // 寮�鍚暟鎹紦瀛樻満鍒�
+public class RedisConfig extends CachingConfigurerSupport {
+
+
+ /**
+ * RedisTemplate鐩稿叧閰嶇疆
+ */
+ @Bean
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+
+ RedisTemplate<String, Object> template = new RedisTemplate<>();
+ // 閰嶇疆杩炴帴宸ュ巶
+ template.setConnectionFactory(factory);
+
+ //浣跨敤Jackson2JsonRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨剉alue鍊硷紙榛樿浣跨敤JDK鐨勫簭鍒楀寲鏂瑰紡锛�
+ Jackson2JsonRedisSerializer<Object> jacksonSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
+
+ ObjectMapper om = new ObjectMapper();
+ // 鎸囧畾瑕佸簭鍒楀寲鐨勫煙锛宖ield,get鍜宻et,浠ュ強淇グ绗﹁寖鍥达紝ANY鏄兘鏈夊寘鎷琾rivate鍜宲ublic
+ om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+ // 鎸囧畾搴忓垪鍖栬緭鍏ョ殑绫诲瀷锛岀被蹇呴』鏄潪final淇グ鐨勶紝final淇グ鐨勭被锛屾瘮濡係tring,Integer绛変細璺戝嚭寮傚父
+ om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+ jacksonSerializer.setObjectMapper(om);
+
+ // 鍊奸噰鐢╦son搴忓垪鍖�
+ template.setValueSerializer(jacksonSerializer);
+ //浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊�
+ template.setKeySerializer(new StringRedisSerializer());
+
+ // 璁剧疆hash key 鍜寁alue搴忓垪鍖栨ā寮�
+ template.setHashKeySerializer(new StringRedisSerializer());
+ template.setHashValueSerializer(jacksonSerializer);
+ template.afterPropertiesSet();
+
+ return template;
+ }
+
+
+ /**
+ * 瀵箁edis瀛楃涓茬被鍨嬫暟鎹搷浣�
+ */
+ @Bean
+ public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
+ return redisTemplate.opsForValue();
+ }
+
+ /**
+ * 瀵筯ash绫诲瀷鐨勬暟鎹搷浣�
+ */
+ @Bean
+ public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
+ return redisTemplate.opsForHash();
+ }
+
+ /**
+ * 瀵归摼琛ㄧ被鍨嬬殑鏁版嵁鎿嶄綔
+ */
+ @Bean
+ public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
+ return redisTemplate.opsForList();
+ }
+
+ /**
+ * 瀵规棤搴忛泦鍚堢被鍨嬬殑鏁版嵁鎿嶄綔
+ */
+ @Bean
+ public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
+ return redisTemplate.opsForSet();
+ }
+
+ /**
+ * 瀵规湁搴忛泦鍚堢被鍨嬬殑鏁版嵁鎿嶄綔
+ */
+ @Bean
+ public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
+ return redisTemplate.opsForZSet();
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java
index a35b813..6519c5d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.core.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -13,10 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-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;
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 84edc5b..a638e93 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
@@ -43,7 +43,7 @@
@Autowired
private ShuttleCommandService shuttleCommandService;
- @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0/1 * * * * ? ")
public synchronized void executeWrkMast() {
Date now = new Date();
// ANALYZE_INBOUND
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/RedisUtil.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/RedisUtil.java
index dfc62e1..411f110 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/RedisUtil.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/RedisUtil.java
@@ -24,14 +24,6 @@
@Autowired
private RedisTemplate redisTemplate;
- public RedisTemplate getRedisTemplate() {
- return redisTemplate;
- }
-
- public RedisUtil(RedisTemplate redisTemplate) {
- this.redisTemplate = redisTemplate;
- }
-
/**
* 鎸囧畾缂撳瓨澶辨晥鏃堕棿
*
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
index 9bf65b6..ad5496b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
@@ -16,6 +16,8 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.util.HashMap;
+
/**
* 鍥涘悜绌挎杞�
*/
@@ -220,7 +222,7 @@
public Integer getTaskNo() {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
if (null != redisUtil) {
- Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.taskNo);
+ Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.shuttleNo);
if (!Cools.isEmpty(o)) {
this.taskNo = Integer.parseInt(String.valueOf(o));
}
@@ -239,9 +241,10 @@
}
//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
- Loc currentLoc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, this.currentCode)
- .eq(Loc::getHostId, this.device.getHostId()));
+ .eq(Loc::getHostId, this.device.getHostId());
+ Loc currentLoc = locService.getOne(wrapper);
if (currentLoc == null) {
return null;
}
diff --git a/zy-asrs-wcs/src/main/resources/application.yml b/zy-asrs-wcs/src/main/resources/application.yml
index 73fc1d7..f9f4428 100644
--- a/zy-asrs-wcs/src/main/resources/application.yml
+++ b/zy-asrs-wcs/src/main/resources/application.yml
@@ -31,6 +31,11 @@
multipart:
maxFileSize: 100MB
maxRequestSize: 100MB
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ database: 1
+ password:
mybatis-plus:
mapper-locations: classpath:mapper/*/*.xml
@@ -46,6 +51,7 @@
id-type: auto
logic-delete-value: 1
logic-not-delete-value: 0
+ column-format: "`%s`"
logging:
file:
--
Gitblit v1.9.1