From 3c5bfc8ad1fe5295ae415a3f3c36d1247d81cd05 Mon Sep 17 00:00:00 2001
From: pengjie <2413927716@qq.com>
Date: Fri, 26 Jun 2026 15:09:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(emergency):=20=E4=BF=AE=E5=A4=8D=E5=AE=A3?=
 =?UTF-8?q?=E6=95=99=E6=A8=A1=E5=9D=973=E4=B8=AA=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9C=BA=E4=B8=8E=E5=85=BC=E5=AE=B9=E6=80=A7=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../com/renkang/emergency/entity/FirstAidResource.java   | 2 +-
 .../service/impl/FirstAidResourceServiceImpl.java        | 4 ++++
 .../impl/FirstAidResourceUserActionServiceImpl.java      | 9 +++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java
index 3d3b670..abea25e 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java
@@ -91,7 +91,7 @@ public class FirstAidResource implements Serializable {
 
     /** 审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)，值由 FirstAidConstants 常量控制 */
     @Schema(title = "审核状态(null=无审核,10=待审核,11=已通过,12=已驳回)")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private Integer auditStatus;
 
     /** 驳回原因 */
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceServiceImpl.java
index b9e4220..e4caab4 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceServiceImpl.java
@@ -129,6 +129,10 @@ public class FirstAidResourceServiceImpl extends ServiceImpl<FirstAidResourceMap
         if (resource == null) {
             throw new RuntimeException("资源不存在");
         }
+        // 已提交审核的不允许重复提交
+        if (FirstAidConstants.AUDIT_STATUS_PENDING.equals(resource.getAuditStatus())) {
+            throw new RuntimeException("已提交审核，请勿重复操作");
+        }
         // 仅草稿或已驳回状态可提交审核
         if (!FirstAidConstants.STATUS_DRAFT.equals(resource.getStatus())) {
             if (!FirstAidConstants.AUDIT_STATUS_REJECTED.equals(resource.getAuditStatus())) {
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceUserActionServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceUserActionServiceImpl.java
index e53d373..6afc301 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceUserActionServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/FirstAidResourceUserActionServiceImpl.java
@@ -43,8 +43,9 @@ public class FirstAidResourceUserActionServiceImpl extends ServiceImpl<FirstAidR
         action.setType(FirstAidConstants.ACTION_TYPE_READ);
         try {
             save(action);
-        } catch (org.springframework.dao.DuplicateKeyException e) {
-            return false; // 已有阅读记录
+        } catch (Exception e) {
+            // 重复键异常（兼容DM8/MySQL/PG等不同数据库驱动的异常类型差异）
+            return false;
         }
         resourceMapper.incrementViewCount(resourceId);
         return true;
@@ -61,8 +62,8 @@ public class FirstAidResourceUserActionServiceImpl extends ServiceImpl<FirstAidR
             save(action);
             resourceMapper.incrementFavoriteCount(resourceId);
             return true;
-        } catch (org.springframework.dao.DuplicateKeyException e) {
-            // 已收藏 → 取消收藏
+        } catch (Exception e) {
+            // 重复键异常（兼容DM8/MySQL/PG等不同数据库驱动的异常类型差异）
             LambdaQueryWrapper<FirstAidResourceUserAction> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(FirstAidResourceUserAction::getResourceId, resourceId)
                     .eq(FirstAidResourceUserAction::getUserId, userId)