moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

替换Jedis-删除JedisService废弃api

Browse Source
This commit is contained in:
杨志恒
2025-09-13 23:58:04 +08:00
committed by khalil
parent a86a10cab7
commit 3206b37374
6 changed files with 0 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java
View File

@@ -391,35 +391,6 @@ public class UserCheckAdminService {
return list;
}
public void initUserInviteCodes() {
String lock = jedisService.lockWithTimeout(RedisKey.lock_init_user_invite_codes.getKey(), 5000, 2 * 60 * 60 * 1000);
if (StringUtils.isBlank(lock)) {
throw new AdminServiceException("程序正在初始化用户邀请码，请稍后再试");
}
try {
int pageSize = 1000;
List<Users> users = null;
do {
users = usersMapper.listNoInviteCodeUserByPage(1, pageSize);
if (users.isEmpty()) {
break;
}
users.forEach(user -> {
UserInviteCode inviteCode = new UserInviteCode();
inviteCode.setUid(user.getUid());
inviteCode.setInviteCode(userInviteCodeService.generateUniqueInviteCode(user.getUid()));
inviteCode.setIsPrimary(true);
userInviteCodeMapper.insert(inviteCode);
});
} while (users != null && users.size() >= pageSize);
} finally {
jedisService.releaseLock(RedisKey.lock_init_user_invite_codes.getKey(), lock);
}
}
public BusiResult updatePartition(String uidstr, Integer partitionId, Boolean checkGuild) {
String[] split = uidstr.trim().split(SymbolConstants.COMMA);
StringBuilder result = new StringBuilder();

32
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java
View File

@@ -133,38 +133,6 @@ public class OperationSmsAdminService extends BaseService {
}
}
/**
* 获取运营类短信模板列表
* @return
*/
public List<SmsTemplate> getSmsTemplate(){
List<SmsTemplate> smsTemplates = Lists.newArrayList();
List<String> jsonStr = jedisService.hvals(RedisKey.operation_sms_template.getKey());
if(!jsonStr.isEmpty()){
for(String json : jsonStr){
SmsTemplate smsTemplate = gson.fromJson(json, new TypeToken<SmsTemplate>() {}.getType());
smsTemplates.add(smsTemplate);
}
return smsTemplates;
}
SmsTemplateExample example = new SmsTemplateExample();
example.createCriteria().andTypeEqualTo(Constant.SmsTemplateType.OPERATION).
andTypeEqualTo(1);
List<SmsTemplate> list = smsTemplateMapper.selectByExample(example);
if(list.isEmpty()){
return list;
}
Map<String,SmsTemplate> map = new HashMap<>();
for(SmsTemplate smsTemplate : list){
map.put(smsTemplate.getTemplateId().toString(), smsTemplate);
jedisService.hset(RedisKey.operation_sms_template.getKey(),smsTemplate.getTemplateId().toString(),
gson.toJson(smsTemplate));
}
return list;
}
/**
* 获取发送的短信列表
* @param erbanNo

22
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java
View File

@@ -52,28 +52,6 @@ public class OperationSmsAdminController extends BaseController {
return operationSmsAdminService.insertFileDate(templateId,sheet,adminId);
}
/**
* 获取短信模板列表
* @return
*/
@RequestMapping(value = "/getSmsTemp",method = RequestMethod.GET)
public BusiResult getSmsTemplate(){
return new BusiResult(BusiStatus.SUCCESS,operationSmsAdminService.getSmsTemplate());
}
@RequestMapping(value = "/list",method = RequestMethod.GET)
public void getList(Long erbanNo,Integer templateId,Integer sendStatus,String createTime,String updateTime,
@RequestParam(defaultValue = "1")Integer page,
@RequestParam(defaultValue = "20")Integer pageSize){
PageInfo<OperationSmsRecordVo> pageInfo = operationSmsAdminService.getList(erbanNo,templateId,sendStatus,
createTime, updateTime,page,pageSize);
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", pageInfo.getTotal());
jsonObject.put("rows", pageInfo.getList());
writeJson(jsonObject.toJSONString());
}
/**
* 通过查询条件批量发送短信
* @param erbanNo

9
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java
View File

@@ -180,15 +180,6 @@ public class UserCheckAdminController extends BaseController {
writeJson(jsonObject.toJSONString());
}
@RequestMapping(value = "/initUserInviteCodes", method = RequestMethod.POST)
@ResponseBody
public BusiResult initUserInviteCodes() {
logger.info("开始批量初始化用户邀请码");
userCheckAdminService.initUserInviteCodes();
logger.info("完成批量初始化用户邀请码");
return new BusiResult(BusiStatus.SUCCESS);
}
@RequestMapping("/accountChannel/list")
@ResponseBody
public BusiResult getAccountChannelList() {

4
accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java
View File

@@ -704,10 +704,6 @@ public enum RedisKey {
**/
normal_big_prize_times,
/**
* 初始化用户邀请码lock
*/
lock_init_user_invite_codes,
/**
* 深海奇缘活动用户碎片锁
**/

34
accompany-base/accompany-core/src/main/java/com/accompany/core/service/common/JedisService.java
View File

@@ -91,25 +91,7 @@ public class JedisService {
* @param content 数据
* @param expireTime 失效时长(秒)
*/
public void write(String key, String content, int expireTime) {
Jedis wjedis = null;
try {
wjedis = writeJedisPoolManager.getJedis();
byte[] data = null;
if (content != null) {
data = content.getBytes();
}
byte[] jedisKey = key.getBytes();
wjedis.setex(jedisKey, expireTime, data);
} catch (Exception e) {
// log.error("write to jedis error. key:{} data:{} msg:{}", key, content, e);
} finally {
if (wjedis != null) {
wjedis.close();
}
}
}
public void set(String key, String content) {
Jedis wjedis = null;
@@ -519,22 +501,6 @@ public class JedisService {
return ret;
}
public List<String> hvals(String key){
List<String> vals = null;
Jedis rjedis = null;
try {
rjedis = readJedisPoolManager.getJedis();
vals = rjedis.hvals(key);
} catch (Exception e) {
log.error("hvals from jedis error. key:{}", key);
} finally {
if (rjedis != null) {
rjedis.close();
}
}
return vals;
}
public Set<String> hgetAllKeysByKey(String key) {
Set<String> ret = null;
Jedis rjedis = null;