From 2a7fc85c131a1d1b19bbc30538bc03a5bb932bcc Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:09:36 +0800
Subject: [PATCH] 111
---
/dev/null | 86 ----------------------------
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 10 +++
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 27 ++++-----
3 files changed, 22 insertions(+), 101 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
deleted file mode 100644
index e463111..0000000
--- a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.doumee.core.utils.redis;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
-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.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * @author jiangping
- * @date 2021-8-10 14:40:35
- * redis閰嶇疆
- */
-@Configuration
-public class RedisConfig {
-
- @Bean
- @SuppressWarnings("all")
- public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
- RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
- template.setConnectionFactory(factory);
- Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
- ObjectMapper om = new ObjectMapper();
- om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
- om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
- jackson2JsonRedisSerializer.setObjectMapper(om);
- StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
- // key閲囩敤String鐨勫簭鍒楀寲鏂瑰紡
- template.setKeySerializer(stringRedisSerializer);
- // hash鐨刱ey涔熼噰鐢⊿tring鐨勫簭鍒楀寲鏂瑰紡
- template.setHashKeySerializer(stringRedisSerializer);
- // value搴忓垪鍖栨柟寮忛噰鐢╦ackson
- template.setValueSerializer(jackson2JsonRedisSerializer);
- // hash鐨剉alue搴忓垪鍖栨柟寮忛噰鐢╦ackson
- template.setHashValueSerializer(jackson2JsonRedisSerializer);
- template.afterPropertiesSet();
- return template;
- }
-}
-/*@Configuration
-public class RedisConfig {
-
- *//**
- * @param factory
- * @return 鑷畾涔塺edisTemplate锛岃嚜甯︾殑bean娌℃湁搴忓垪鍖栧櫒
- *//*
- @Bean
- public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
- RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
- redisTemplate.setConnectionFactory(factory);
- redisTemplate.setKeySerializer(new StringRedisSerializer());//璁剧疆key鐨勫簭鍒楀寲鍣�
- redisTemplate.setValueSerializer(new RedisConverter());//璁剧疆鍊肩殑搴忓垪鍖栧櫒
- return redisTemplate;
- }
-
-}*/
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
deleted file mode 100644
index ff27fcd..0000000
--- a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.doumee.core.utils.redis;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.serializer.support.DeserializingConverter;
-import org.springframework.core.serializer.support.SerializingConverter;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-
-/**
- * @author 褰紵
- * @date 2018/8/28 9:31
- */
-public class RedisConverter implements RedisSerializer<Object> {
- private Converter<Object, byte[]> serializer = new SerializingConverter();//搴忓垪鍖栧櫒
- private Converter<byte[], Object> deserializer = new DeserializingConverter();//鍙嶅簭鍒楀寲鍣�
-
- @Override
- public byte[] serialize(Object o) throws SerializationException {//灏嗗璞″簭鍒楀寲鎴愬瓧鑺傛暟缁�
- if (o == null) return new byte[0];
- try {
- return serializer.convert(o);
- } catch (Exception e) {
- e.printStackTrace();
- return new byte[0];
- }
- }
-
- @Override
- public Object deserialize(byte[] bytes) throws SerializationException {//灏嗗瓧鑺傛暟缁勫弽搴忓垪鍖栨垚瀵硅薄
- if (bytes == null || bytes.length == 0) return null;
- try {
- return deserializer.convert(bytes);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-}
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
deleted file mode 100644
index 28d5cb9..0000000
--- a/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.doumee.core.utils.redis;
-
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import java.util.concurrent.TimeUnit;
-
-public class RedisUtil {
- /**
- * 娣诲姞涓�涓猇alue涓篠tring
- * @param stringRedisTemplate
- * @param key
- * @param str
- */
- public static void addString( StringRedisTemplate stringRedisTemplate, String key, String str) {
- //1,娣诲姞涓�涓猇alue涓篠tring
- stringRedisTemplate.opsForValue().set(key, str);
-
- }
-
- /**
- * 鏍规嵁key鍒犻櫎瀛楃涓茬紦瀛�
- * @param stringRedisTemplate
- * @param key
- */
- public static void delString( StringRedisTemplate stringRedisTemplate, String key ) {
- //1,娣诲姞涓�涓猇alue涓篠tring
- stringRedisTemplate.delete(key);
-
- }
-
- /**
- * 鏍规嵁key鍒犻櫎瀵硅薄鏁版嵁
- * @param redisTemplate
- * @param key
- */
- public static void deleteObject( RedisTemplate<String, Object> redisTemplate , String key ) {
-
- redisTemplate.delete(key);
-
- }
- /**
- * 娣诲姞涓�涓猇alue涓哄璞�
- * @param redisTemplate
- * @param key
- * @param obj
- */
- public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj) {
- redisTemplate.opsForValue().set(key, obj);
- }
- /**
- * 娣诲姞涓�涓猇alue涓哄璞�
- * @param redisTemplate
- * @param key
- * @param obj
- */
- public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj,long time) {
-// redisTemplate.opsForValue().set(key, obj);
- redisTemplate.opsForValue().set(key,obj,time, TimeUnit.SECONDS);
- }
-
- /**
- * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
- * @param stringRedisTemplate
- * @param key
- * @return
- */
- public static String getString(StringRedisTemplate stringRedisTemplate, String key){
- String val = stringRedisTemplate.opsForValue().get(key);
- return val;
- }
-
- /**
- * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
- * @param redisTemplate
- * @param key
- * @param clazz
- * @param <T>
- * @return
- */
- public static <T> T getObject(RedisTemplate<String, Object> redisTemplate , String key,Class<T> clazz){
- T t = (T) redisTemplate.opsForValue().get(key);
- return t;
- }
-
-}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index 8aa7f58..a23d9d5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -365,4 +365,14 @@
QueryWrapper<IdentityInfo> wrapper = new QueryWrapper<>(identityInfo);
return identityInfoMapper.selectCount(wrapper);
}
+
+
+ public void audit(){
+
+
+ }
+
+
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 320b2ea..8887d58 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -14,7 +14,6 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
-import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
@@ -79,9 +78,6 @@
@Autowired
private WxMiniUtilService wxMiniUtilService;
-
- @Autowired
- private RedisTemplate<String, Object> redisTemplate;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -1308,17 +1304,18 @@
public synchronized String getNextCode(Integer type){
- String prefix = "YG";
- if(!Constants.equalsInteger(type,Constants.ZERO)){
- prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
- }
- prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
- Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
- countNum = Constants.formatIntegerNum(countNum)+1;
- //鏇存柊缂撳瓨
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
- String nextIndex =Integer.toString( countNum );
- return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
+// String prefix = "YG";
+// if(!Constants.equalsInteger(type,Constants.ZERO)){
+// prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
+// }
+// prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
+// Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
+// countNum = Constants.formatIntegerNum(countNum)+1;
+// //鏇存柊缂撳瓨
+// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
+// String nextIndex =Integer.toString( countNum );
+// return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
+ return null;
}
--
Gitblit v1.9.3