From 0062bbf995d94017b4937b82f2dd05a8500fa2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BF=97=E6=81=92?= <842328916@qq.com> Date: Sat, 13 Sep 2025 23:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2Jedis-=E5=88=A0=E9=99=A4Jedis?= =?UTF-8?q?Service=E5=BA=9F=E5=BC=83api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/UserCheckAdminService.java | 29 ---------------- .../service/sms/OperationSmsAdminService.java | 32 ----------------- .../sms/OperationSmsAdminController.java | 22 ------------ .../user/UserCheckAdminController.java | 9 ----- .../com/accompany/common/redis/RedisKey.java | 4 --- .../core/service/common/JedisService.java | 34 ------------------- 6 files changed, 130 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java index 9198089dc..ca269b42a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java @@ -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 = 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(); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java index 7daf688a1..cacb19d37 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java @@ -133,38 +133,6 @@ public class OperationSmsAdminService extends BaseService { } } - /** - * 获取运营类短信模板列表 - * @return - */ - public List getSmsTemplate(){ - - List smsTemplates = Lists.newArrayList(); - List jsonStr = jedisService.hvals(RedisKey.operation_sms_template.getKey()); - if(!jsonStr.isEmpty()){ - for(String json : jsonStr){ - SmsTemplate smsTemplate = gson.fromJson(json, new TypeToken() {}.getType()); - smsTemplates.add(smsTemplate); - } - return smsTemplates; - } - - SmsTemplateExample example = new SmsTemplateExample(); - example.createCriteria().andTypeEqualTo(Constant.SmsTemplateType.OPERATION). - andTypeEqualTo(1); - List list = smsTemplateMapper.selectByExample(example); - if(list.isEmpty()){ - return list; - } - Map 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 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java index cbc802888..1c5d86471 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java @@ -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 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 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java index 0cb4ba6d8..67545035e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java @@ -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() { diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java index c8e02d035..fcc69bb2a 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java @@ -704,10 +704,6 @@ public enum RedisKey { **/ normal_big_prize_times, - /** - * 初始化用户邀请码lock - */ - lock_init_user_invite_codes, /** * 深海奇缘活动用户碎片锁 **/ diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/common/JedisService.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/common/JedisService.java index 45335de9d..1c2978f51 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/common/JedisService.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/common/JedisService.java @@ -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 hvals(String key){ - List 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 hgetAllKeysByKey(String key) { Set ret = null; Jedis rjedis = null;