Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aff056712e | ||
|
|
af18b0999d | ||
|
|
4963988ec2 | ||
|
|
022185079c | ||
|
|
acc3f05f12 | ||
|
|
a523df6a07 | ||
|
|
31c583eeb5 | ||
|
|
e3ef3e5275 | ||
|
|
84190b9773 | ||
|
|
7808d22775 | ||
|
|
fba559cd22 | ||
|
|
dcc75efa87 | ||
|
|
a9465299a9 | ||
|
|
42152c7b79 | ||
|
|
1a896ef457 | ||
|
|
9d8990a028 | ||
|
|
17d88fc338 | ||
|
|
bb40f347a3 | ||
|
|
3d4e32e5da | ||
|
|
bdc4cbb240 | ||
|
|
7f6cebd4e2 | ||
|
|
75fd4bed18 |
@@ -46,6 +46,11 @@ jobs:
|
||||
<username>${{ vars.TIMI_NEXUS_USERNAME }}</username>
|
||||
<password>${{ vars.TIMI_NEXUS_PASSWORD }}</password>
|
||||
</server>
|
||||
<server>
|
||||
<id>e2ins_nexus</id>
|
||||
<username>${{ vars.E2INS_NEXUS_USERNAME }}</username>
|
||||
<password>${{ vars.E2INS_NEXUS_PASSWORD }}</password>
|
||||
</server>
|
||||
</servers>
|
||||
</settings>
|
||||
EOF
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||
<artifactId>TimiServerAPI</artifactId>
|
||||
<version>1.0.14</version>
|
||||
<version>1.0.21</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>TimiServerAPI</name>
|
||||
<description>imyeyu.com API</description>
|
||||
@@ -167,6 +167,16 @@
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>e2ins_nexus</id>
|
||||
<url>https://nexus.e2ins.com/repository/maven-public/</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
@@ -195,6 +205,11 @@
|
||||
<artifactId>timi-utils</artifactId>
|
||||
<version>0.0.13</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.majiajie</groupId>
|
||||
<artifactId>tinypinyin</artifactId>
|
||||
<version>2.0.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.imyeyu.font.icon</groupId>
|
||||
<artifactId>timi-icon-font</artifactId>
|
||||
@@ -225,6 +240,20 @@
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-mysql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.e2ins.ms.notify</groupId>
|
||||
<artifactId>e2ins-msg-notify-service-sdk</artifactId>
|
||||
<version>0.0.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.tencentcloudapi</groupId>
|
||||
<artifactId>tencentcloud-sdk-java-sms</artifactId>
|
||||
<version>3.1.1281</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-mail</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
|
||||
@@ -50,6 +50,16 @@ public enum CorePermissionCode implements BuiltinPermissionCode {
|
||||
USER_UPDATE("USER:UPDATE", "用户修改", false, true),
|
||||
USER_DELETE("USER:DELETE", "用户删除", false, true),
|
||||
|
||||
FEEDBACK_CREATE("FEEDBACK:CREATE", "反馈创建", false, true),
|
||||
FEEDBACK_READ("FEEDBACK:READ", "反馈读取", false, true),
|
||||
FEEDBACK_UPDATE("FEEDBACK:UPDATE", "反馈修改", false, true),
|
||||
FEEDBACK_DELETE("FEEDBACK:DELETE", "反馈删除", false, true),
|
||||
|
||||
NOTIFY_CREATE("NOTIFY:CREATE", "通知创建", false, true),
|
||||
NOTIFY_READ("NOTIFY:READ", "通知读取", false, true),
|
||||
NOTIFY_DELETE("NOTIFY:DELETE", "通知删除", false, true),
|
||||
NOTIFY_CANCEL("NOTIFY:CANCEL", "通知取消", false, true),
|
||||
|
||||
USER_ROLE_CREATE("USER_ROLE:CREATE", "用户角色创建", true, true),
|
||||
USER_ROLE_READ("USER_ROLE:READ", "用户角色读取", true, true),
|
||||
USER_ROLE_DELETE("USER_ROLE:DELETE", "用户角色删除", true, true);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.imyeyu.api.config;
|
||||
|
||||
import com.e2ins.ms.notify.SmsNotifyService;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.MapperFeature;
|
||||
@@ -31,6 +32,12 @@ public class BeanConfig {
|
||||
.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public SmsNotifyService smsNotifyService() {
|
||||
// TODO
|
||||
return new SmsNotifyService(null, null);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Yaml yaml() {
|
||||
return new Yaml();
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
package com.imyeyu.api.modules.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/// 通知消息队列配置
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "notify.queue")
|
||||
public class NotifyQueueConfig {
|
||||
|
||||
private Mail mail = new Mail();
|
||||
|
||||
private Sms sms = new Sms();
|
||||
|
||||
private Wechat wechat = new Wechat();
|
||||
|
||||
private HTTP http = new HTTP();
|
||||
|
||||
/// 邮件队列配置
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class Mail extends Queue {
|
||||
|
||||
private String defaultFrom;
|
||||
}
|
||||
|
||||
/// 短信队列配置
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class Sms extends Queue {
|
||||
|
||||
private String appId;
|
||||
|
||||
private String sign;
|
||||
|
||||
private String secretId;
|
||||
|
||||
private String secretKey;
|
||||
|
||||
private Captcha captcha;
|
||||
|
||||
/// 短信验证码
|
||||
@Data
|
||||
public static class Captcha {
|
||||
|
||||
private String templateId;
|
||||
|
||||
private int ttlMinute;
|
||||
|
||||
private int argIndex;
|
||||
}
|
||||
}
|
||||
|
||||
/// 微信队列配置
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class Wechat extends Queue {
|
||||
}
|
||||
|
||||
/// HTTP 队列配置
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class HTTP extends Queue {
|
||||
}
|
||||
|
||||
/// 通用队列配置
|
||||
@Data
|
||||
public static class Queue {
|
||||
|
||||
/// true 为启用
|
||||
private boolean enable;
|
||||
|
||||
private String cron = "0/30 * * * * ?";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package com.imyeyu.api.modules.common.controller;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonView;
|
||||
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||
import com.imyeyu.api.bean.CorePermissionCode;
|
||||
import com.imyeyu.api.modules.common.entity.Feedback;
|
||||
import com.imyeyu.api.modules.common.service.FeedbackService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.spring.TimiSpring;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.annotation.CaptchaValid;
|
||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||
import com.imyeyu.spring.bean.CaptchaData;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/// 通用反馈接口
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-19
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/feedback")
|
||||
public class FeedbackController {
|
||||
|
||||
private final FeedbackService service;
|
||||
private final UserLoginService userLoginService;
|
||||
|
||||
/// 提交反馈。登录用户和匿名用户均需提交图形验证码,匿名用户按 IP 限流
|
||||
///
|
||||
/// @param captchaData 带图形验证码的反馈请求
|
||||
@AOPLog
|
||||
@JsonView(ResponseView.Public.class)
|
||||
@CaptchaValid
|
||||
@RequestRateLimit(value = 3, inSeconds = 60)
|
||||
@PostMapping("/create")
|
||||
public void create(@RequestBody @Valid CaptchaData<Feedback> captchaData) {
|
||||
Feedback feedback = captchaData.getData();
|
||||
feedback.setIp(TimiSpring.getRequestIP());
|
||||
if (userLoginService.isLogged()) {
|
||||
feedback.setUserId(userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
service.create(feedback);
|
||||
}
|
||||
|
||||
/// 查询反馈列表
|
||||
///
|
||||
/// @param page 分页参数
|
||||
/// @return 反馈分页
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
@RequestRateLimit
|
||||
@RequireCorePermission(CorePermissionCode.FEEDBACK_READ)
|
||||
@PostMapping("/list")
|
||||
public PageResult<Feedback> list(@RequestBody Page<Feedback> page) {
|
||||
return service.page(page);
|
||||
}
|
||||
|
||||
/// 查询反馈详情
|
||||
///
|
||||
/// @param id 反馈 ID
|
||||
/// @return 反馈详情
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
@RequestRateLimit
|
||||
@RequireCorePermission(CorePermissionCode.FEEDBACK_READ)
|
||||
@PostMapping("/detail")
|
||||
public Feedback detail(@RequestParam String id) {
|
||||
return service.get(id);
|
||||
}
|
||||
|
||||
/// 更新反馈
|
||||
///
|
||||
/// @param feedback 反馈
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireCorePermission(CorePermissionCode.FEEDBACK_UPDATE)
|
||||
@PostMapping("/update")
|
||||
public void update(@RequestBody Feedback feedback) {
|
||||
feedback.setRespondedBy(userLoginService.getRequireLoginUserId());
|
||||
service.update(feedback);
|
||||
}
|
||||
|
||||
/// 删除反馈
|
||||
///
|
||||
/// @param id 反馈 ID
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireCorePermission(CorePermissionCode.FEEDBACK_DELETE)
|
||||
@PostMapping("/delete")
|
||||
public void delete(@RequestParam String id) {
|
||||
service.delete(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
package com.imyeyu.api.modules.common.controller;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonView;
|
||||
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||
import com.imyeyu.api.bean.CorePermissionCode;
|
||||
import com.imyeyu.api.modules.common.entity.Notify;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.service.NotifyDetailService;
|
||||
import com.imyeyu.api.modules.common.service.NotifyService;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.modules.user.service.UserService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.spring.annotation.RequiredToken;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/// 通知接口
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/notify")
|
||||
public class NotifyController {
|
||||
|
||||
private final UserService userService;
|
||||
private final NotifyService service;
|
||||
private final UserLoginService userLoginService;
|
||||
private final NotifyDetailService detailService;
|
||||
|
||||
/// 创建通知,同时创建通知详情
|
||||
///
|
||||
/// @param notify 通知及通知详情
|
||||
/// @return 创建后的通知
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_CREATE)
|
||||
@RequiredToken
|
||||
@PostMapping("/create")
|
||||
public Notify create(@RequestBody Notify notify) {
|
||||
service.create(notify);
|
||||
return notify;
|
||||
}
|
||||
|
||||
/// 查询通知详情
|
||||
///
|
||||
/// @param id 通知 ID
|
||||
/// @return 通知及通知详情
|
||||
@JsonView(ResponseView.Public.class)
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@RequestMapping("/detail")
|
||||
public Notify detail(@RequestParam String id) {
|
||||
Notify notify = service.get(id);
|
||||
{
|
||||
List<NotifyDetail> detailList = detailService.listByNotifyId(id);
|
||||
Set<String> userIdSet = detailList.stream()
|
||||
.filter(item -> item.getMsgType() == NotifyDetail.MsgType.INTERNAL)
|
||||
.flatMap(item -> Stream.of(item.getSendFrom(), item.getSendTo()))
|
||||
.collect(Collectors.toSet());
|
||||
Map<String, User> userMap = userService.mapByIdList(userIdSet);
|
||||
for (NotifyDetail detail : detailList) {
|
||||
if (TimiJava.isNotEmpty(detail.getSendFrom())) {
|
||||
detail.setFromUser(userMap.get(detail.getSendFrom()));
|
||||
}
|
||||
if (TimiJava.isNotEmpty(detail.getSendTo())) {
|
||||
detail.setToUser(userMap.get(detail.getSendTo()));
|
||||
}
|
||||
}
|
||||
notify.setDetailList(detailList);
|
||||
}
|
||||
return notify;
|
||||
}
|
||||
|
||||
/// 删除通知及其通知详情
|
||||
///
|
||||
/// @param id 通知 ID
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_DELETE)
|
||||
@RequiredToken
|
||||
@PostMapping("/delete")
|
||||
public void delete(@RequestParam String id) {
|
||||
service.delete(id);
|
||||
}
|
||||
|
||||
/// 取消尚未成功发送的通知详情
|
||||
///
|
||||
/// @param id 通知 ID
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_CANCEL)
|
||||
@RequiredToken
|
||||
@PostMapping("/cancel")
|
||||
public void cancel(@RequestParam String id) {
|
||||
service.cancel(id);
|
||||
}
|
||||
|
||||
/// 查询当前用户的站内通知
|
||||
///
|
||||
/// @param page 分页参数
|
||||
/// @param unreadOnly true 为只查询未读通知
|
||||
/// @return 站内通知分页结果
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/internal")
|
||||
public PageResult<NotifyDetail> listInternal(
|
||||
@RequestBody(required = false) Page<NotifyDetail> page,
|
||||
@RequestParam(defaultValue = "false") boolean unreadOnly
|
||||
) {
|
||||
return detailService.pageInternalByUserId(page, userLoginService.getRequireLoginUserId(), unreadOnly);
|
||||
}
|
||||
|
||||
@JsonView(ResponseView.Public.class)
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/detail")
|
||||
public NotifyDetail internalDetail(@RequestParam String id) {
|
||||
NotifyDetail detail = detailService.getInternalByUserId(id, userLoginService.getRequireLoginUserId());
|
||||
if (TimiJava.isNotEmpty(detail.getSendFrom())) {
|
||||
detail.setFromUser(userService.get(detail.getSendFrom()));
|
||||
}
|
||||
if (TimiJava.isNotEmpty(detail.getSendTo())) {
|
||||
detail.setToUser(userService.get(detail.getSendTo()));
|
||||
}
|
||||
return detail;
|
||||
}
|
||||
|
||||
/// 删除当前用户的一条站内通知
|
||||
///
|
||||
/// @param id 通知详情 ID
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/delete")
|
||||
public void deleteInternal(@RequestParam String id) {
|
||||
detailService.deleteInternalByUserId(id, userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
|
||||
/// 查询当前用户未读通知数量
|
||||
///
|
||||
/// @return 未读通知数量
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/unread/count")
|
||||
public long countUnreadSite() {
|
||||
return detailService.countUnreadSiteByUserId(userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
|
||||
/// 标记当前用户的一条站内通知已读
|
||||
///
|
||||
/// @param id 通知详情 ID
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/read")
|
||||
public void markSiteRead(@RequestParam String id) {
|
||||
detailService.markSiteRead(userLoginService.getRequireLoginUserId(), id);
|
||||
}
|
||||
|
||||
/// 标记当前用户全部站内通知已读
|
||||
@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
|
||||
@RequiredToken
|
||||
@PostMapping("/internal/read/all")
|
||||
public void markAllSiteRead() {
|
||||
detailService.markAllSiteRead(userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,10 @@ public class Article extends UUIDEntity implements SettingSupport {
|
||||
public enum BizType {
|
||||
|
||||
/** 博客 */
|
||||
BLOG
|
||||
BLOG,
|
||||
|
||||
/// 反馈
|
||||
FEEDBACK
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -49,6 +52,19 @@ public class Article extends UUIDEntity implements SettingSupport {
|
||||
TIP_TAP
|
||||
}
|
||||
|
||||
/// 文章状态
|
||||
public enum Status {
|
||||
|
||||
/// 草稿
|
||||
DART,
|
||||
|
||||
/// 正常
|
||||
NORMAL,
|
||||
|
||||
/// 隐藏
|
||||
HIDDEN
|
||||
}
|
||||
|
||||
/** 业务类型 */
|
||||
protected BizType bizType;
|
||||
|
||||
@@ -58,8 +74,8 @@ public class Article extends UUIDEntity implements SettingSupport {
|
||||
/** 标题 */
|
||||
protected String title;
|
||||
|
||||
/** 摘要 */
|
||||
protected String digest;
|
||||
/** 描述 */
|
||||
protected String description;
|
||||
|
||||
/** 正文类型 */
|
||||
protected ContentType contentType;
|
||||
@@ -74,9 +90,15 @@ public class Article extends UUIDEntity implements SettingSupport {
|
||||
/** 喜欢数量 */
|
||||
protected Integer likes;
|
||||
|
||||
/** 文章状态 */
|
||||
protected Status status;
|
||||
|
||||
@Transient
|
||||
protected List<Setting> settingList;
|
||||
|
||||
@Transient
|
||||
protected List<Comment> commentList;
|
||||
|
||||
@Transient
|
||||
protected List<Attachment> attachmentList;
|
||||
}
|
||||
|
||||
@@ -30,6 +30,8 @@ public class Attachment extends UUIDEntity {
|
||||
/// @since 2026-07-17 20:52
|
||||
public enum BizType {
|
||||
|
||||
ARTICLE,
|
||||
|
||||
USER,
|
||||
|
||||
GAO_CUSTOMER,
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.imyeyu.spring.annotation.table.AutoUUID;
|
||||
import com.imyeyu.spring.annotation.table.Id;
|
||||
import com.imyeyu.spring.entity.Creatable;
|
||||
import com.imyeyu.spring.entity.Destroyable;
|
||||
import com.imyeyu.spring.entity.IDEntity;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/// 通知基础队列实体
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class BaseQueueEntity implements IDEntity<String>, Creatable, Destroyable {
|
||||
|
||||
/** 主键 */
|
||||
@Id
|
||||
@AutoUUID
|
||||
protected String id;
|
||||
|
||||
/** 所属通知详情 ID */
|
||||
protected String notifyDetailId;
|
||||
|
||||
/** 内容 */
|
||||
protected String data;
|
||||
|
||||
/** 参数 */
|
||||
protected String args;
|
||||
|
||||
/** 发送去向 */
|
||||
protected String sendTo;
|
||||
|
||||
/** 发送时间 */
|
||||
protected Long sendAt;
|
||||
|
||||
/** 剩余重试次数 */
|
||||
protected Integer retry;
|
||||
|
||||
/** 超时时间 */
|
||||
protected Long timeoutAt;
|
||||
|
||||
/** 创建时间 */
|
||||
protected Long createdAt;
|
||||
|
||||
/// 从通知详情创建队列实体
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
public BaseQueueEntity(NotifyDetail detail) {
|
||||
notifyDetailId = detail.getId();
|
||||
data = detail.getData();
|
||||
args = detail.getArgs();
|
||||
sendTo = detail.getSendTo();
|
||||
sendAt = detail.getSendAt();
|
||||
retry = detail.getRetry();
|
||||
timeoutAt = detail.getTimeoutAt();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonView;
|
||||
import com.imyeyu.api.bean.ModuleCode;
|
||||
import com.imyeyu.spring.annotation.table.Transient;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/// 通用反馈
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-19
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Feedback extends UUIDEntity {
|
||||
|
||||
/// 反馈处理状态
|
||||
public enum Status {
|
||||
|
||||
/// 待处理
|
||||
PENDING,
|
||||
|
||||
/// 已回复
|
||||
REPLIED,
|
||||
|
||||
/// 已关闭
|
||||
CLOSED
|
||||
}
|
||||
|
||||
/// 所属模块
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private ModuleCode module;
|
||||
|
||||
/// 提交用户 ID,匿名反馈为 null
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private String userId;
|
||||
|
||||
/// 反馈内容文章 ID
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String contentId;
|
||||
|
||||
/// 联系方式
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String contact;
|
||||
|
||||
/// 提交 IP
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private String ip;
|
||||
|
||||
/// 处理状态
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Status status;
|
||||
|
||||
/// 管理员回复文章 ID
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String responseId;
|
||||
|
||||
/// 回复用户 ID
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private String respondedBy;
|
||||
|
||||
/// 回复时间
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Long respondedAt;
|
||||
|
||||
/// 管理员回复文章
|
||||
@Transient
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Article content;
|
||||
|
||||
/// 管理员回复文章
|
||||
@Transient
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Article response;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.imyeyu.spring.annotation.table.Table;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/// HTTP 回调队列
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table("http_queue")
|
||||
public class HTTPQueue extends BaseQueueEntity {
|
||||
|
||||
/** HTTP 请求方法 */
|
||||
protected String method;
|
||||
|
||||
/// 从通知详情创建 HTTP 队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
public HTTPQueue(NotifyDetail detail) {
|
||||
super(detail);
|
||||
method = "POST";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/// 邮件发送队列
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MailQueue extends BaseQueueEntity {
|
||||
|
||||
/** 邮件标题 */
|
||||
protected String subject;
|
||||
|
||||
/** 邮件附件 */
|
||||
protected String attachments;
|
||||
|
||||
/** 发送来源 */
|
||||
protected String sendFrom;
|
||||
|
||||
/// 从通知详情创建邮件队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
public MailQueue(NotifyDetail detail) {
|
||||
super(detail);
|
||||
subject = detail.getSubject();
|
||||
sendFrom = detail.getSendFrom();
|
||||
}
|
||||
|
||||
/// 邮件附件
|
||||
@Data
|
||||
public static class Attachment {
|
||||
|
||||
/** 附件类型 */
|
||||
private Type type;
|
||||
|
||||
/** 附件值 */
|
||||
private String value;
|
||||
|
||||
/// 附件来源类型
|
||||
public enum Type {
|
||||
|
||||
/** 系统附件 */
|
||||
E2INS_ATTACH,
|
||||
|
||||
/** URL 附件 */
|
||||
URL
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.imyeyu.java.bean.Language;
|
||||
import com.imyeyu.spring.annotation.table.Column;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -15,6 +17,18 @@ public class Multilingual extends UUIDEntity {
|
||||
|
||||
protected String zhCN;
|
||||
|
||||
@Column("zh_cn_pinyin_full")
|
||||
@JsonIgnore
|
||||
protected String zhCNPinyinFull;
|
||||
|
||||
@Column("zh_cn_pinyin_initial")
|
||||
@JsonIgnore
|
||||
protected String zhCNPinyinInitial;
|
||||
|
||||
@Column("zh_cn_pinyin_mixed")
|
||||
@JsonIgnore
|
||||
protected String zhCNPinyinMixed;
|
||||
|
||||
protected String zhTW;
|
||||
|
||||
protected String enUS;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.imyeyu.spring.annotation.table.AutoUUID;
|
||||
import com.imyeyu.spring.annotation.table.Id;
|
||||
import com.imyeyu.spring.annotation.table.Transient;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import lombok.Data;
|
||||
@@ -19,11 +17,6 @@ import java.util.List;
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Notify extends UUIDEntity {
|
||||
|
||||
/** 主键 */
|
||||
@Id
|
||||
@AutoUUID
|
||||
private String id;
|
||||
|
||||
/** 业务类型 */
|
||||
private String bizType;
|
||||
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonView;
|
||||
import com.imyeyu.api.TimiServerAPI;
|
||||
import com.imyeyu.api.modules.common.service.BaseQueueService;
|
||||
import com.imyeyu.api.modules.common.service.HTTPQueueService;
|
||||
import com.imyeyu.api.modules.common.service.MailQueueService;
|
||||
import com.imyeyu.api.modules.common.service.SmsQueueService;
|
||||
import com.imyeyu.api.modules.common.service.WechatQueueService;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.spring.annotation.table.Transient;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -25,13 +34,32 @@ public class NotifyDetail extends UUIDEntity {
|
||||
@AllArgsConstructor
|
||||
public enum MsgType {
|
||||
|
||||
SMS,
|
||||
/** 站内通知,不进入外部消息队列 */
|
||||
INTERNAL(null),
|
||||
|
||||
MAIL,
|
||||
SMS(SmsQueueService.class),
|
||||
|
||||
HTTP,
|
||||
MAIL(MailQueueService.class),
|
||||
|
||||
WECHAT;
|
||||
HTTP(HTTPQueueService.class),
|
||||
|
||||
WECHAT(WechatQueueService.class);
|
||||
|
||||
private final Class<? extends BaseQueueService<?>> queueServiceClass;
|
||||
|
||||
/// 获取消息队列服务
|
||||
///
|
||||
/// @return 消息队列服务
|
||||
public BaseQueueService<?> getService() {
|
||||
return TimiServerAPI.applicationContext.getBean(queueServiceClass);
|
||||
}
|
||||
|
||||
/// 判断是否需要外部消息队列
|
||||
///
|
||||
/// @return true 为需要外部消息队列
|
||||
public boolean isQueue() {
|
||||
return queueServiceClass != null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,44 +82,67 @@ public class NotifyDetail extends UUIDEntity {
|
||||
}
|
||||
|
||||
/** 所属通知 ID */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String notifyId;
|
||||
|
||||
/** 消息类型 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private MsgType msgType;
|
||||
|
||||
/** 模板 ID */
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private String templateId;
|
||||
|
||||
/** 标题 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String subject;
|
||||
|
||||
/** 内容 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String data;
|
||||
|
||||
/** 参数 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String args;
|
||||
|
||||
/** 发送来源 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String sendFrom;
|
||||
|
||||
/** 发送去向 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private String sendTo;
|
||||
|
||||
/** 发送时间 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Long sendAt;
|
||||
|
||||
/** 重试计数 */
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private Integer retry;
|
||||
|
||||
/** 超时时间 */
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private Long timeoutAt;
|
||||
|
||||
/** 结果描述 */
|
||||
@JsonView(ResponseView.Admin.class)
|
||||
private String resultDesc;
|
||||
|
||||
/** 状态 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Status status;
|
||||
|
||||
/** 已读时间,站内通知未读时为空 */
|
||||
@JsonView(ResponseView.Public.class)
|
||||
private Long readAt;
|
||||
|
||||
@Transient
|
||||
protected Notify notify;
|
||||
|
||||
@Transient
|
||||
protected User fromUser;
|
||||
|
||||
@Transient
|
||||
protected User toUser;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/// 短信发送队列
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SmsQueue extends BaseQueueEntity {
|
||||
|
||||
/** 短信模板 ID */
|
||||
protected String templateId;
|
||||
|
||||
/// 从通知详情创建短信队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
public SmsQueue(NotifyDetail detail) {
|
||||
super(detail);
|
||||
templateId = detail.getTemplateId();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.imyeyu.api.modules.common.entity;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/// 微信消息发送队列
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WechatQueue extends BaseQueueEntity {
|
||||
|
||||
/// 从通知详情创建微信队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
public WechatQueue(NotifyDetail detail) {
|
||||
super(detail);
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,7 @@ public interface AttachmentMapper extends BaseMapper<Attachment, String>, RawMap
|
||||
|
||||
List<Attachment> selectByBizId(Attachment.BizType bizType, String bizId, List<String> attachTypes, Page<Attachment> page);
|
||||
|
||||
List<Attachment> selectByBizIdList(Attachment.BizType bizType, Collection<String> bizIdList, List<String> attachTypes);
|
||||
List<Attachment> selectAllByBizIdList(Attachment.BizType bizType, Collection<String> bizIdList, List<String> attachTypes);
|
||||
|
||||
long countByBizId(Attachment.BizType bizType, String bizId, List<String> attachTypes);
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
|
||||
import com.imyeyu.api.modules.common.util.QueueSQLProvider;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.DeleteProvider;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.SelectProvider;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// 通知队列基础 Mapper
|
||||
///
|
||||
/// @param <T> 队列实体类型
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface BaseQueueMapper<T extends BaseQueueEntity> extends BaseMapper<T, String> {
|
||||
|
||||
/** 查询已到发送时间的队列 */
|
||||
@SelectProvider(type = QueueSQLProvider.class, method = "listReadyQueue")
|
||||
List<T> listReadyQueue();
|
||||
|
||||
/** 根据通知详情 ID 物理删除队列 */
|
||||
@DeleteProvider(type = QueueSQLProvider.class, method = "destroyByNotifyDetailId")
|
||||
void destroyByNotifyDetailId(@Param("notifyDetailId") String notifyDetailId);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Feedback;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
|
||||
/// 通用反馈 Mapper
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-19
|
||||
public interface FeedbackMapper extends BaseMapper<Feedback, String> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.HTTPQueue;
|
||||
|
||||
/// HTTP 队列 Mapper
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface HTTPQueueMapper extends BaseQueueMapper<HTTPQueue> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.MailQueue;
|
||||
|
||||
/// 邮件队列 Mapper
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface MailQueueMapper extends BaseQueueMapper<MailQueue> {
|
||||
}
|
||||
@@ -2,6 +2,11 @@ package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知详情 Mapper
|
||||
@@ -10,4 +15,36 @@ import com.imyeyu.spring.mapper.BaseMapper;
|
||||
* @since 2026-05-13 14:46
|
||||
*/
|
||||
public interface NotifyDetailMapper extends BaseMapper<NotifyDetail, String> {
|
||||
|
||||
/** 查询用户的站内通知 */
|
||||
@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
|
||||
List<NotifyDetail> selectSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
|
||||
|
||||
/** 查询用户的未读站内通知 */
|
||||
@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
|
||||
List<NotifyDetail> selectUnreadSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
|
||||
|
||||
/** 统计用户的站内通知数量 */
|
||||
@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
|
||||
long countSiteByUserId(@Param("userId") String userId);
|
||||
|
||||
/** 统计用户的未读站内通知数量 */
|
||||
@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
|
||||
long countUnreadSiteByUserId(@Param("userId") String userId);
|
||||
|
||||
/** 查询用户拥有的站内通知 */
|
||||
@Select("SELECT * FROM `notify_detail` WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " LIMIT 1")
|
||||
NotifyDetail selectSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
|
||||
|
||||
/** 删除用户的站内通知 */
|
||||
@Update("UPDATE `notify_detail` SET `deleted_at` = " + UNIX_TIME + ", `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
|
||||
int deleteSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
|
||||
|
||||
/** 标记站内通知已读 */
|
||||
@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
|
||||
int markSiteRead(@Param("detailId") String detailId, @Param("userId") String userId, @Param("readAt") long readAt);
|
||||
|
||||
/** 标记用户全部站内通知已读 */
|
||||
@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
|
||||
int markAllSiteRead(@Param("userId") String userId, @Param("readAt") long readAt);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.SmsQueue;
|
||||
|
||||
/// 短信队列 Mapper
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface SmsQueueMapper extends BaseQueueMapper<SmsQueue> {
|
||||
}
|
||||
@@ -15,5 +15,23 @@ public interface TagMapper extends BaseMapper<Tag, String> {
|
||||
|
||||
List<Tag> selectByIdList(Collection<String> idList);
|
||||
|
||||
/// 按归属和名称关键词查询标签总数
|
||||
///
|
||||
/// @param ownerType 归属类型
|
||||
/// @param ownerId 归属 ID
|
||||
/// @param keyword 名称关键词
|
||||
/// @return 标签总数
|
||||
long countByOwnerAndKeyword(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("keyword") String keyword);
|
||||
|
||||
/// 按归属和名称关键词分页查询标签
|
||||
///
|
||||
/// @param ownerType 归属类型
|
||||
/// @param ownerId 归属 ID
|
||||
/// @param keyword 名称关键词
|
||||
/// @param offset 分页偏移量
|
||||
/// @param limit 分页数量
|
||||
/// @return 标签列表
|
||||
List<Tag> selectByOwnerAndKeyword(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("keyword") String keyword, @Param("offset") long offset, @Param("limit") long limit);
|
||||
|
||||
Tag selectByOwnerAndZhCN(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("zhCN") String zhCN);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.WechatQueue;
|
||||
|
||||
/// 微信队列 Mapper
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface WechatQueueMapper extends BaseQueueMapper<WechatQueue> {
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
|
||||
/// 通知队列基础服务
|
||||
///
|
||||
/// @param <T> 队列实体类型
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface BaseQueueService<T extends BaseQueueEntity> {
|
||||
|
||||
/// 创建队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
void createQueue(NotifyDetail detail);
|
||||
|
||||
/// 删除队列
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
void destroyQueue(NotifyDetail detail);
|
||||
|
||||
/// 执行已到期队列
|
||||
void invokeQueue();
|
||||
|
||||
/// 发送队列消息
|
||||
///
|
||||
/// @param queue 队列
|
||||
void send(T queue);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Feedback;
|
||||
import com.imyeyu.spring.service.BaseService;
|
||||
|
||||
/// 通用反馈服务
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-19
|
||||
public interface FeedbackService extends BaseService<Feedback, String> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.HTTPQueue;
|
||||
|
||||
/// HTTP 队列服务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface HTTPQueueService extends BaseQueueService<HTTPQueue> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.MailQueue;
|
||||
|
||||
/// 邮件队列服务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface MailQueueService extends BaseQueueService<MailQueue> {
|
||||
}
|
||||
@@ -1,8 +1,12 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.service.BaseService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知详情服务
|
||||
*
|
||||
@@ -10,4 +14,53 @@ import com.imyeyu.spring.service.BaseService;
|
||||
* @since 2026-05-13 14:46
|
||||
*/
|
||||
public interface NotifyDetailService extends BaseService<NotifyDetail, String> {
|
||||
|
||||
/// 查询通知下的全部详情
|
||||
///
|
||||
/// @param notifyId 通知 ID
|
||||
/// @return 通知详情列表
|
||||
List<NotifyDetail> listByNotifyId(String notifyId);
|
||||
|
||||
/// 重新将通知详情放入消息队列
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
void requeue(String detailId);
|
||||
|
||||
/// 分页查询用户的站内通知
|
||||
///
|
||||
/// @param page 分页参数
|
||||
/// @param userId 用户 ID
|
||||
/// @param unreadOnly true 为只查询未读通知
|
||||
/// @return 站内通知分页结果
|
||||
PageResult<NotifyDetail> pageInternalByUserId(Page<NotifyDetail> page, String userId, boolean unreadOnly);
|
||||
|
||||
/// 查询当前用户拥有的站内通知详情
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
/// @param userId 用户 ID
|
||||
/// @return 通知详情
|
||||
NotifyDetail getInternalByUserId(String detailId, String userId);
|
||||
|
||||
/// 删除当前用户拥有的站内通知详情
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
/// @param userId 用户 ID
|
||||
void deleteInternalByUserId(String detailId, String userId);
|
||||
|
||||
/// 查询用户未读站内通知数量
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
/// @return 未读数量
|
||||
long countUnreadSiteByUserId(String userId);
|
||||
|
||||
/// 标记站内通知已读
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
/// @param detailId 通知详情 ID
|
||||
void markSiteRead(String userId, String detailId);
|
||||
|
||||
/// 标记用户全部站内通知已读
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
void markAllSiteRead(String userId);
|
||||
}
|
||||
|
||||
@@ -10,4 +10,9 @@ import com.imyeyu.spring.service.BaseService;
|
||||
* @since 2026-05-13 14:46
|
||||
*/
|
||||
public interface NotifyService extends BaseService<Notify, String> {
|
||||
|
||||
/// 取消通知中尚未成功发送的通知详情
|
||||
///
|
||||
/// @param notifyId 通知 ID
|
||||
void cancel(String notifyId);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.SmsQueue;
|
||||
|
||||
/// 短信队列服务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface SmsQueueService extends BaseQueueService<SmsQueue> {
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
//package com.imyeyu.api.modules.common.service;
|
||||
//
|
||||
//import com.e2ins.ms.notify.entity.Notify;
|
||||
//import com.e2ins.ms.notify.entity.NotifyDetail;
|
||||
//
|
||||
///**
|
||||
// *
|
||||
// *
|
||||
// * @author 夜雨
|
||||
// * @since 2026-05-14 12:12
|
||||
// */
|
||||
//public interface SmsService {
|
||||
//
|
||||
// /**
|
||||
// * 创建短信验证码通知
|
||||
// *
|
||||
// * @param detail 通知
|
||||
// * @return 通知详情 ID
|
||||
// */
|
||||
// String captchaCreate(Notify detail);
|
||||
//
|
||||
// /**
|
||||
// * 校验短信验证码
|
||||
// *
|
||||
// * @param detailId 通知详情 ID
|
||||
// * @param captcha 请求验证码
|
||||
// * @return 通知详情
|
||||
// */
|
||||
// NotifyDetail captchaVerify(String detailId, String captcha);
|
||||
//}
|
||||
@@ -2,6 +2,8 @@ package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Tag;
|
||||
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.service.BaseService;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -15,6 +17,15 @@ public interface TagService extends BaseService<Tag, String> {
|
||||
|
||||
List<Tag> listByIdList(Collection<String> idList);
|
||||
|
||||
/// 按归属和名称关键词分页查询标签
|
||||
///
|
||||
/// @param page 分页参数
|
||||
/// @param ownerType 归属类型
|
||||
/// @param ownerId 归属 ID
|
||||
/// @param keyword 名称关键词
|
||||
/// @return 标签分页
|
||||
PageResult<Tag> pageByOwnerAndKeyword(Page<Tag> page, Tag.OwnerType ownerType, String ownerId, String keyword);
|
||||
|
||||
/// 按业务查询标签列表
|
||||
///
|
||||
/// @param bizType 业务类型
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.imyeyu.api.modules.common.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.WechatQueue;
|
||||
|
||||
/// 微信队列服务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public interface WechatQueueService extends BaseQueueService<WechatQueue> {
|
||||
}
|
||||
+126
@@ -0,0 +1,126 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
|
||||
import com.imyeyu.api.modules.common.service.BaseQueueService;
|
||||
import com.imyeyu.api.modules.common.service.NotifyDetailService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.utils.Time;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
/// 通知队列抽象服务
|
||||
///
|
||||
/// @param <T> 队列实体类型
|
||||
/// @param <C> 队列配置类型
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
public abstract class AbstractQueueService<T extends BaseQueueEntity, C extends NotifyQueueConfig.Queue> implements BaseQueueService<T> {
|
||||
|
||||
private NotifyDetailService notifyDetailService;
|
||||
|
||||
/// 注入通知详情服务
|
||||
@Autowired
|
||||
private void setNotifyDetailService(NotifyDetailService notifyDetailService) {
|
||||
this.notifyDetailService = notifyDetailService;
|
||||
}
|
||||
|
||||
/// 获取队列 Mapper
|
||||
///
|
||||
/// @return 队列 Mapper
|
||||
protected abstract BaseQueueMapper<T> mapper();
|
||||
|
||||
/// 获取队列配置
|
||||
///
|
||||
/// @return 队列配置
|
||||
protected abstract C config();
|
||||
|
||||
/// 校验发送目标
|
||||
///
|
||||
/// @param sendTo 发送目标
|
||||
protected abstract void validateSendTo(String sendTo);
|
||||
|
||||
@Override
|
||||
public void destroyQueue(NotifyDetail detail) {
|
||||
TimiException.required(detail, "未找到通知详情");
|
||||
TimiException.required(detail.getId(), "未找到通知详情 ID");
|
||||
mapper().destroyByNotifyDetailId(detail.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invokeQueue() {
|
||||
for (T queue : mapper().listReadyQueue()) {
|
||||
send(queue);
|
||||
}
|
||||
}
|
||||
|
||||
/// 处理单个队列消息
|
||||
///
|
||||
/// @param queue 队列
|
||||
@Override
|
||||
public final void send(T queue) {
|
||||
TimiException.required(queue, "未找到通知队列");
|
||||
NotifyDetail detail = notifyDetailService.get(queue.getNotifyDetailId());
|
||||
if (detail == null) {
|
||||
mapper().destroy(queue.getId());
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
long now = Time.now();
|
||||
queue.setSendAt(now);
|
||||
if (queue.getTimeoutAt() < now) {
|
||||
throw new TimiException(TimiCode.RESULT_TIMEOUT, "通知队列已超时");
|
||||
}
|
||||
validateSendTo(queue.getSendTo());
|
||||
if (!config().isEnable()) {
|
||||
throw new TimiException(TimiCode.IGNORE, "通知队列未启用");
|
||||
}
|
||||
doSend(queue);
|
||||
detail.setStatus(NotifyDetail.Status.REMINDED);
|
||||
} catch (TimiException e) {
|
||||
if (e.getCode() == TimiCode.IGNORE) {
|
||||
detail.setStatus(NotifyDetail.Status.CANCEL);
|
||||
detail.setResultDesc(e.getMessage());
|
||||
} else if (e.getCode() == TimiCode.RESULT_TIMEOUT) {
|
||||
detail.setStatus(NotifyDetail.Status.TIMEOUT);
|
||||
detail.setResultDesc(e.getMessage());
|
||||
} else {
|
||||
log.error("处理通知队列失败", e);
|
||||
detail.setStatus(NotifyDetail.Status.FAIL);
|
||||
detail.setResultDesc(TimiJava.serializeThrowable(e));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("处理通知队列失败", e);
|
||||
detail.setStatus(NotifyDetail.Status.FAIL);
|
||||
detail.setResultDesc(TimiJava.serializeThrowable(e));
|
||||
} finally {
|
||||
try {
|
||||
notifyDetailService.update(detail);
|
||||
if (detail.getStatus() == NotifyDetail.Status.REMINDED
|
||||
|| detail.getStatus() == NotifyDetail.Status.CANCEL
|
||||
|| queue.getRetry() < 0
|
||||
) {
|
||||
mapper().destroy(queue.getId());
|
||||
} else {
|
||||
queue.setRetry(queue.getRetry() - 1);
|
||||
mapper().update(queue);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("通知队列收尾处理失败", e);
|
||||
mapper().destroy(queue.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 执行实际发送动作
|
||||
///
|
||||
/// @param queue 队列
|
||||
/// @throws Exception 发送异常
|
||||
protected abstract void doSend(T queue) throws Exception;
|
||||
}
|
||||
+54
@@ -1,8 +1,15 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Article;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.mapper.ArticleMapper;
|
||||
import com.imyeyu.api.modules.common.service.ArticleService;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -20,10 +27,57 @@ import org.springframework.stereotype.Service;
|
||||
@RequiredArgsConstructor
|
||||
public class ArticleServiceImplement extends AbstractEntityService<Article, String> implements ArticleService {
|
||||
|
||||
private final LoggerService loggerService;
|
||||
private final AttachmentService attachmentService;
|
||||
|
||||
private final ArticleMapper mapper;
|
||||
|
||||
@Override
|
||||
protected BaseMapper<Article, String> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(Article article) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_ARTICLE_CREATE");
|
||||
try {
|
||||
super.create(article);
|
||||
attachmentService.updateByBizId(Attachment.BizType.ARTICLE, article.getId(), article.getAttachmentList());
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(article.getId());
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("create article error", e);
|
||||
throw new TimiException(TimiCode.ERROR, "create article error", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(Article article) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_ARTICLE_UPDATE");
|
||||
try {
|
||||
super.update(article);
|
||||
attachmentService.updateByBizId(Attachment.BizType.ARTICLE, article.getId(), article.getAttachmentList());
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(article.getId());
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("update article error", e);
|
||||
throw new TimiException(TimiCode.ERROR, "update article error", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -319,12 +319,12 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
|
||||
|
||||
@Override
|
||||
public List<Attachment> listByBizId(Attachment.BizType bizType, String bizId, String... attachTypes) {
|
||||
return mapper.selectByBizId(bizType, bizId, List.of(attachTypes), null);
|
||||
return mapper.selectAllByBizIdList(bizType, List.of(bizId), List.of(attachTypes));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, List<Attachment>> mapByBizIdList(Attachment.BizType bizType, Collection<String> bizIdList, String... attachTypes) {
|
||||
return mapper.selectByBizIdList(bizType, bizIdList, List.of(attachTypes)).stream().collect(Collectors.groupingBy(Attachment::getBizId));
|
||||
return mapper.selectAllByBizIdList(bizType, bizIdList, List.of(attachTypes)).stream().collect(Collectors.groupingBy(Attachment::getBizId));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+141
@@ -0,0 +1,141 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.entity.Feedback;
|
||||
import com.imyeyu.api.modules.common.mapper.FeedbackMapper;
|
||||
import com.imyeyu.api.modules.common.service.ArticleService;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.common.service.FeedbackService;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import com.imyeyu.utils.Time;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/// 通用反馈服务实现
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-19
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class FeedbackServiceImplement extends AbstractEntityService<Feedback, String> implements FeedbackService {
|
||||
|
||||
private static final long ANONYMOUS_ATTACHMENT_MAX_SIZE = 500L * 1024;
|
||||
|
||||
private final LoggerService loggerService;
|
||||
private final ArticleService articleService;
|
||||
private final UserLoginService userLoginService;
|
||||
private final AttachmentService attachmentService;
|
||||
|
||||
private final FeedbackMapper mapper;
|
||||
|
||||
@Override
|
||||
protected BaseMapper<Feedback, String> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(Feedback feedback) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_FEEDBACK_CREATE");
|
||||
try {
|
||||
TimiException.required(feedback, "未找到反馈");
|
||||
articleService.create(feedback.getContent());
|
||||
feedback.setContentId(feedback.getContent().getId());
|
||||
feedback.setStatus(TimiJava.defaultIfNull(feedback.getStatus(), Feedback.Status.PENDING));
|
||||
super.create(feedback);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(feedback.getId());
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("create feedback error", e);
|
||||
throw new TimiException(TimiCode.ERROR, "create feedback error", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void update(Feedback feedback) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_FEEDBACK_UPDATE");
|
||||
try {
|
||||
TimiException.required(feedback, "未找到反馈");
|
||||
TimiException.required(feedback.getId(), "未找到反馈 ID");
|
||||
Feedback dbFeedback = get(feedback.getId());
|
||||
TimiException.required(dbFeedback, "未找到反馈");
|
||||
|
||||
feedback.getContent().setId(dbFeedback.getContentId());
|
||||
articleService.update(feedback.getContent());
|
||||
|
||||
dbFeedback.setModule(TimiJava.defaultIfNull(feedback.getModule(), dbFeedback.getModule()));
|
||||
if (TimiJava.isNotEmpty(feedback.getResponse())) {
|
||||
if (TimiJava.isEmpty(feedback.getResponseId())) {
|
||||
articleService.create(feedback.getResponse());
|
||||
dbFeedback.setResponseId(feedback.getResponse().getId());
|
||||
dbFeedback.setRespondedAt(Time.now());
|
||||
} else {
|
||||
feedback.getResponse().setId(dbFeedback.getResponseId());
|
||||
articleService.update(feedback.getResponse());
|
||||
}
|
||||
dbFeedback.setStatus(Feedback.Status.REPLIED);
|
||||
dbFeedback.setRespondedBy(userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
super.update(dbFeedback);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(feedback.getId());
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("修改反馈失败", e);
|
||||
throw new TimiException(TimiCode.ERROR, "修改反馈失败", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void delete(String id) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_FEEDBACK_DELETE");
|
||||
try {
|
||||
Feedback feedback = get(id);
|
||||
articleService.delete(feedback.getContentId());
|
||||
if (TimiJava.isNotEmpty(feedback.getResponseId())) {
|
||||
articleService.delete(feedback.getResponseId());
|
||||
}
|
||||
super.delete(id);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(id);
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("delete feedback error", e);
|
||||
throw new TimiException(TimiCode.ERROR, "delete feedback error", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
}
|
||||
+59
@@ -0,0 +1,59 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.entity.HTTPQueue;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
|
||||
import com.imyeyu.api.modules.common.mapper.HTTPQueueMapper;
|
||||
import com.imyeyu.api.modules.common.service.HTTPQueueService;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
/// HTTP 队列服务实现
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class HTTPQueueServiceImplement extends AbstractQueueService<HTTPQueue, NotifyQueueConfig.HTTP> implements HTTPQueueService {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
|
||||
private final HTTPQueueMapper mapper;
|
||||
|
||||
@Override
|
||||
protected NotifyQueueConfig.HTTP config() {
|
||||
return config.getHttp();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BaseQueueMapper<HTTPQueue> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateSendTo(String sendTo) {
|
||||
try {
|
||||
URI uri = URI.create(sendTo);
|
||||
TimiException.requiredTrue(uri.isAbsolute(), "发送目标不是有效 URI");
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new TimiException(TimiCode.ARG_BAD, "发送目标不是有效 URI", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createQueue(NotifyDetail detail) {
|
||||
mapper.insert(new HTTPQueue(detail));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doSend(HTTPQueue queue) {
|
||||
throw new TimiException(TimiCode.ERROR_NOT_SUPPORT, "HTTP 推送暂未实现");
|
||||
}
|
||||
}
|
||||
+67
@@ -0,0 +1,67 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.entity.MailQueue;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
|
||||
import com.imyeyu.api.modules.common.mapper.MailQueueMapper;
|
||||
import com.imyeyu.api.modules.common.service.MailQueueService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.utils.Regex;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.mail.SimpleMailMessage;
|
||||
import org.springframework.mail.javamail.JavaMailSender;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/// 邮件队列服务实现
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MailQueueServiceImplement extends AbstractQueueService<MailQueue, NotifyQueueConfig.Mail> implements MailQueueService {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
private final JavaMailSender mailSender;
|
||||
|
||||
private final MailQueueMapper mapper;
|
||||
|
||||
@Override
|
||||
protected NotifyQueueConfig.Mail config() {
|
||||
return config.getMail();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BaseQueueMapper<MailQueue> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateSendTo(String sendTo) {
|
||||
TimiException.requiredTrue(Regex.isMatch(Regex.EMAIL, sendTo), "发送目标不是有效邮箱");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createQueue(NotifyDetail detail) {
|
||||
MailQueue queue = new MailQueue(detail);
|
||||
queue.setSendFrom(TimiJava.defaultIfEmpty(queue.getSendFrom(), config.getMail().getDefaultFrom()));
|
||||
mapper.insert(queue);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doSend(MailQueue queue) {
|
||||
TimiException.required(queue.getSendFrom(), "邮件发送来源不能为空");
|
||||
TimiException.required(queue.getSubject(), "邮件标题不能为空");
|
||||
|
||||
SimpleMailMessage message = new SimpleMailMessage();
|
||||
message.setFrom(queue.getSendFrom());
|
||||
message.setTo(queue.getSendTo());
|
||||
message.setSubject(queue.getSubject());
|
||||
message.setText(queue.getData());
|
||||
mailSender.send(message);
|
||||
log.info("邮件发送成功,目标:{}", queue.getSendTo());
|
||||
}
|
||||
}
|
||||
+23
@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.common.service.implement;
|
||||
import com.imyeyu.api.modules.common.entity.Multilingual;
|
||||
import com.imyeyu.api.modules.common.mapper.MultilingualMapper;
|
||||
import com.imyeyu.api.modules.common.service.MultilingualService;
|
||||
import com.imyeyu.api.util.PinyinUtil;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import com.imyeyu.spring.util.Redis;
|
||||
@@ -34,6 +35,18 @@ public class MultilingualServiceImplement extends AbstractEntityService<Multilin
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(Multilingual multilingual) {
|
||||
fillPinyin(multilingual);
|
||||
super.create(multilingual);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(Multilingual multilingual) {
|
||||
fillPinyin(multilingual);
|
||||
super.update(multilingual);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multilingual get(String id) {
|
||||
Multilingual result = redisLanguage.get(getKey(id));
|
||||
@@ -81,4 +94,14 @@ public class MultilingualServiceImplement extends AbstractEntityService<Multilin
|
||||
private String getKey(String id) {
|
||||
return "%s%s".formatted(KEY_PREFIX, id);
|
||||
}
|
||||
|
||||
private void fillPinyin(Multilingual multilingual) {
|
||||
if (multilingual == null) {
|
||||
return;
|
||||
}
|
||||
String zhCN = multilingual.getZhCN();
|
||||
multilingual.setZhCNPinyinFull(PinyinUtil.full(zhCN));
|
||||
multilingual.setZhCNPinyinInitial(PinyinUtil.initial(zhCN));
|
||||
multilingual.setZhCNPinyinMixed(PinyinUtil.mixed(zhCN));
|
||||
}
|
||||
}
|
||||
|
||||
+176
@@ -1,12 +1,24 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.entity.Notify;
|
||||
import com.imyeyu.api.modules.common.mapper.NotifyDetailMapper;
|
||||
import com.imyeyu.api.modules.common.mapper.NotifyMapper;
|
||||
import com.imyeyu.api.modules.common.service.NotifyDetailService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import com.imyeyu.utils.Time;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知详情服务实现
|
||||
@@ -18,10 +30,174 @@ import org.springframework.stereotype.Service;
|
||||
@RequiredArgsConstructor
|
||||
public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDetail, String> implements NotifyDetailService {
|
||||
|
||||
private final NotifyMapper notifyMapper;
|
||||
|
||||
private final NotifyDetailMapper mapper;
|
||||
|
||||
@Override
|
||||
protected BaseMapper<NotifyDetail, String> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
/// 创建通知详情,同时初始化投递状态和时间参数
|
||||
///
|
||||
/// @param detail 通知详情
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(NotifyDetail detail) {
|
||||
TimiException.required(detail, "未找到通知详情");
|
||||
TimiException.required(detail.getNotifyId(), "未找到通知 ID");
|
||||
TimiException.required(detail.getMsgType(), "未找到消息类型");
|
||||
Notify notify = notifyMapper.select(detail.getNotifyId());
|
||||
TimiException.required(notify, "未找到通知");
|
||||
if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
|
||||
TimiException.required(detail.getSendTo(), "未找到站内通知接收用户 ID");
|
||||
}
|
||||
|
||||
detail.setRetry(TimiJava.defaultIfNull(detail.getRetry(), 1));
|
||||
detail.setSendAt(TimiJava.defaultIfNull(detail.getSendAt(), Time.now()));
|
||||
detail.setTimeoutAt(TimiJava.defaultIfNull(detail.getTimeoutAt(), detail.getSendAt() + Time.D));
|
||||
detail.setStatus(detail.getMsgType() == NotifyDetail.MsgType.INTERNAL
|
||||
? NotifyDetail.Status.REMINDED
|
||||
: NotifyDetail.Status.WAITING);
|
||||
detail.setReadAt(null);
|
||||
super.create(detail);
|
||||
|
||||
if (detail.getMsgType().isQueue()) {
|
||||
// 加入外部消息队列
|
||||
detail.getMsgType().getService().createQueue(detail);
|
||||
}
|
||||
}
|
||||
|
||||
/// 查询通知下的全部详情
|
||||
///
|
||||
/// @param notifyId 通知 ID
|
||||
/// @return 通知详情列表
|
||||
@Override
|
||||
public List<NotifyDetail> listByNotifyId(String notifyId) {
|
||||
NotifyDetail example = new NotifyDetail();
|
||||
example.setNotifyId(notifyId);
|
||||
return mapper.selectAllByExample(example);
|
||||
}
|
||||
|
||||
/// 删除通知详情
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void delete(String detailId) {
|
||||
TimiException.required(detailId, "未找到通知详情 ID");
|
||||
NotifyDetail detail = get(detailId);
|
||||
TimiException.required(detail, "未找到通知详情");
|
||||
if (detail.getMsgType().isQueue()) {
|
||||
detail.getMsgType().getService().destroyQueue(detail);
|
||||
}
|
||||
super.delete(detailId);
|
||||
}
|
||||
|
||||
/// 重新将通知详情放入消息队列
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void requeue(String detailId) {
|
||||
NotifyDetail detail = get(detailId);
|
||||
TimiException.required(detail, "未找到通知详情");
|
||||
TimiException.required(detail.getMsgType(), "未找到消息类型");
|
||||
TimiException.requiredTrue(detail.getMsgType().isQueue(), "站内通知不支持重新入队");
|
||||
if (detail.getStatus() == NotifyDetail.Status.WAITING) {
|
||||
throw new TimiException(TimiCode.RESULT_BAD, "通知详情已经在等待队列中");
|
||||
}
|
||||
|
||||
detail.getMsgType().getService().destroyQueue(detail);
|
||||
detail.setStatus(NotifyDetail.Status.WAITING);
|
||||
detail.setResultDesc(null);
|
||||
detail.setRetry(1);
|
||||
detail.setSendAt(Time.now());
|
||||
detail.setTimeoutAt(detail.getSendAt() + Time.D);
|
||||
update(detail);
|
||||
|
||||
// 加入消息队列
|
||||
detail.getMsgType().getService().createQueue(detail);
|
||||
}
|
||||
|
||||
/// 分页查询用户的站内通知
|
||||
///
|
||||
/// @param page 分页参数
|
||||
/// @param userId 用户 ID
|
||||
/// @param unreadOnly true 为只查询未读通知
|
||||
/// @return 站内通知分页结果
|
||||
@Override
|
||||
public PageResult<NotifyDetail> pageInternalByUserId(Page<NotifyDetail> page, String userId, boolean unreadOnly) {
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
Page<NotifyDetail> validPage = TimiJava.defaultIfNull(page, new Page<>());
|
||||
PageResult<NotifyDetail> result = new PageResult<>();
|
||||
result.setTotal(unreadOnly
|
||||
? mapper.countUnreadSiteByUserId(userId)
|
||||
: mapper.countSiteByUserId(userId));
|
||||
result.setList(unreadOnly
|
||||
? mapper.selectUnreadSiteByUserId(userId, validPage.getOffset(), validPage.getLimit())
|
||||
: mapper.selectSiteByUserId(userId, validPage.getOffset(), validPage.getLimit()));
|
||||
return result;
|
||||
}
|
||||
|
||||
/// 查询当前用户拥有的站内通知详情
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
/// @param userId 用户 ID
|
||||
/// @return 通知详情
|
||||
@Override
|
||||
public NotifyDetail getInternalByUserId(String detailId, String userId) {
|
||||
TimiException.required(detailId, "未找到通知详情 ID");
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
NotifyDetail detail = mapper.selectSiteByIdAndUserId(detailId, userId);
|
||||
TimiException.required(detail, "未找到站内通知");
|
||||
return detail;
|
||||
}
|
||||
|
||||
/// 删除当前用户拥有的站内通知详情
|
||||
///
|
||||
/// @param detailId 通知详情 ID
|
||||
/// @param userId 用户 ID
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public void deleteInternalByUserId(String detailId, String userId) {
|
||||
TimiException.required(detailId, "未找到通知详情 ID");
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
int affected = mapper.deleteSiteByIdAndUserId(detailId, userId);
|
||||
TimiException.requiredTrue(0 < affected, "未找到站内通知");
|
||||
}
|
||||
|
||||
/// 查询用户未读站内通知数量
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
/// @return 未读数量
|
||||
@Override
|
||||
public long countUnreadSiteByUserId(String userId) {
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
return mapper.countUnreadSiteByUserId(userId);
|
||||
}
|
||||
|
||||
/// 标记站内通知已读
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
/// @param detailId 通知详情 ID
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public void markSiteRead(String userId, String detailId) {
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
TimiException.required(detailId, "未找到通知详情 ID");
|
||||
TimiException.required(mapper.selectSiteByIdAndUserId(detailId, userId), "未找到站内通知");
|
||||
mapper.markSiteRead(detailId, userId, Time.now());
|
||||
}
|
||||
|
||||
/// 标记用户全部站内通知已读
|
||||
///
|
||||
/// @param userId 用户 ID
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public void markAllSiteRead(String userId) {
|
||||
TimiException.required(userId, "未找到用户 ID");
|
||||
mapper.markAllSiteRead(userId, Time.now());
|
||||
}
|
||||
}
|
||||
|
||||
+117
@@ -1,12 +1,25 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.entity.Notify;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.mapper.NotifyMapper;
|
||||
import com.imyeyu.api.modules.common.service.NotifyDetailService;
|
||||
import com.imyeyu.api.modules.common.service.NotifyService;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 通知服务实现
|
||||
@@ -14,14 +27,118 @@ import org.springframework.stereotype.Service;
|
||||
* @author 夜雨
|
||||
* @since 2026-05-13 14:46
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class NotifyServiceImplement extends AbstractEntityService<Notify, String> implements NotifyService {
|
||||
|
||||
private final LoggerService loggerService;
|
||||
private final UserLoginService userLoginService;
|
||||
private final NotifyDetailService detailService;
|
||||
|
||||
private final NotifyMapper mapper;
|
||||
|
||||
@Override
|
||||
protected BaseMapper<Notify, String> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
/// 创建通知并级联创建通知详情
|
||||
///
|
||||
/// @param notify 通知
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(Notify notify) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_CREATE");
|
||||
try {
|
||||
TimiException.required(notify, "未找到通知");
|
||||
TimiException.required(notify.getDetailList(), "未找到通知详情列表");
|
||||
super.create(notify);
|
||||
|
||||
String sendFrom = null;
|
||||
if (userLoginService.isLogged()) {
|
||||
sendFrom = userLoginService.getRequireLoginUserId();
|
||||
}
|
||||
for (NotifyDetail detail : notify.getDetailList()) {
|
||||
detail.setNotifyId(notify.getId());
|
||||
if (TimiJava.isNotEmpty(sendFrom)) {
|
||||
detail.setSendFrom(sendFrom);
|
||||
}
|
||||
detailService.create(detail);
|
||||
}
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(notify.getId());
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("创建通知失败", e);
|
||||
throw new TimiException(TimiCode.ERROR, "创建通知失败", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
/// 删除通知并级联软删除通知详情
|
||||
///
|
||||
/// @param notifyId 通知 ID
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void delete(String notifyId) {
|
||||
Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_DELETE");
|
||||
try {
|
||||
TimiException.required(notifyId, "未找到通知 ID");
|
||||
TimiException.required(get(notifyId), "未找到通知");
|
||||
List<NotifyDetail> detailList = detailService.listByNotifyId(notifyId);
|
||||
for (NotifyDetail detail : detailList) {
|
||||
detailService.delete(detail.getId());
|
||||
}
|
||||
super.delete(notifyId);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(notifyId);
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
logger.setException(e.getMessage());
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.setLevel(Logger.Level.ERROR);
|
||||
logger.setException(TimiJava.serializeThrowable(e));
|
||||
log.error("删除通知失败", e);
|
||||
throw new TimiException(TimiCode.ERROR, "删除通知失败", e);
|
||||
} finally {
|
||||
loggerService.create(logger);
|
||||
}
|
||||
}
|
||||
|
||||
/// 取消通知中尚未成功发送的通知详情
|
||||
///
|
||||
/// @param notifyId 通知 ID
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void cancel(String notifyId) {
|
||||
TimiException.required(notifyId, "未找到通知 ID");
|
||||
TimiException.required(get(notifyId), "未找到通知");
|
||||
|
||||
boolean canceled = false;
|
||||
for (NotifyDetail detail : detailService.listByNotifyId(notifyId)) {
|
||||
if (detail.getStatus() == NotifyDetail.Status.REMINDED
|
||||
|| detail.getStatus() == NotifyDetail.Status.CANCEL
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
if (detail.getMsgType() != null && detail.getMsgType().isQueue()) {
|
||||
detail.getMsgType().getService().destroyQueue(detail);
|
||||
}
|
||||
detail.setStatus(NotifyDetail.Status.CANCEL);
|
||||
detail.setResultDesc("通知已取消");
|
||||
detailService.update(detail);
|
||||
canceled = true;
|
||||
}
|
||||
if (!canceled) {
|
||||
throw new TimiException(TimiCode.RESULT_BAD, "通知没有可取消的通知详情");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.entity.SmsQueue;
|
||||
import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
|
||||
import com.imyeyu.api.modules.common.mapper.SmsQueueMapper;
|
||||
import com.imyeyu.api.modules.common.service.SmsQueueService;
|
||||
import com.imyeyu.api.modules.common.util.QCloudSmsProxy;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
|
||||
import com.tencentcloudapi.sms.v20210111.models.SendStatus;
|
||||
import com.imyeyu.utils.Regex;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/// 短信队列服务实现
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SmsQueueServiceImplement extends AbstractQueueService<SmsQueue, NotifyQueueConfig.Sms> implements SmsQueueService {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
private final ObjectMapper jackson;
|
||||
private final QCloudSmsProxy smsProxy;
|
||||
|
||||
private final SmsQueueMapper mapper;
|
||||
|
||||
@Override
|
||||
protected NotifyQueueConfig.Sms config() {
|
||||
return config.getSms();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BaseQueueMapper<SmsQueue> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateSendTo(String sendTo) {
|
||||
TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, sendTo), "发送目标不是手机号");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createQueue(NotifyDetail detail) {
|
||||
mapper.insert(new SmsQueue(detail));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doSend(SmsQueue queue) {
|
||||
try {
|
||||
String[] args = new String[0];
|
||||
if (queue.getArgs() != null && !queue.getArgs().isBlank()) {
|
||||
JsonNode argsNode = jackson.readTree(queue.getArgs());
|
||||
TimiException.requiredTrue(argsNode != null && argsNode.isArray(), "短信参数必须是数组");
|
||||
args = jackson.treeToValue(argsNode, String[].class);
|
||||
}
|
||||
SendSmsResponse response = smsProxy.send(queue.getSendTo(), queue.getTemplateId(), args);
|
||||
TimiException.required(response, "未找到短信响应");
|
||||
SendStatus[] statusSet = response.getSendStatusSet();
|
||||
TimiException.requiredTrue(statusSet != null && 0 < statusSet.length, "短信响应为空");
|
||||
if (!"ok".equalsIgnoreCase(statusSet[0].getCode())) {
|
||||
throw new TimiException(TimiCode.ERROR, jackson.writeValueAsString(response));
|
||||
}
|
||||
} catch (TimiException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw new TimiException(TimiCode.ERROR, "短信发送失败", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
//package com.imyeyu.api.modules.common.service.implement;
|
||||
//
|
||||
//import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
//import com.fasterxml.jackson.databind.node.ArrayNode;
|
||||
//import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
//import com.imyeyu.api.modules.common.entity.Notify;
|
||||
//import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
//import com.imyeyu.api.modules.common.service.NotifyDetailService;
|
||||
//import com.imyeyu.api.modules.common.service.NotifyService;
|
||||
//import com.imyeyu.api.modules.common.service.SmsService;
|
||||
//import com.imyeyu.java.bean.timi.TimiException;
|
||||
//import com.imyeyu.utils.Regex;
|
||||
//import com.imyeyu.utils.Text;
|
||||
//import com.imyeyu.utils.Time;
|
||||
//import lombok.RequiredArgsConstructor;
|
||||
//import lombok.extern.slf4j.Slf4j;
|
||||
//import org.springframework.beans.factory.annotation.Value;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// *
|
||||
// *
|
||||
// * @author 夜雨
|
||||
// * @since 2026-05-14 12:12
|
||||
// */
|
||||
//@Slf4j
|
||||
//@Service
|
||||
//@RequiredArgsConstructor
|
||||
//public class SmsServiceImplement implements SmsService {
|
||||
//
|
||||
// @Value("${spring.profiles.active}")
|
||||
// private String env;
|
||||
//
|
||||
// private final NotifyQueueConfig config;
|
||||
// private final ObjectMapper jackson;
|
||||
//
|
||||
// private final NotifyService notifyService;
|
||||
// private final NotifyDetailService notifyDetailService;
|
||||
//
|
||||
// @Override
|
||||
// public String captchaCreate(Notify notify) {
|
||||
// NotifyQueueConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
|
||||
// TimiException.required(notify.getAppId(), "not found appId");
|
||||
//
|
||||
// NotifyDetail detail = notify.getDetailList().getFirst();
|
||||
//
|
||||
// TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, detail.getSendTo()), "invalid mobilePhone", "captcha.sms.invalid_mobile_phone");
|
||||
//
|
||||
// String code = Text.randomString("0123456789", 6);
|
||||
// if (!env.equalsIgnoreCase("prod")) {
|
||||
// code = "123456";
|
||||
// }
|
||||
// detail.setMsgType(NotifyDetail.MsgType.SMS);
|
||||
// detail.setTemplateId(captchaConf.getTemplateId());
|
||||
// detail.setArgs(jackson.valueToTree(List.of(code, captchaConf.getTtlMinute())));
|
||||
//
|
||||
// notifyService.create(notify);
|
||||
// return notifyDetailService.listByNotifyId(notify.getId()).getFirst().getId();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public NotifyDetail captchaVerify(String detailId, String captcha) {
|
||||
// AppConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
|
||||
//
|
||||
// NotifyDetail detail = notifyDetailService.get(detailId);
|
||||
// if (Time.M * captchaConf.getTtlMinute() < Time.now() - detail.getSendAt()) {
|
||||
// throw new AppException(ResultCode.ARG_EXPIRED).msgKey("captcha.expired");
|
||||
// }
|
||||
// if (detail.getArgs() instanceof ArrayNode array) {
|
||||
// String dbCaptcha = array.get(captchaConf.getArgIndex()).asText();
|
||||
// if (!dbCaptcha.equalsIgnoreCase(captcha)) {
|
||||
// throw new AppException(ResultCode.RESULT_BAD).msgKey("captcha.invalid");
|
||||
// }
|
||||
// } else {
|
||||
// throw new AppException(ResultCode.ERROR, "not array args");
|
||||
// }
|
||||
// detail.setNotify(notifyService.get(detail.getNotifyId()));
|
||||
// return detail;
|
||||
// }
|
||||
//}
|
||||
+10
@@ -7,6 +7,8 @@ import com.imyeyu.api.modules.common.mapper.TagMapper;
|
||||
import com.imyeyu.api.modules.common.service.MultilingualService;
|
||||
import com.imyeyu.api.modules.common.service.TagService;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -70,6 +72,14 @@ public class TagServiceImplement extends AbstractEntityService<Tag, String> impl
|
||||
return mapper.selectByIdList(new HashSet<>(idList));
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<Tag> pageByOwnerAndKeyword(Page<Tag> page, Tag.OwnerType ownerType, String ownerId, String keyword) {
|
||||
PageResult<Tag> result = new PageResult<>();
|
||||
result.setTotal(mapper.countByOwnerAndKeyword(ownerType, ownerId, keyword));
|
||||
result.setList(mapper.selectByOwnerAndKeyword(ownerType, ownerId, keyword, page.getOffset(), page.getLimit()));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Tag> listByBizType(TagApply.BizType bizType, String bizId) {
|
||||
return listByIdList(listApply(bizType, bizId).stream().map(TagApply::getTagId).toList());
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
package com.imyeyu.api.modules.common.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.entity.WechatQueue;
|
||||
import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
|
||||
import com.imyeyu.api.modules.common.mapper.WechatQueueMapper;
|
||||
import com.imyeyu.api.modules.common.service.WechatQueueService;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/// 微信队列服务实现
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class WechatQueueServiceImplement extends AbstractQueueService<WechatQueue, NotifyQueueConfig.Wechat> implements WechatQueueService {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
|
||||
private final WechatQueueMapper mapper;
|
||||
|
||||
@Override
|
||||
protected NotifyQueueConfig.Wechat config() {
|
||||
return config.getWechat();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BaseQueueMapper<WechatQueue> mapper() {
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateSendTo(String sendTo) {
|
||||
TimiException.required(sendTo, "发送目标不能为空");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createQueue(NotifyDetail detail) {
|
||||
mapper.insert(new WechatQueue(detail));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doSend(WechatQueue queue) {
|
||||
throw new TimiException(TimiCode.ERROR_NOT_SUPPORT, "微信推送暂未实现");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.imyeyu.api.modules.common.task;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.service.MailQueueService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.scheduling.annotation.SchedulingConfigurer;
|
||||
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
||||
import org.springframework.scheduling.support.CronTrigger;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/// 邮件队列定时任务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MailQueueTask implements SchedulingConfigurer {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
|
||||
private final MailQueueService service;
|
||||
|
||||
private boolean running;
|
||||
|
||||
@Override
|
||||
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
|
||||
if (!config.getMail().isEnable()) {
|
||||
log.warn("邮件队列任务已禁用");
|
||||
return;
|
||||
}
|
||||
taskRegistrar.addTriggerTask(() -> {
|
||||
if (running) {
|
||||
log.info("邮件队列任务正在运行,跳过本次执行");
|
||||
return;
|
||||
}
|
||||
running = true;
|
||||
try {
|
||||
service.invokeQueue();
|
||||
} finally {
|
||||
running = false;
|
||||
}
|
||||
}, triggerContext -> new CronTrigger(config.getMail().getCron()).nextExecution(triggerContext));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.imyeyu.api.modules.common.task;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.imyeyu.api.modules.common.service.SmsQueueService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.scheduling.annotation.SchedulingConfigurer;
|
||||
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
||||
import org.springframework.scheduling.support.CronTrigger;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/// 短信队列定时任务
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SmsQueueTask implements SchedulingConfigurer {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
|
||||
private final SmsQueueService service;
|
||||
|
||||
private boolean running;
|
||||
|
||||
@Override
|
||||
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
|
||||
if (!config.getSms().isEnable()) {
|
||||
log.warn("短信队列任务已禁用");
|
||||
return;
|
||||
}
|
||||
taskRegistrar.addTriggerTask(() -> {
|
||||
if (running) {
|
||||
log.info("短信队列任务正在运行,跳过本次执行");
|
||||
return;
|
||||
}
|
||||
running = true;
|
||||
try {
|
||||
service.invokeQueue();
|
||||
} finally {
|
||||
running = false;
|
||||
}
|
||||
}, triggerContext -> new CronTrigger(config.getSms().getCron()).nextExecution(triggerContext));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.imyeyu.api.modules.common.task;
|
||||
|
||||
/// 微信队列定时任务占位
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public class WechatQueueTask {
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.imyeyu.api.modules.common.util;
|
||||
|
||||
import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
|
||||
import com.tencentcloudapi.common.Credential;
|
||||
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
|
||||
import com.tencentcloudapi.common.profile.ClientProfile;
|
||||
import com.tencentcloudapi.common.profile.HttpProfile;
|
||||
import com.tencentcloudapi.sms.v20210111.SmsClient;
|
||||
import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
|
||||
import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// 腾讯云短信服务代理
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class QCloudSmsProxy {
|
||||
|
||||
private final NotifyQueueConfig config;
|
||||
|
||||
/// 发送短信
|
||||
///
|
||||
/// @param mobilePhone 手机号
|
||||
/// @param templateId 模板 ID
|
||||
/// @param args 模板参数
|
||||
/// @return 腾讯云短信响应
|
||||
/// @throws TencentCloudSDKException 腾讯云 SDK 调用异常
|
||||
public SendSmsResponse send(String mobilePhone, String templateId, String[] args) throws TencentCloudSDKException {
|
||||
return send(List.of(mobilePhone), templateId, args);
|
||||
}
|
||||
|
||||
/// 批量发送短信
|
||||
///
|
||||
/// @param mobilePhoneList 手机号列表
|
||||
/// @param templateId 模板 ID
|
||||
/// @param args 模板参数
|
||||
/// @return 腾讯云短信响应
|
||||
/// @throws TencentCloudSDKException 腾讯云 SDK 调用异常
|
||||
public SendSmsResponse send(List<String> mobilePhoneList, String templateId, String[] args) throws TencentCloudSDKException {
|
||||
SmsClient client = createSmsClient();
|
||||
NotifyQueueConfig.Sms sms = config.getSms();
|
||||
|
||||
SendSmsRequest request = new SendSmsRequest();
|
||||
request.setSmsSdkAppId(sms.getAppId().trim());
|
||||
request.setSignName(sms.getSign().trim());
|
||||
request.setTemplateId(templateId);
|
||||
request.setTemplateParamSet(args);
|
||||
request.setPhoneNumberSet(mobilePhoneList.toArray(new String[0]));
|
||||
return client.SendSms(request);
|
||||
}
|
||||
|
||||
private SmsClient createSmsClient() {
|
||||
NotifyQueueConfig.Sms sms = config.getSms();
|
||||
Credential credential = new Credential(sms.getSecretId().trim(), sms.getSecretKey().trim());
|
||||
|
||||
HttpProfile httpProfile = new HttpProfile();
|
||||
httpProfile.setReqMethod("GET");
|
||||
httpProfile.setConnTimeout(10);
|
||||
httpProfile.setWriteTimeout(10);
|
||||
httpProfile.setReadTimeout(10);
|
||||
httpProfile.setEndpoint("sms.tencentcloudapi.com");
|
||||
|
||||
ClientProfile clientProfile = new ClientProfile();
|
||||
clientProfile.setSignMethod("HmacSHA256");
|
||||
clientProfile.setHttpProfile(httpProfile);
|
||||
return new SmsClient(credential, "ap-guangzhou", clientProfile);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.imyeyu.api.modules.common.util;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
|
||||
import com.imyeyu.spring.util.SQLProvider;
|
||||
import com.imyeyu.utils.Time;
|
||||
import org.apache.ibatis.builder.annotation.ProviderContext;
|
||||
|
||||
/// 通知队列 SQL 提供器
|
||||
///
|
||||
/// @author 夜雨
|
||||
/// @since 2026-08-20
|
||||
public class QueueSQLProvider extends SQLProvider {
|
||||
|
||||
/// 查询已到发送时间的队列
|
||||
///
|
||||
/// @param context Mapper 上下文
|
||||
/// @return 查询 SQL
|
||||
public String listReadyQueue(ProviderContext context) {
|
||||
EntityMeta meta = getEntityMeta(context);
|
||||
StringBuilder sql = new StringBuilder("SELECT * FROM %s WHERE 1 = 1".formatted(meta.getTable()));
|
||||
if (BaseQueueEntity.class.isAssignableFrom(meta.getEntityClass())) {
|
||||
sql.append(" AND `send_at` < %d".formatted(Time.now()));
|
||||
}
|
||||
return sql.toString();
|
||||
}
|
||||
|
||||
/// 根据通知详情 ID 物理删除队列
|
||||
///
|
||||
/// @param context Mapper 上下文
|
||||
/// @return 删除 SQL
|
||||
public String destroyByNotifyDetailId(ProviderContext context) {
|
||||
EntityMeta meta = getEntityMeta(context);
|
||||
return "DELETE FROM %s WHERE `notify_detail_id` = #{notifyDetailId}".formatted(meta.getTable());
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ public class GaoUserInviteCache {
|
||||
/// 发起邀请的用户 ID
|
||||
private String inviterUserId;
|
||||
|
||||
/// 门店 ID
|
||||
/// 门店 ID,GLOBAL_MANAGER 可为空
|
||||
private String storeId;
|
||||
|
||||
/// 角色 ID
|
||||
|
||||
@@ -62,7 +62,9 @@ public class GaoEventController {
|
||||
@RequireGaoPermission(GaoPermissionCode.EVENT_READ)
|
||||
@PostMapping("/detail")
|
||||
public GaoEvent detail(@RequestParam String id) {
|
||||
return service.get(id);
|
||||
GaoEvent event = service.get(id);
|
||||
event.setRoleCodeList(service.listRoleCode(event.getId()));
|
||||
return event;
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
|
||||
@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// GAO 客户积分规则接口
|
||||
///
|
||||
/// @author Codex
|
||||
@@ -78,6 +80,19 @@ public class GaoPointRuleController {
|
||||
ruleService.update(rule);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.POINT_RULE_UPDATE)
|
||||
@PostMapping("/rule/sort")
|
||||
public void sort(@RequestBody List<String> idList) {
|
||||
if (idList != null) {
|
||||
for (GaoPointRule rule : ruleService.listByIdList(idList)) {
|
||||
checkStore(rule.getStoreId());
|
||||
}
|
||||
}
|
||||
ruleService.sort(idList);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.POINT_RULE_DELETE)
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||
@@ -57,6 +58,15 @@ public class GaoStoreChartController {
|
||||
return service.eventRecordDailyStat(req);
|
||||
}
|
||||
|
||||
/// 查询登记事件每日数值合计
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.STAT_READ)
|
||||
@PostMapping("/event/record/number-value/daily")
|
||||
public List<GaoEventRecordNumberValueDailyStatView> eventRecordNumberValueDaily(@RequestBody GaoStoreChartReq req) {
|
||||
return service.eventRecordNumberValueDailyStat(req);
|
||||
}
|
||||
|
||||
/// 查询登记事件日历记录
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
|
||||
@@ -50,10 +50,16 @@ public class GaoTagController {
|
||||
@PostMapping("/list")
|
||||
public PageResult<Tag> list(@RequestBody Page<Tag> page) {
|
||||
TimiException.required(page, "未找到分页参数");
|
||||
String ownerId = null;
|
||||
page.setEqualsExample(TimiJava.defaultIfNull(page.getEqualsExample(), new Tag()));
|
||||
page.getEqualsExample().setOwnerType(Tag.OwnerType.GAO_STORE);
|
||||
if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
|
||||
page.getEqualsExample().setOwnerId(storeService.getBelongIdByRequiredLoginUserId());
|
||||
ownerId = storeService.getBelongIdByRequiredLoginUserId();
|
||||
page.getEqualsExample().setOwnerId(ownerId);
|
||||
}
|
||||
String keyword = page.getLikesExample() == null ? null : page.getLikesExample().getName();
|
||||
if (TimiJava.isNotEmpty(keyword)) {
|
||||
return service.pageByOwnerAndKeyword(page, Tag.OwnerType.GAO_STORE, ownerId, keyword.trim());
|
||||
}
|
||||
return service.page(page);
|
||||
}
|
||||
|
||||
@@ -123,7 +123,9 @@ public class GaoUserController {
|
||||
{
|
||||
User user = userService.get(result.getUserId());
|
||||
user.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.USER, user.getId()));
|
||||
user.setRoleList(userRoleService.listAllRoleCodeByUserId(user.getId()));
|
||||
user.setRoleEntityList(userRoleService.listRoleByUserId(user.getId()));
|
||||
user.setPermissionList(userRoleService.listAllPermissionCodeByUserId(user.getId()));
|
||||
result.setUser(user);
|
||||
}
|
||||
return result;
|
||||
|
||||
@@ -3,9 +3,12 @@ package com.imyeyu.api.modules.gao.entity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||
import com.imyeyu.api.modules.user.bean.Gender;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.spring.annotation.table.Column;
|
||||
import com.imyeyu.spring.annotation.table.Transient;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import lombok.Data;
|
||||
@@ -30,7 +33,11 @@ public class GaoCustomer extends UUIDEntity {
|
||||
/// @since 2026-07-27
|
||||
public enum AttachType {
|
||||
|
||||
PHOTO
|
||||
PHOTO,
|
||||
|
||||
POINT_CARD,
|
||||
|
||||
OTHER
|
||||
}
|
||||
|
||||
///
|
||||
@@ -54,6 +61,18 @@ public class GaoCustomer extends UUIDEntity {
|
||||
/// 姓名
|
||||
private String name;
|
||||
|
||||
@Column("name_pinyin_full")
|
||||
@JsonIgnore
|
||||
private String namePinyinFull;
|
||||
|
||||
@Column("name_pinyin_initial")
|
||||
@JsonIgnore
|
||||
private String namePinyinInitial;
|
||||
|
||||
@Column("name_pinyin_mixed")
|
||||
@JsonIgnore
|
||||
private String namePinyinMixed;
|
||||
|
||||
/// 性别
|
||||
private Gender gender;
|
||||
|
||||
@@ -105,6 +124,9 @@ public class GaoCustomer extends UUIDEntity {
|
||||
@Transient
|
||||
private List<GaoEventRecord> eventRecordList;
|
||||
|
||||
@Transient
|
||||
private TagApply tagApply;
|
||||
|
||||
public boolean hasIntroducer() {
|
||||
return TimiJava.isNotEmpty(introducerCustomerId);
|
||||
}
|
||||
|
||||
@@ -17,9 +17,12 @@ public class GaoPointLedger extends UUIDEntity {
|
||||
/// 流水变化类型
|
||||
public enum ChangeType {
|
||||
|
||||
/// 登记事件获得积分
|
||||
/// 登记事件发放积分
|
||||
EARN,
|
||||
|
||||
/// 登记事件消费积分
|
||||
CONSUME,
|
||||
|
||||
/// 删除登记记录撤销积分
|
||||
REVOKE,
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerChartReq;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordPage;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordRankPage;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
@@ -88,6 +89,9 @@ public interface GaoEventRecordMapper extends BaseMapper<GaoEventRecord, String>
|
||||
/// @return 每日登记数
|
||||
List<GaoEventRecordDailyStatView> stateDailyByRange(GaoStoreChartReq req);
|
||||
|
||||
/// 按时间范围和事件统计每日登记数值合计
|
||||
List<GaoEventRecordNumberValueDailyStatView> stateNumberValueDailyByRange(GaoStoreChartReq req);
|
||||
|
||||
/// 按时间范围查询登记日历记录
|
||||
///
|
||||
/// @param req 门店报表查询请求
|
||||
|
||||
@@ -19,11 +19,11 @@ public interface GaoPointLedgerMapper extends BaseMapper<GaoPointLedger, String>
|
||||
/// @return 流水
|
||||
GaoPointLedger selectByIdempotencyKey(@Param("idempotencyKey") String idempotencyKey);
|
||||
|
||||
/// 查询登记记录产生的原始获得积分流水
|
||||
/// 查询登记记录产生的原始规则积分流水
|
||||
///
|
||||
/// @param eventRecordId 登记记录 ID
|
||||
/// @return 获得积分流水
|
||||
List<GaoPointLedger> selectEarnByEventRecordId(@Param("eventRecordId") String eventRecordId);
|
||||
/// @return 原始规则积分流水
|
||||
List<GaoPointLedger> selectRuleChangeByEventRecordId(@Param("eventRecordId") String eventRecordId);
|
||||
|
||||
/// 批量查询幂等键对应的流水
|
||||
///
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.imyeyu.api.modules.gao.entity.GaoPointRule;
|
||||
import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/// GAO 客户积分规则 Mapper
|
||||
@@ -12,6 +13,8 @@ import java.util.List;
|
||||
/// @since 2026-08-11
|
||||
public interface GaoPointRuleMapper extends BaseMapper<GaoPointRule, String> {
|
||||
|
||||
List<GaoPointRule> selectByIdList(Collection<String> idList);
|
||||
|
||||
/// 查询当前时间可匹配的启用规则
|
||||
///
|
||||
/// @param storeId 门店 ID
|
||||
|
||||
@@ -18,6 +18,12 @@ import java.util.List;
|
||||
/// @since 2026-07-27 14:09
|
||||
public interface GaoEventRecordService extends BaseService<GaoEventRecord, String> {
|
||||
|
||||
/// 按客户查询登记事件记录
|
||||
///
|
||||
/// @param customerId 客户 ID
|
||||
/// @return 登记事件记录列表
|
||||
List<GaoEventRecord> listByCustomerId(String customerId);
|
||||
|
||||
default void createBatch(List<GaoEventRecord> recordList) {
|
||||
for (GaoEventRecord record : TimiJava.safeIterable(recordList)) {
|
||||
create(record);
|
||||
|
||||
@@ -15,18 +15,18 @@ import com.imyeyu.spring.service.BaseService;
|
||||
/// @since 2026-08-11
|
||||
public interface GaoPointLedgerService extends BaseService<GaoPointLedger, String> {
|
||||
|
||||
/// 写入登记获得积分流水
|
||||
/// 写入登记规则积分流水
|
||||
///
|
||||
/// @param record 登记记录
|
||||
/// @param rule 命中规则
|
||||
/// @param pointDelta 积分变化
|
||||
/// @param sourcePayload 来源快照
|
||||
/// @return 积分流水
|
||||
GaoPointLedger earn(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload);
|
||||
GaoPointLedger applyRule(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload);
|
||||
|
||||
/// 写入删除登记记录的撤销流水
|
||||
///
|
||||
/// @param originLedger 原始获得积分流水
|
||||
/// @param originLedger 原始规则积分流水
|
||||
/// @param record 登记记录
|
||||
/// @return 撤销流水
|
||||
GaoPointLedger revoke(GaoPointLedger originLedger, GaoEventRecord record);
|
||||
|
||||
@@ -19,6 +19,17 @@ public interface GaoPointRuleService extends BaseService<GaoPointRule, String> {
|
||||
/// @return 规则列表
|
||||
List<GaoPointRule> listActive(String storeId, String eventId, long now);
|
||||
|
||||
/// 查询规则 ID 列表
|
||||
///
|
||||
/// @param idList 规则 ID 列表
|
||||
/// @return 规则列表
|
||||
List<GaoPointRule> listByIdList(List<String> idList);
|
||||
|
||||
/// 按客户端提交的顺序更新启用规则优先级
|
||||
///
|
||||
/// @param idList 规则 ID 列表
|
||||
void sort(List<String> idList);
|
||||
|
||||
/// 创建积分规则
|
||||
///
|
||||
/// @param rule 积分规则
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
|
||||
import java.util.List;
|
||||
@@ -23,6 +24,9 @@ public interface GaoStoreChartService {
|
||||
/// 查询登记事件每日统计
|
||||
List<GaoEventRecordDailyStatView> eventRecordDailyStat(GaoStoreChartReq req);
|
||||
|
||||
/// 查询登记事件每日数值合计
|
||||
List<GaoEventRecordNumberValueDailyStatView> eventRecordNumberValueDailyStat(GaoStoreChartReq req);
|
||||
|
||||
/// 查询登记事件日历记录
|
||||
List<GaoEventRecordCalendarView> eventRecordCalendar(GaoStoreChartReq req);
|
||||
}
|
||||
|
||||
+51
-1
@@ -3,10 +3,16 @@ package com.imyeyu.api.modules.gao.service.implement;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.entity.TagApply;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.common.service.TagService;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoCustomerMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
|
||||
import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||
@@ -15,6 +21,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.util.PinyinUtil;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
@@ -24,6 +31,7 @@ import com.imyeyu.spring.mapper.BaseMapper;
|
||||
import com.imyeyu.spring.service.AbstractEntityService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -54,9 +62,12 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
|
||||
private final ObjectMapper jackson;
|
||||
|
||||
private final TagService tagService;
|
||||
private final LoggerService loggerService;
|
||||
private final UserLoginService userLoginService;
|
||||
private final AttachmentService attachmentService;
|
||||
private final GaoPointAccountService pointAccountService;
|
||||
private final ObjectProvider<GaoEventRecordService> eventRecordServiceProvider;
|
||||
|
||||
private final GaoCustomerMapper mapper;
|
||||
|
||||
@@ -81,6 +92,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
public void create(GaoCustomer customer) {
|
||||
TimiException.required(customer.getName(), "not found customer.name");
|
||||
TimiException.required(customer.getStoreId(), "not found customer.storeId");
|
||||
fillPinyin(customer);
|
||||
|
||||
Logger logger = new Logger(Logger.Module.GAO, "GAO_CUSTOMER_CREATE");
|
||||
try {
|
||||
@@ -111,6 +123,10 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
customer.setCreatorUserId(userLoginService.getRequireLoginUserId());
|
||||
|
||||
super.create(customer);
|
||||
// 标签
|
||||
if (customer.getTagApply() != null) {
|
||||
tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), customer.getTagApply().getTagIdList());
|
||||
}
|
||||
// 附件
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId(), customer.getAttachmentList());
|
||||
|
||||
@@ -155,6 +171,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
}
|
||||
}
|
||||
dbCustomer.setName(customer.getName());
|
||||
fillPinyin(dbCustomer);
|
||||
dbCustomer.setGender(customer.getGender());
|
||||
dbCustomer.setAge(customer.getAge());
|
||||
dbCustomer.setBirthdateCalendar(customer.getBirthdateCalendar());
|
||||
@@ -168,6 +185,11 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
dbCustomer.setConditioningPart(customer.getConditioningPart());
|
||||
mapper.update(dbCustomer);
|
||||
|
||||
// 标签
|
||||
if (customer.getTagApply() != null) {
|
||||
tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), customer.getTagApply().getTagIdList());
|
||||
}
|
||||
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(customer.getId());
|
||||
} catch (TimiException e) {
|
||||
@@ -191,7 +213,28 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
try {
|
||||
logger.setContent(id);
|
||||
GaoCustomer customer = get(id);
|
||||
TimiException.required(customer, "not found customer");
|
||||
// 登记事件
|
||||
GaoEventRecordService eventRecordService = eventRecordServiceProvider.getObject();
|
||||
for (GaoEventRecord record : eventRecordService.listByCustomerId(customer.getId())) {
|
||||
eventRecordService.delete(record.getId());
|
||||
}
|
||||
// 积分账户
|
||||
GaoPointAccount account = pointAccountService.getByCustomerId(customer.getStoreId(), customer.getId());
|
||||
if (account != null) {
|
||||
pointAccountService.delete(account.getId());
|
||||
}
|
||||
// 邀请人
|
||||
for (GaoCustomer invitedCustomer : listInvited(customer.getId())) {
|
||||
invitedCustomer.setIntroducerCustomerId(null);
|
||||
mapper.update(invitedCustomer);
|
||||
}
|
||||
// 标签
|
||||
tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), List.of());
|
||||
// 附件
|
||||
attachmentService.deleteByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId());
|
||||
super.delete(id);
|
||||
// 邀请来源计数
|
||||
changeInvitedCount(customer.getIntroducerCustomerId(), -1);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(id);
|
||||
@@ -377,11 +420,18 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
|
||||
}
|
||||
|
||||
private void changeInvitedCount(String customerId, long delta) {
|
||||
if (delta == 0) {
|
||||
if (TimiJava.isEmpty(customerId) || delta == 0) {
|
||||
return;
|
||||
}
|
||||
GaoCustomer customer = get(customerId);
|
||||
customer.setInvitedCount(customer.getInvitedCount() + delta);
|
||||
mapper.update(customer);
|
||||
}
|
||||
|
||||
private void fillPinyin(GaoCustomer customer) {
|
||||
String name = customer.getName();
|
||||
customer.setNamePinyinFull(PinyinUtil.full(name));
|
||||
customer.setNamePinyinInitial(PinyinUtil.initial(name));
|
||||
customer.setNamePinyinMixed(PinyinUtil.mixed(name));
|
||||
}
|
||||
}
|
||||
|
||||
+12
-3
@@ -10,9 +10,9 @@ import com.imyeyu.api.modules.gao.entity.GaoEvent;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoEventRecordMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoCustomerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoEventService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
|
||||
import com.imyeyu.api.modules.gao.util.EventRecordXSSFBuilder;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
|
||||
@@ -63,8 +63,8 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
private final UserLoginService userLoginService;
|
||||
private final AttachmentService attachmentService;
|
||||
private final GaoCustomerService customerService;
|
||||
private final GaoStoreBusinessDayService businessDayService;
|
||||
private final GaoPointTriggerService pointTriggerService;
|
||||
private final GaoStoreBusinessDayService businessDayService;
|
||||
|
||||
private final GaoEventRecordMapper mapper;
|
||||
|
||||
@@ -75,6 +75,14 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
return mapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GaoEventRecord> listByCustomerId(String customerId) {
|
||||
TimiException.required(customerId, "not found customerId");
|
||||
GaoEventRecord example = new GaoEventRecord();
|
||||
example.setCustomerId(customerId);
|
||||
return mapper.selectAllByExample(example);
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(GaoEventRecord record) {
|
||||
@@ -212,6 +220,7 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
GaoEventRecord record = get(id);
|
||||
TimiException.required(record, "not found event record");
|
||||
pointTriggerService.revokeByEventRecord(record);
|
||||
attachmentService.deleteByBizId(Attachment.BizType.GAO_EVENT_RECORD, record.getId());
|
||||
super.delete(id);
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(id);
|
||||
@@ -321,7 +330,7 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
|
||||
long today = Time.today(registeredAt);
|
||||
long noon = today + Time.D / 2;
|
||||
long beginAt = today, endAt;
|
||||
if (today + registeredAt < noon) {
|
||||
if (registeredAt < noon) {
|
||||
// 上半日
|
||||
endAt = noon;
|
||||
} else {
|
||||
|
||||
+1
-1
@@ -221,7 +221,7 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
|
||||
TimiException.required(event.getValueUnit(), "NUMBER 事件必须配置数值单位");
|
||||
}
|
||||
if (TimiJava.isNotEmpty(event.getLimitType()) && event.getLimitType() != GaoEvent.LimitType.NONE) {
|
||||
TimiException.requiredTrue(event.getLimitType().getMin() < event.getLimitValue(), "约束值最低 %s".formatted(event.getLimitType().getMin()));
|
||||
TimiException.requiredTrue(event.getLimitType().getMin() <= event.getLimitValue(), "约束值最低 %s".formatted(event.getLimitType().getMin()));
|
||||
}
|
||||
if (event.getBeginAt() != null || event.getEndAt() != null) {
|
||||
TimiException.requiredTrue(event.getBeginAt() == null || event.getEndAt() == null || event.getBeginAt() <= event.getEndAt(), "invalid beginAt or endAt");
|
||||
|
||||
+5
-4
@@ -71,12 +71,13 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public GaoPointLedger earn(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload) {
|
||||
public GaoPointLedger applyRule(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload) {
|
||||
TimiException.required(record, "not found event record");
|
||||
TimiException.required(rule, "not found point rule");
|
||||
TimiException.requiredTrue(0 < pointDelta, "pointDelta invalid");
|
||||
TimiException.requiredTrue(pointDelta != 0, "pointDelta invalid");
|
||||
String idempotencyKey = "GAO_EVENT_RECORD:%s:RULE:%s:EARN".formatted(record.getId(), rule.getId());
|
||||
return apply(record.getStoreId(), record.getCustomerId(), GaoPointLedger.ChangeType.EARN, pointDelta, rule.getId(), record.getEventId(), record.getId(), sourcePayload, idempotencyKey, rule.getRemark(), record.getOperatorUserId(), record.getRegisteredAt());
|
||||
GaoPointLedger.ChangeType changeType = pointDelta < 0 ? GaoPointLedger.ChangeType.CONSUME : GaoPointLedger.ChangeType.EARN;
|
||||
return apply(record.getStoreId(), record.getCustomerId(), changeType, pointDelta, rule.getId(), record.getEventId(), record.getId(), sourcePayload, idempotencyKey, rule.getRemark(), record.getOperatorUserId(), record.getRegisteredAt());
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@@ -84,7 +85,7 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
|
||||
public GaoPointLedger revoke(GaoPointLedger originLedger, GaoEventRecord record) {
|
||||
TimiException.required(originLedger, "not found origin ledger");
|
||||
TimiException.required(record, "not found event record");
|
||||
TimiException.requiredTrue(0 < originLedger.getPointDelta(), "origin ledger pointDelta invalid");
|
||||
TimiException.requiredTrue(originLedger.getPointDelta() != 0, "origin ledger pointDelta invalid");
|
||||
String idempotencyKey = "GAO_EVENT_RECORD:%s:LEDGER:%s:REVOKE".formatted(record.getId(), originLedger.getId());
|
||||
return apply(originLedger.getStoreId(), originLedger.getCustomerId(), GaoPointLedger.ChangeType.REVOKE, -originLedger.getPointDelta(), originLedger.getRuleId(), originLedger.getEventId(), originLedger.getEventRecordId(), originLedger.getSourcePayload(), idempotencyKey, "撤销登记记录积分", userLoginService.getRequireLoginUserId(), Time.now());
|
||||
}
|
||||
|
||||
+39
-8
@@ -16,6 +16,11 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/// GAO 客户积分规则服务实现
|
||||
///
|
||||
@@ -42,6 +47,32 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
return mapper.selectActiveByStoreIdAndEventId(storeId, eventId, now);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GaoPointRule> listByIdList(List<String> idList) {
|
||||
if (TimiJava.isEmpty(idList)) {
|
||||
return List.of();
|
||||
}
|
||||
return mapper.selectByIdList(new LinkedHashSet<>(idList));
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void sort(List<String> idList) {
|
||||
if (TimiJava.isEmpty(idList)) {
|
||||
return;
|
||||
}
|
||||
List<String> distinctIdList = new ArrayList<>(new LinkedHashSet<>(idList));
|
||||
Map<String, GaoPointRule> ruleMap = mapper.selectByIdList(new LinkedHashSet<>(distinctIdList)).stream()
|
||||
.collect(Collectors.toMap(GaoPointRule::getId, Function.identity()));
|
||||
TimiException.requiredTrue(ruleMap.size() == distinctIdList.size(), "积分规则列表包含不存在的规则");
|
||||
for (int i = 0; i < distinctIdList.size(); i++) {
|
||||
GaoPointRule rule = ruleMap.get(distinctIdList.get(i));
|
||||
TimiException.requiredTrue(rule.getStatus() == GaoPointRule.Status.ACTIVE, "只能调整启用规则排序");
|
||||
rule.setPriority(i);
|
||||
mapper.update(rule);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(GaoPointRule rule) {
|
||||
@@ -127,7 +158,7 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
|
||||
TimiException.requiredTrue(rule.getPointMode() == GaoPointRule.PointMode.FIXED, "固定触发规则必须使用 FIXED 积分值模式");
|
||||
TimiException.required(rule.getPointValue(), "not found rule.pointValue");
|
||||
TimiException.requiredTrue(0 < rule.getPointValue(), "rule.pointValue invalid");
|
||||
TimiException.requiredTrue(rule.getPointValue() != 0, "rule.pointValue invalid");
|
||||
if (rule.getTriggerType() == GaoPointRule.TriggerType.AFTER_COUNT_EVERY_TIME) {
|
||||
JsonNode condition = requireObjectCondition(rule.getConditionJson());
|
||||
JsonNode threshold = condition.get("threshold");
|
||||
@@ -149,6 +180,7 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
TimiException.required(sourceEvent, "TIER.sourceEventId 对应事件不存在");
|
||||
TimiException.requiredTrue(storeId.equals(sourceEvent.getStoreId()), "TIER 来源事件和规则不属于同一门店");
|
||||
TimiException.requiredTrue(sourceEvent.getValueType() == GaoEvent.ValueType.NUMBER, "TIER 来源事件必须配置为 NUMBER 类型");
|
||||
TimiException.required(sourceEvent.getValueUnit(), "TIER 来源事件必须配置数值单位");
|
||||
|
||||
JsonNode sourceValueField = condition.get("sourceValueField");
|
||||
TimiException.requiredTrue(sourceValueField != null && sourceValueField.isTextual() && "numberValue".equals(sourceValueField.asText()), "TIER.sourceValueField 目前只能是 numberValue");
|
||||
@@ -172,10 +204,8 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
JsonNode minNode = tier.get("min");
|
||||
TimiException.requiredTrue(minNode != null && minNode.isIntegralNumber() && 0 <= minNode.longValue(), "TIER.tiers[%d].min invalid".formatted(i));
|
||||
long min = minNode.longValue();
|
||||
if (i == 0) {
|
||||
TimiException.requiredTrue(min == 0, "TIER 第一档 min 必须为 0");
|
||||
} else {
|
||||
TimiException.requiredTrue(previousMax != null && previousMax < Long.MAX_VALUE && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
|
||||
if (0 < i) {
|
||||
TimiException.requiredTrue(previousMax != null && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
|
||||
}
|
||||
|
||||
JsonNode maxNode = tier.get("max");
|
||||
@@ -192,7 +222,7 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
TimiException.requiredTrue(max == null, "最后一档 TIER.max 必须为空");
|
||||
}
|
||||
JsonNode pointValue = tier.get("pointValue");
|
||||
TimiException.requiredTrue(pointValue != null && pointValue.isIntegralNumber() && 0 <= pointValue.longValue(), "TIER.tiers[%d].pointValue invalid".formatted(i));
|
||||
TimiException.requiredTrue(pointValue != null && pointValue.isIntegralNumber(), "TIER.tiers[%d].pointValue invalid".formatted(i));
|
||||
previousMax = max;
|
||||
}
|
||||
}
|
||||
@@ -203,9 +233,10 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
|
||||
Long max = condition == null || condition.get("max") == null || condition.get("max").isNull() ? null : condition.get("max").isIntegralNumber() ? condition.get("max").longValue() : null;
|
||||
TimiException.requiredTrue(condition == null || min != null || condition.get("min") == null || condition.get("min").isNull(), "SOURCE_VALUE.min invalid");
|
||||
TimiException.requiredTrue(condition == null || max != null || condition.get("max") == null || condition.get("max").isNull(), "SOURCE_VALUE.max invalid");
|
||||
TimiException.requiredTrue(min == null || 0 < min, "SOURCE_VALUE.min invalid");
|
||||
TimiException.requiredTrue(max == null || 0 < max, "SOURCE_VALUE.max invalid");
|
||||
TimiException.requiredTrue(min == null || min != 0, "SOURCE_VALUE.min invalid");
|
||||
TimiException.requiredTrue(max == null || max != 0, "SOURCE_VALUE.max invalid");
|
||||
TimiException.requiredTrue(min == null || max == null || min <= max, "SOURCE_VALUE.min or SOURCE_VALUE.max invalid");
|
||||
TimiException.requiredTrue(min == null || max == null || (min < 0) == (max < 0), "SOURCE_VALUE.min or SOURCE_VALUE.max direction invalid");
|
||||
}
|
||||
|
||||
private JsonNode requireObjectCondition(JsonNode conditionJson) {
|
||||
|
||||
+11
-9
@@ -62,7 +62,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
|
||||
List<GaoPointRule> ruleList = ruleService.listActive(record.getStoreId(), record.getEventId(), Time.now());
|
||||
Long count = null;
|
||||
long earnedPointValue = 0L;
|
||||
long pointDeltaTotal = 0L;
|
||||
for (GaoPointRule rule : ruleList) {
|
||||
RuleResolution resolution = resolveRule(record, rule, count);
|
||||
if (resolution == null) {
|
||||
@@ -72,23 +72,23 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
count = count == null ? count(record) : count;
|
||||
}
|
||||
long pointDelta = resolution.pointDelta();
|
||||
if (0 < pointDelta) {
|
||||
ledgerService.earn(record, rule, pointDelta, resolution.sourcePayload());
|
||||
earnedPointValue = Math.addExact(earnedPointValue, pointDelta);
|
||||
if (pointDelta != 0) {
|
||||
ledgerService.applyRule(record, rule, pointDelta, resolution.sourcePayload());
|
||||
pointDeltaTotal = Math.addExact(pointDeltaTotal, pointDelta);
|
||||
}
|
||||
if (Boolean.TRUE.equals(rule.getExclusive())) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
record.setEarnedPointValue(earnedPointValue);
|
||||
eventRecordMapper.updateEarnedPointValue(record.getId(), earnedPointValue);
|
||||
record.setEarnedPointValue(pointDeltaTotal);
|
||||
eventRecordMapper.updateEarnedPointValue(record.getId(), pointDeltaTotal);
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void revokeByEventRecord(GaoEventRecord record) {
|
||||
TimiException.required(record, "not found event record");
|
||||
List<GaoPointLedger> originLedgerList = ledgerMapper.selectEarnByEventRecordId(record.getId());
|
||||
List<GaoPointLedger> originLedgerList = ledgerMapper.selectRuleChangeByEventRecordId(record.getId());
|
||||
if (originLedgerList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
@@ -140,7 +140,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
}
|
||||
permissionChecker.checkAny(ModuleCode.GAO, GaoPermissionCode.POINT_SOURCE_VALUE.getValue());
|
||||
long pointValue = record.getPointValue();
|
||||
TimiException.requiredTrue(0 < pointValue, "pointValue invalid");
|
||||
TimiException.requiredTrue(pointValue != 0, "pointValue invalid");
|
||||
JsonNode condition = rule.getConditionJson();
|
||||
if (condition != null) {
|
||||
JsonNode min = condition.get("min");
|
||||
@@ -173,7 +173,9 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
|
||||
break;
|
||||
}
|
||||
}
|
||||
TimiException.required(matchedTier, "TIER 没有匹配的分档");
|
||||
if (matchedTier == null) {
|
||||
return null;
|
||||
}
|
||||
long pointDelta = matchedTier.get("pointValue").longValue();
|
||||
ObjectNode payload = jackson.createObjectNode();
|
||||
payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name());
|
||||
|
||||
+7
@@ -8,6 +8,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -48,6 +49,12 @@ public class GaoStoreChartServiceImplement implements GaoStoreChartService {
|
||||
return eventRecordMapper.stateDailyByRange(req);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GaoEventRecordNumberValueDailyStatView> eventRecordNumberValueDailyStat(GaoStoreChartReq req) {
|
||||
checkRangeReq(req);
|
||||
return eventRecordMapper.stateNumberValueDailyByRange(req);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GaoEventRecordCalendarView> eventRecordCalendar(GaoStoreChartReq req) {
|
||||
checkRangeReq(req);
|
||||
|
||||
+42
-18
@@ -1,5 +1,6 @@
|
||||
package com.imyeyu.api.modules.gao.service.implement;
|
||||
|
||||
import com.imyeyu.api.bean.CoreRoleCode;
|
||||
import com.imyeyu.api.bean.ModuleCode;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoUserInviteCache;
|
||||
@@ -96,30 +97,36 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
String inviterUserId = userLoginService.getRequireLoginUserId();
|
||||
logger.setUserId(inviterUserId);
|
||||
permissionChecker.checkAny(ModuleCode.GAO, GaoPermissionCode.USER_CREATE.getValue());
|
||||
Role requestedRole = roleService.get(req.getRoleId());
|
||||
boolean adminInviteGlobalManager = roleChecker.hasAny(ModuleCode.CORE, CoreRoleCode.ADMIN.name())
|
||||
&& isGlobalManagerRole(requestedRole);
|
||||
boolean globalManager = authorizationScopeService.isSystemAdmin(inviterUserId)
|
||||
|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
|
||||
boolean storeManager = !globalManager;
|
||||
GaoStore loginStore = storeManager ? gaoStoreService.getByUserId(inviterUserId) : null;
|
||||
String storeId = storeManager ? loginStore == null ? null : loginStore.getId() : req.getStoreId();
|
||||
TimiException.required(storeId, "not found storeId");
|
||||
checkStoreScope(inviterUserId, storeId);
|
||||
|
||||
GaoStore store = requireActiveStore(storeId);
|
||||
String storeId = adminInviteGlobalManager ? null : storeManager ? loginStore == null ? null : loginStore.getId() : req.getStoreId();
|
||||
if (!adminInviteGlobalManager) {
|
||||
TimiException.required(storeId, "not found storeId");
|
||||
checkStoreScope(inviterUserId, storeId);
|
||||
}
|
||||
if (storeId != null) {
|
||||
requireActiveStore(storeId);
|
||||
}
|
||||
Role role = requireInvitableRole(inviterUserId, req.getRoleId(), storeId);
|
||||
long createdAt = Time.now();
|
||||
long expireAt = createdAt + INVITE_TTL;
|
||||
|
||||
GaoUserInviteCache cache = new GaoUserInviteCache();
|
||||
cache.setInviterUserId(inviterUserId);
|
||||
cache.setStoreId(store.getId());
|
||||
cache.setStoreId(storeId);
|
||||
cache.setRoleId(role.getId());
|
||||
cache.setScene(storeManager ? "STORE_MANAGER" : "STORE_MANAGEMENT");
|
||||
cache.setScene(adminInviteGlobalManager ? "CORE_ADMIN" : storeManager ? "STORE_MANAGER" : "STORE_MANAGEMENT");
|
||||
cache.setCreatedAt(createdAt);
|
||||
cache.setExpireAt(expireAt);
|
||||
String code = saveInvite(cache);
|
||||
|
||||
logger.setContent("storeId=%s;roleId=%s;scene=%s;createdAt=%d;expireAt=%d".formatted(
|
||||
store.getId(), role.getId(), cache.getScene(), createdAt, expireAt));
|
||||
storeId, role.getId(), cache.getScene(), createdAt, expireAt));
|
||||
logger.setResult("created");
|
||||
return new GaoUserInviteCreateResponse(code, expireAt);
|
||||
} catch (TimiException e) {
|
||||
@@ -141,8 +148,7 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
TimiException.required(code, "not found code");
|
||||
checkCodeRateLimit(code);
|
||||
GaoUserInviteCache cache = requireValidInvite(code);
|
||||
requireActiveStore(cache.getStoreId());
|
||||
requireValidRole(cache.getRoleId(), cache.getStoreId());
|
||||
validateInviteTarget(cache);
|
||||
return new GaoUserInviteValidateResponse(true, cache.getExpireAt());
|
||||
}
|
||||
|
||||
@@ -163,8 +169,7 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
try {
|
||||
cache = requireValidInvite(code);
|
||||
logger.setContent(buildLogContent(cache));
|
||||
requireActiveStore(cache.getStoreId());
|
||||
requireValidRole(cache.getRoleId(), cache.getStoreId());
|
||||
validateInviteTarget(cache);
|
||||
TimiException.requiredNull(userService.getByName(data.getName()), "existed user name");
|
||||
TimiException.requiredNull(userService.getByPhoneNo(data.getPhoneNo()), "existed phone number");
|
||||
if (!redisInvite.destroy(getInviteKey(code))) {
|
||||
@@ -176,10 +181,16 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
user.setPhoneNo(data.getPhoneNo());
|
||||
user.setPassword(data.getPassword());
|
||||
|
||||
GaoUser gaoUser = new GaoUser();
|
||||
gaoUser.setStoreId(cache.getStoreId());
|
||||
gaoUser.setUser(user);
|
||||
gaoUserService.create(gaoUser);
|
||||
if (cache.getStoreId() == null) {
|
||||
// TODO 用更好的方式
|
||||
userService.create(user);
|
||||
userService.verifyPhoneNo(user.getId());
|
||||
} else {
|
||||
GaoUser gaoUser = new GaoUser();
|
||||
gaoUser.setStoreId(cache.getStoreId());
|
||||
gaoUser.setUser(user);
|
||||
gaoUserService.create(gaoUser);
|
||||
}
|
||||
|
||||
UserRole userRole = new UserRole();
|
||||
userRole.setId(UUID.randomUUID().toString());
|
||||
@@ -265,7 +276,7 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
|
||||
private Role requireValidRole(String roleId, String storeId) {
|
||||
Role role = roleService.get(roleId);
|
||||
if (role == null || role.getModuleCode() != ModuleCode.GAO || !isRoleUsableForStore(role, storeId)) {
|
||||
if (role == null || role.getModuleCode() != ModuleCode.GAO || (storeId == null && !isGlobalManagerRole(role)) || !isRoleUsableForStore(role, storeId)) {
|
||||
throw invalidInvite();
|
||||
}
|
||||
return role;
|
||||
@@ -274,7 +285,20 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
|
||||
private boolean isRoleUsableForStore(Role role, String storeId) {
|
||||
return role.getOwnerType() == null
|
||||
|| role.getOwnerType() == AuthOwnerType.MODULE && (TimiJava.isEmpty(role.getOwnerId()) || ModuleCode.GAO.name().equals(role.getOwnerId()))
|
||||
|| role.getOwnerType() == AuthOwnerType.STORE && storeId.equals(role.getOwnerId());
|
||||
|| role.getOwnerType() == AuthOwnerType.STORE && storeId != null && storeId.equals(role.getOwnerId());
|
||||
}
|
||||
|
||||
private boolean isGlobalManagerRole(Role role) {
|
||||
return role != null
|
||||
&& role.getModuleCode() == ModuleCode.GAO
|
||||
&& GaoRoleCode.GLOBAL_MANAGER.name().equals(role.getCode());
|
||||
}
|
||||
|
||||
private void validateInviteTarget(GaoUserInviteCache cache) {
|
||||
if (cache.getStoreId() != null) {
|
||||
requireActiveStore(cache.getStoreId());
|
||||
}
|
||||
requireValidRole(cache.getRoleId(), cache.getStoreId());
|
||||
}
|
||||
|
||||
private void checkStoreScope(String userId, String storeId) {
|
||||
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/// 登记事件数值每日统计视图
|
||||
@Data
|
||||
public class GaoEventRecordNumberValueDailyStatView {
|
||||
|
||||
/// 登记事件 ID
|
||||
private String eventId;
|
||||
|
||||
/// 日期值,格式为 yyyyMMdd
|
||||
private Integer dateValue;
|
||||
|
||||
/// 当日登记数值合计
|
||||
private Long dailyNumberValue;
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import lombok.Data;
|
||||
@Data
|
||||
public class GaoUserInviteCreateRequest {
|
||||
|
||||
/// 门店管理场景的目标门店 ID,店长场景不使用
|
||||
/// 门店管理场景的目标门店 ID,店长场景及 ADMIN 邀请 GLOBAL_MANAGER 时不使用
|
||||
private String storeId;
|
||||
|
||||
/// 目标角色 ID
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.imyeyu.api.modules.user.service;
|
||||
|
||||
import com.e2ins.ms.notify.vo.sms.CaptchaVerifyReq;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.vo.LoginRequest;
|
||||
import com.imyeyu.api.modules.user.vo.LoginResponse;
|
||||
@@ -23,6 +24,8 @@ public interface UserLoginService {
|
||||
|
||||
LoginResponse login(String token, String userId);
|
||||
|
||||
LoginResponse loginBySms(CaptchaVerifyReq req);
|
||||
|
||||
/**
|
||||
* 根据令牌获取用户
|
||||
*
|
||||
@@ -32,6 +35,10 @@ public interface UserLoginService {
|
||||
return getLoginUser(TimiSpring.getToken());
|
||||
}
|
||||
|
||||
default boolean isLogged() {
|
||||
return getLoginUser() != null;
|
||||
}
|
||||
|
||||
User getLoginUser(String token);
|
||||
|
||||
/**
|
||||
|
||||
+24
-2
@@ -1,5 +1,8 @@
|
||||
package com.imyeyu.api.modules.user.service.implement;
|
||||
|
||||
import com.e2ins.ms.notify.SmsNotifyService;
|
||||
import com.e2ins.ms.notify.bean.NotifyDetail;
|
||||
import com.e2ins.ms.notify.vo.sms.CaptchaVerifyReq;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.entity.Setting;
|
||||
@@ -7,13 +10,13 @@ import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.common.service.SettingService;
|
||||
import com.imyeyu.api.modules.user.bean.BootstrapData;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.service.RoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.modules.user.service.UserRoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserService;
|
||||
import com.imyeyu.api.modules.user.vo.LoginRequest;
|
||||
import com.imyeyu.api.modules.user.vo.LoginResponse;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.TimiSpring;
|
||||
import com.imyeyu.spring.util.Redis;
|
||||
@@ -27,6 +30,7 @@ import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
@@ -44,9 +48,9 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
private static final long PHONE_VERIFY_CODE_TTL = Time.M * 5;
|
||||
|
||||
private final UserService userService;
|
||||
private final RoleService roleService;
|
||||
private final SettingService settingService;
|
||||
private final UserRoleService userRoleService;
|
||||
private final SmsNotifyService smsNotifyService;
|
||||
private final AttachmentService attachmentService;
|
||||
|
||||
private final Redis<String, String> redisUserToken;
|
||||
@@ -98,6 +102,24 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava {
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public LoginResponse loginBySms(CaptchaVerifyReq req) {
|
||||
try {
|
||||
NotifyDetail detail = smsNotifyService.captchaVerify(req);
|
||||
// 无报错即成功
|
||||
User user = userService.getByPhoneNo(detail.getSendTo());
|
||||
if (!user.isValidPhone()) {
|
||||
user.setPhoneNoVerifyAt(Time.now());
|
||||
userService.update(user);
|
||||
}
|
||||
return login(UUID.randomUUID().toString(), user.getId());
|
||||
} catch (IOException e) {
|
||||
log.error("login by sms error", e);
|
||||
throw new TimiException(TimiCode.ERROR, "验证短信失败");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public User getLoginUser(String token) {
|
||||
if (TimiJava.isEmpty(token)) {
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.imyeyu.api.util;
|
||||
|
||||
import me.majiajie.tinypinyin.Pinyin;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/// 拼音搜索工具
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-21
|
||||
public final class PinyinUtil {
|
||||
|
||||
private PinyinUtil() {
|
||||
}
|
||||
|
||||
/// 转换为无声调全拼
|
||||
///
|
||||
/// @param value 原始文字
|
||||
/// @return 无声调全拼
|
||||
public static String full(String value) {
|
||||
return convert(value, false, false);
|
||||
}
|
||||
|
||||
/// 转换为拼音首字母
|
||||
///
|
||||
/// @param value 原始文字
|
||||
/// @return 拼音首字母
|
||||
public static String initial(String value) {
|
||||
return convert(value, true, false);
|
||||
}
|
||||
|
||||
/// 转换为首字全拼、后续字首字母的混合拼音
|
||||
///
|
||||
/// @param value 原始文字
|
||||
/// @return 混合拼音
|
||||
public static String mixed(String value) {
|
||||
return convert(value, false, true);
|
||||
}
|
||||
|
||||
private static String convert(String value, boolean initial, boolean mixed) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
StringBuilder result = new StringBuilder(value.length());
|
||||
boolean first = true;
|
||||
for (char character : value.toCharArray()) {
|
||||
if (Character.isWhitespace(character)) {
|
||||
continue;
|
||||
}
|
||||
String pinyin = Pinyin.toPinyin(character).toLowerCase(Locale.ROOT);
|
||||
if (pinyin.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
if (initial || (mixed && !first)) {
|
||||
result.append(pinyin.charAt(0));
|
||||
} else {
|
||||
result.append(pinyin);
|
||||
}
|
||||
first = false;
|
||||
}
|
||||
return result.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package db.migration.timiserver;
|
||||
|
||||
import com.imyeyu.api.util.PinyinUtil;
|
||||
import org.flywaydb.core.api.migration.BaseJavaMigration;
|
||||
import org.flywaydb.core.api.migration.Context;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
|
||||
/// 回填拼音搜索字段
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-21
|
||||
public class V37__backfill_pinyin_search extends BaseJavaMigration {
|
||||
|
||||
private static final int BATCH_SIZE = 500;
|
||||
|
||||
@Override
|
||||
public void migrate(Context context) throws Exception {
|
||||
backfillMultilingual(context.getConnection());
|
||||
backfillCustomer(context.getConnection());
|
||||
}
|
||||
|
||||
private void backfillMultilingual(Connection connection) throws Exception {
|
||||
try (PreparedStatement select = connection.prepareStatement("""
|
||||
SELECT `id`, `zh_cn`
|
||||
FROM `multilingual`
|
||||
WHERE `zh_cn` IS NOT NULL
|
||||
AND (`zh_cn_pinyin_full` IS NULL OR `zh_cn_pinyin_initial` IS NULL OR `zh_cn_pinyin_mixed` IS NULL)
|
||||
""");
|
||||
PreparedStatement update = connection.prepareStatement("""
|
||||
UPDATE `multilingual`
|
||||
SET `zh_cn_pinyin_full` = ?, `zh_cn_pinyin_initial` = ?, `zh_cn_pinyin_mixed` = ?
|
||||
WHERE `id` = ?
|
||||
""")) {
|
||||
try (ResultSet resultSet = select.executeQuery()) {
|
||||
int batchSize = 0;
|
||||
while (resultSet.next()) {
|
||||
addMultilingualBatch(update, resultSet.getString("id"), resultSet.getString("zh_cn"));
|
||||
batchSize++;
|
||||
if (batchSize >= BATCH_SIZE) {
|
||||
update.executeBatch();
|
||||
batchSize = 0;
|
||||
}
|
||||
}
|
||||
if (batchSize > 0) {
|
||||
update.executeBatch();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void backfillCustomer(Connection connection) throws Exception {
|
||||
try (PreparedStatement select = connection.prepareStatement("""
|
||||
SELECT `id`, `name`
|
||||
FROM `gao_customer`
|
||||
WHERE `name` IS NOT NULL
|
||||
AND (`name_pinyin_full` IS NULL OR `name_pinyin_initial` IS NULL OR `name_pinyin_mixed` IS NULL)
|
||||
""");
|
||||
PreparedStatement update = connection.prepareStatement("""
|
||||
UPDATE `gao_customer`
|
||||
SET `name_pinyin_full` = ?, `name_pinyin_initial` = ?, `name_pinyin_mixed` = ?
|
||||
WHERE `id` = ?
|
||||
""")) {
|
||||
try (ResultSet resultSet = select.executeQuery()) {
|
||||
int batchSize = 0;
|
||||
while (resultSet.next()) {
|
||||
addCustomerBatch(update, resultSet.getString("id"), resultSet.getString("name"));
|
||||
batchSize++;
|
||||
if (batchSize >= BATCH_SIZE) {
|
||||
update.executeBatch();
|
||||
batchSize = 0;
|
||||
}
|
||||
}
|
||||
if (batchSize > 0) {
|
||||
update.executeBatch();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void addMultilingualBatch(PreparedStatement update, String id, String value) throws Exception {
|
||||
update.setString(1, PinyinUtil.full(value));
|
||||
update.setString(2, PinyinUtil.initial(value));
|
||||
update.setString(3, PinyinUtil.mixed(value));
|
||||
update.setString(4, id);
|
||||
update.addBatch();
|
||||
}
|
||||
|
||||
private void addCustomerBatch(PreparedStatement update, String id, String value) throws Exception {
|
||||
update.setString(1, PinyinUtil.full(value));
|
||||
update.setString(2, PinyinUtil.initial(value));
|
||||
update.setString(3, PinyinUtil.mixed(value));
|
||||
update.setString(4, id);
|
||||
update.addBatch();
|
||||
}
|
||||
}
|
||||
@@ -51,3 +51,24 @@ cors:
|
||||
# 允许访问的客户端域名,如:http://web.xxx.com,* 表示不做任何限制(不做任何限制时 allow-credentials 无效)
|
||||
allow-origin:
|
||||
- "http://localhost:8080"
|
||||
|
||||
# 通知消息队列
|
||||
notify:
|
||||
queue:
|
||||
mail:
|
||||
enable: false
|
||||
cron: "*/10 * * * * *"
|
||||
default-from:
|
||||
sms:
|
||||
enable: false
|
||||
cron: "*/10 * * * * *"
|
||||
app-id:
|
||||
sign:
|
||||
secret-id:
|
||||
secret-key:
|
||||
wechat:
|
||||
enable: false
|
||||
cron: "*/10 * * * * *"
|
||||
http:
|
||||
enable: false
|
||||
cron: "*/10 * * * * *"
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
CREATE TABLE `feedback` (
|
||||
`id` CHAR(36) NOT NULL COMMENT '主键',
|
||||
`module` VARCHAR(32) NOT NULL COMMENT '所属模块',
|
||||
`user_id` CHAR(36) NULL COMMENT '提交用户 ID,匿名反馈为空',
|
||||
`content_id` VARCHAR(36) NOT NULL COMMENT '反馈内容文章 ID',
|
||||
`contact` VARCHAR(255) NULL COMMENT '联系方式',
|
||||
`ip` VARCHAR(64) NULL COMMENT '提交 IP',
|
||||
`status` VARCHAR(16) NOT NULL DEFAULT 'PENDING' COMMENT '处理状态',
|
||||
`response_id` VARCHAR(36) NULL COMMENT '管理员回复文章 ID',
|
||||
`responded_by` CHAR(36) NULL COMMENT '回复用户 ID',
|
||||
`responded_at` BIGINT NULL COMMENT '回复时间',
|
||||
`created_at` BIGINT NOT NULL COMMENT '创建时间',
|
||||
`updated_at` BIGINT NOT NULL COMMENT '更新时间',
|
||||
`deleted_at` BIGINT NULL COMMENT '删除时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_feedback_module_status_created` (`module`, `status`, `created_at`),
|
||||
KEY `idx_feedback_user_created` (`user_id`, `created_at`),
|
||||
KEY `idx_feedback_content_id` (`content_id`),
|
||||
KEY `idx_feedback_response_id` (`response_id`),
|
||||
KEY `idx_feedback_deleted_at` (`deleted_at`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '通用反馈';
|
||||
@@ -0,0 +1,72 @@
|
||||
ALTER TABLE `notify_detail`
|
||||
ADD COLUMN `read_at` BIGINT(20) COMMENT '已读时间' AFTER `status`,
|
||||
ADD INDEX `idx_site_user_read`(`msg_type` ASC, `send_to` ASC, `read_at` ASC, `created_at` ASC) USING BTREE;
|
||||
|
||||
CREATE TABLE `sms_queue` (
|
||||
`id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||
`notify_detail_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属通知详情 ID',
|
||||
`template_id` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '模板 ID',
|
||||
`data` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容',
|
||||
`args` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '参数',
|
||||
`send_to` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '发送去向',
|
||||
`send_at` BIGINT(20) COMMENT '发送时间',
|
||||
`retry` INT(11) COMMENT '重试计数',
|
||||
`timeout_at` BIGINT(20) COMMENT '超时时间',
|
||||
`created_at` BIGINT(20) COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_notify_detail_id`(`notify_detail_id` ASC) USING BTREE,
|
||||
INDEX `idx_send_at`(`send_at` ASC) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信推送队列' ROW_FORMAT = Dynamic;
|
||||
|
||||
CREATE TABLE `mail_queue` (
|
||||
`id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||
`notify_detail_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属通知详情 ID',
|
||||
`subject` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '标题',
|
||||
`data` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容',
|
||||
`args` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '参数',
|
||||
`attachments` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '附件',
|
||||
`send_from` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '发送来源',
|
||||
`send_to` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '发送去向',
|
||||
`send_at` BIGINT(20) COMMENT '发送时间',
|
||||
`retry` INT(11) COMMENT '重试计数',
|
||||
`timeout_at` BIGINT(20) COMMENT '超时时间',
|
||||
`created_at` BIGINT(20) COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_notify_detail_id`(`notify_detail_id` ASC) USING BTREE,
|
||||
INDEX `idx_send_at`(`send_at` ASC) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT = '邮件推送队列' ROW_FORMAT = Dynamic;
|
||||
|
||||
CREATE TABLE `http_queue` (
|
||||
`id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||
`notify_detail_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属通知详情 ID',
|
||||
`data` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容',
|
||||
`method` VARCHAR(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '请求方法',
|
||||
`args` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '参数',
|
||||
`send_to` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '发送去向',
|
||||
`send_at` BIGINT(20) COMMENT '发送时间',
|
||||
`retry` INT(11) COMMENT '重试计数',
|
||||
`timeout_at` BIGINT(20) COMMENT '超时时间',
|
||||
`created_at` BIGINT(20) COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_notify_detail_id`(`notify_detail_id` ASC) USING BTREE,
|
||||
INDEX `idx_send_at`(`send_at` ASC) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT = 'HTTP 推送队列' ROW_FORMAT = Dynamic;
|
||||
|
||||
CREATE TABLE `wechat_queue` (
|
||||
`id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||
`notify_detail_id` VARCHAR(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属通知详情 ID',
|
||||
`app_id` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '微信 AppId',
|
||||
`app_secret` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '微信 AppSecret',
|
||||
`template_id` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '模板 ID',
|
||||
`subject` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '标题',
|
||||
`data` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '内容',
|
||||
`args` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '参数',
|
||||
`send_to` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '发送去向',
|
||||
`send_at` BIGINT(20) COMMENT '发送时间',
|
||||
`retry` INT(11) COMMENT '重试计数',
|
||||
`timeout_at` BIGINT(20) COMMENT '超时时间',
|
||||
`created_at` BIGINT(20) COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_notify_detail_id`(`notify_detail_id` ASC) USING BTREE,
|
||||
INDEX `idx_send_at`(`send_at` ASC) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT = '微信消息推送队列' ROW_FORMAT = Dynamic;
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE `article`
|
||||
CHANGE COLUMN `digest` `description` LONGTEXT COLLATE utf8mb4_unicode_ci COMMENT '描述',
|
||||
ADD COLUMN `status` VARCHAR(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'NORMAL' COMMENT '文章状态,DART 草稿,NORMAL 正常,HIDDEN 隐藏' AFTER `likes`;
|
||||
@@ -0,0 +1,15 @@
|
||||
ALTER TABLE `multilingual`
|
||||
ADD COLUMN `zh_cn_pinyin_full` TEXT NULL COMMENT '简体中文全拼' AFTER `zh_cn`,
|
||||
ADD COLUMN `zh_cn_pinyin_initial` TEXT NULL COMMENT '简体中文拼音首字母' AFTER `zh_cn_pinyin_full`,
|
||||
ADD COLUMN `zh_cn_pinyin_mixed` TEXT NULL COMMENT '简体中文混合拼音' AFTER `zh_cn_pinyin_initial`,
|
||||
ADD KEY `idx_multilingual_zh_cn_pinyin_full` (`zh_cn_pinyin_full`(128)),
|
||||
ADD KEY `idx_multilingual_zh_cn_pinyin_initial` (`zh_cn_pinyin_initial`(128)),
|
||||
ADD KEY `idx_multilingual_zh_cn_pinyin_mixed` (`zh_cn_pinyin_mixed`(128));
|
||||
|
||||
ALTER TABLE `gao_customer`
|
||||
ADD COLUMN `name_pinyin_full` VARCHAR(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '姓名全拼' AFTER `name`,
|
||||
ADD COLUMN `name_pinyin_initial` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '姓名拼音首字母' AFTER `name_pinyin_full`,
|
||||
ADD COLUMN `name_pinyin_mixed` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '姓名混合拼音' AFTER `name_pinyin_initial`,
|
||||
ADD KEY `idx_gao_customer_store_name_pinyin_full` (`store_id`, `deleted_at`, `name_pinyin_full`(128)),
|
||||
ADD KEY `idx_gao_customer_store_name_pinyin_initial` (`store_id`, `deleted_at`, `name_pinyin_initial`),
|
||||
ADD KEY `idx_gao_customer_store_name_pinyin_mixed` (`store_id`, `deleted_at`, `name_pinyin_mixed`);
|
||||
@@ -0,0 +1,4 @@
|
||||
UPDATE `gao_point_ledger`
|
||||
SET `change_type` = 'CONSUME'
|
||||
WHERE `change_type` = 'EARN'
|
||||
AND `point_delta` < 0;
|
||||
@@ -1,7 +1,7 @@
|
||||
<?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.imyeyu.api.modules.common.mapper.AttachmentMapper">
|
||||
<select id="selectByBizIdList" resultType="com.imyeyu.api.modules.common.entity.Attachment">
|
||||
<select id="selectAllByBizIdList" resultType="com.imyeyu.api.modules.common.entity.Attachment">
|
||||
SELECT
|
||||
*
|
||||
FROM `attachment`
|
||||
|
||||
@@ -18,6 +18,46 @@
|
||||
</if>
|
||||
AND `deleted_at` IS NULL
|
||||
</select>
|
||||
<sql id="ownerKeywordWhere">
|
||||
`t`.`owner_type` = #{ownerType}
|
||||
<if test="ownerId != null and ownerId != ''">
|
||||
AND `t`.`owner_id` = #{ownerId}
|
||||
</if>
|
||||
<if test="keyword != null and keyword.trim() != ''">
|
||||
AND (
|
||||
`m`.`zh_cn` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`zh_tw` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`en_us` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`ru_ru` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`ja_jp` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`de_de` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`ko_kr` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `m`.`zh_cn_pinyin_full` LIKE CONCAT(#{keyword}, '%')
|
||||
OR `m`.`zh_cn_pinyin_initial` LIKE CONCAT(#{keyword}, '%')
|
||||
OR `m`.`zh_cn_pinyin_mixed` LIKE CONCAT(#{keyword}, '%')
|
||||
)
|
||||
</if>
|
||||
AND `t`.`deleted_at` IS NULL
|
||||
AND `m`.`deleted_at` IS NULL
|
||||
</sql>
|
||||
<select id="countByOwnerAndKeyword" resultType="long">
|
||||
SELECT COUNT(1)
|
||||
FROM `tag` `t`
|
||||
INNER JOIN `multilingual` `m`
|
||||
ON `m`.`id` = `t`.`name_lang_id`
|
||||
WHERE
|
||||
<include refid="ownerKeywordWhere" />
|
||||
</select>
|
||||
<select id="selectByOwnerAndKeyword" resultType="com.imyeyu.api.modules.common.entity.Tag">
|
||||
SELECT `t`.*
|
||||
FROM `tag` `t`
|
||||
INNER JOIN `multilingual` `m`
|
||||
ON `m`.`id` = `t`.`name_lang_id`
|
||||
WHERE
|
||||
<include refid="ownerKeywordWhere" />
|
||||
ORDER BY COALESCE(`t`.`updated_at`, `t`.`created_at`) DESC
|
||||
LIMIT #{offset}, #{limit}
|
||||
</select>
|
||||
<select id="selectByOwnerAndZhCN" resultType="com.imyeyu.api.modules.common.entity.Tag">
|
||||
SELECT
|
||||
`t`.*
|
||||
|
||||
@@ -29,6 +29,9 @@
|
||||
`c`.`code` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `c`.`name` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `c`.`telephone` LIKE CONCAT('%', #{keyword}, '%')
|
||||
OR `c`.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%')
|
||||
OR `c`.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%')
|
||||
OR `c`.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="tagIdList != null and !tagIdList.isEmpty()">
|
||||
|
||||
@@ -350,6 +350,22 @@
|
||||
r.`registered_date_value` ASC,
|
||||
r.`event_id` ASC
|
||||
</select>
|
||||
<select id="stateNumberValueDailyByRange" resultType="com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView">
|
||||
SELECT
|
||||
r.`event_id` AS `eventId`,
|
||||
r.`registered_date_value` AS `dateValue`,
|
||||
SUM(r.`number_value`) AS `dailyNumberValue`
|
||||
FROM `gao_event_record` r
|
||||
WHERE
|
||||
<include refid="storeChartRangeWhere"/>
|
||||
AND r.`number_value` IS NOT NULL
|
||||
GROUP BY
|
||||
r.`event_id`,
|
||||
r.`registered_date_value`
|
||||
ORDER BY
|
||||
r.`registered_date_value` ASC,
|
||||
r.`event_id` ASC
|
||||
</select>
|
||||
<select id="selectCalendarByRange" resultType="com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView">
|
||||
SELECT
|
||||
r.`id`,
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<select id="selectEarnByEventRecordId" resultType="com.imyeyu.api.modules.gao.entity.GaoPointLedger">
|
||||
<select id="selectRuleChangeByEventRecordId" resultType="com.imyeyu.api.modules.gao.entity.GaoPointLedger">
|
||||
SELECT *
|
||||
FROM `gao_point_ledger`
|
||||
WHERE `event_record_id` = #{eventRecordId}
|
||||
AND `change_type` = 'EARN'
|
||||
AND `change_type` IN ('EARN', 'CONSUME')
|
||||
AND `deleted_at` IS NULL
|
||||
ORDER BY `created_at` ASC, `id` ASC
|
||||
</select>
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
<?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.imyeyu.api.modules.gao.mapper.GaoPointRuleMapper">
|
||||
<select id="selectByIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoPointRule">
|
||||
SELECT *
|
||||
FROM gao_point_rule
|
||||
WHERE deleted_at IS NULL
|
||||
AND id IN
|
||||
<foreach collection="idList" item="id" separator="," open="(" close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<select id="selectActiveByStoreIdAndEventId" resultType="com.imyeyu.api.modules.gao.entity.GaoPointRule">
|
||||
SELECT *
|
||||
FROM `gao_point_rule`
|
||||
|
||||
Reference in New Issue
Block a user