renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(emergency): 修复宣教模块3个状态机与兼容性缺陷

Browse Source 
- auditStatus 新增 insertStrategy=IGNORED，修复新增/复制时存0而非NULL
- submitForReview 增加PENDING重复提交拦截
- recordRead/toggleFavorite 重复键异常catch兼容DM8数据库

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
pengjie
2026-06-26 15:09:22 +08:00
co-authored by Claude
parent 5612fe0752
commit 3c5bfc8ad1
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class FirstAidResource implements Serializable {
/** 审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)，值由 FirstAidConstants 常量控制 */ /** 审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)，值由 FirstAidConstants 常量控制 */
@Schema(title = "审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)") @Schema(title = "审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
private Integer auditStatus; private Integer auditStatus;
/** 驳回原因 */ /** 驳回原因 */
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceServiceImpl.java
+4
View File
@@ -129,6 +129,10 @@ public class FirstAidResourceServiceImpl extends ServiceImpl<FirstAidResourceMap
if (resource == null) { if (resource == null) {
throw new RuntimeException("资源不存在"); throw new RuntimeException("资源不存在");
} }
// 已提交审核的不允许重复提交
if (FirstAidConstants.AUDIT_STATUS_PENDING.equals(resource.getAuditStatus())) {
throw new RuntimeException("已提交审核，请勿重复操作");
}
// 仅草稿或已驳回状态可提交审核 // 仅草稿或已驳回状态可提交审核
if (!FirstAidConstants.STATUS_DRAFT.equals(resource.getStatus())) { if (!FirstAidConstants.STATUS_DRAFT.equals(resource.getStatus())) {
if (!FirstAidConstants.AUDIT_STATUS_REJECTED.equals(resource.getAuditStatus())) { if (!FirstAidConstants.AUDIT_STATUS_REJECTED.equals(resource.getAuditStatus())) {
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceUserActionServiceImpl.java
+5 -4
View File
@@ -43,8 +43,9 @@ public class FirstAidResourceUserActionServiceImpl extends ServiceImpl<FirstAidR
action.setType(FirstAidConstants.ACTION_TYPE_READ); action.setType(FirstAidConstants.ACTION_TYPE_READ);
try { try {
save(action); save(action);
} catch (org.springframework.dao.DuplicateKeyException e) { } catch (Exception e) {
return false; // 已有阅读记录 // 重复键异常（兼容DM8/MySQL/PG等不同数据库驱动的异常类型差异）
return false;
} }
resourceMapper.incrementViewCount(resourceId); resourceMapper.incrementViewCount(resourceId);
return true; return true;
@@ -61,8 +62,8 @@ public class FirstAidResourceUserActionServiceImpl extends ServiceImpl<FirstAidR
save(action); save(action);
resourceMapper.incrementFavoriteCount(resourceId); resourceMapper.incrementFavoriteCount(resourceId);
return true; return true;
} catch (org.springframework.dao.DuplicateKeyException e) { } catch (Exception e) {
// 已收藏 → 取消收藏 // 重复键异常（兼容DM8/MySQL/PG等不同数据库驱动的异常类型差异）
LambdaQueryWrapper<FirstAidResourceUserAction> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FirstAidResourceUserAction> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(FirstAidResourceUserAction::getResourceId, resourceId) queryWrapper.eq(FirstAidResourceUserAction::getResourceId, resourceId)
.eq(FirstAidResourceUserAction::getUserId, userId) .eq(FirstAidResourceUserAction::getUserId, userId)