交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/BizYakDiseaseWarning.java

@@ -15,8 +15,6 @@ public class BizYakDiseaseWarning extends BaseEntity
 
     private Long id;
 
-    private String externalAlertId;
-
     private String yakNo;
 
     private Long pastureId;
@@ -75,16 +73,6 @@ public class BizYakDiseaseWarning extends BaseEntity
         this.id = id;
     }
 
-    public String getExternalAlertId()
-    {
-        return externalAlertId;
-    }
-
-    public void setExternalAlertId(String externalAlertId)
-    {
-        this.externalAlertId = externalAlertId;
-    }
-
     public String getYakNo()
     {
         return yakNo;

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/dto/YakDiseaseWarningDto.java

@@ -4,12 +4,10 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
- * 第三方牦牛疾病预警 DTO。
+ * 本地规则分析生成的疾病预警 DTO。
  */
 public class YakDiseaseWarningDto
 {
-    private String externalAlertId;
-
     private String yakNo;
 
     private String pastureName;
@@ -32,16 +30,6 @@ public class YakDiseaseWarningDto
 
     private String yakAvatarUrl;
 
-    public String getExternalAlertId()
-    {
-        return externalAlertId;
-    }
-
-    public void setExternalAlertId(String externalAlertId)
-    {
-        this.externalAlertId = externalAlertId;
-    }
-
     public String getYakNo()
     {
         return yakNo;

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/mapper/BizYakDiseaseWarningMapper.java

@@ -7,11 +7,7 @@ public interface BizYakDiseaseWarningMapper
 {
     BizYakDiseaseWarning selectBizYakDiseaseWarningById(Long id);
 
-    BizYakDiseaseWarning selectByExternalAlertId(String externalAlertId);
-
     List<BizYakDiseaseWarning> selectBizYakDiseaseWarningList(BizYakDiseaseWarning query);
 
     int insertBizYakDiseaseWarning(BizYakDiseaseWarning row);
-
-    int updateBizYakDiseaseWarning(BizYakDiseaseWarning row);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/service/YakDiseaseWarningAnalyzer.java

@@ -121,7 +121,6 @@ public class YakDiseaseWarningAnalyzer
         String region = StringUtils.isNotEmpty(anchor.getRegionKey()) ? anchor.getRegionKey() : "未知地区";
         String day = dayKey(anchor.getRecordTime());
         YakDiseaseWarningDto dto = new YakDiseaseWarningDto();
-        dto.setExternalAlertId((quarantineMode ? "WARN-Q:" : "WARN-D:") + region + ":" + day);
         dto.setYakNo(StringUtils.isNotEmpty(anchor.getYakNo()) ? anchor.getYakNo() : "未知");
         dto.setPastureName(anchor.getFarmName());
         dto.setAlertTime(latestTime(hits, syncTime));

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/service/YakDiseaseWarningSyncTxService.java

@@ -27,7 +27,7 @@ public class YakDiseaseWarningSyncTxService
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public boolean persistAlert(YakDiseaseWarningDto dto, Date syncTime)
     {
-        if (dto == null || StringUtils.isEmpty(dto.getExternalAlertId()))
+        if (dto == null)
         {
             throw new ServiceException("预警数据无效");
         }
@@ -44,7 +44,6 @@ public class YakDiseaseWarningSyncTxService
             throw new ServiceException("预警类型无效");
         }
         BizYakDiseaseWarning row = new BizYakDiseaseWarning();
-        row.setExternalAlertId(dto.getExternalAlertId().trim());
         row.setYakNo(dto.getYakNo().trim());
         row.setAlertTime(dto.getAlertTime());
         row.setWarningType(dto.getWarningType());
@@ -55,23 +54,15 @@ public class YakDiseaseWarningSyncTxService
         row.setYakAvatarUrl(StringUtils.trim(dto.getYakAvatarUrl()));
         row.setAlertMessage(YakDiseaseWarningValidation.buildAlertMessage(dto.getWarningType(), row.getMeasuredValue(),
                 row.getReferenceRange(), dto.getAlertMessage()));
-        row.setDataSource(YakDiseaseWarningRules.DATA_SOURCE_THIRD_PARTY);
+        row.setDataSource(YakDiseaseWarningRules.DATA_SOURCE_LOCAL);
         row.setLastSyncTime(syncTime);
         resolvePasture(row, dto.getPastureName());
 
-        BizYakDiseaseWarning existing = warningMapper.selectByExternalAlertId(row.getExternalAlertId());
         Date now = syncTime != null ? syncTime : new Date();
-        if (existing == null)
-        {
-            row.setCreateTime(now);
-            row.setUpdateTime(now);
-            warningMapper.insertBizYakDiseaseWarning(row);
-            return true;
-        }
-        row.setId(existing.getId());
+        row.setCreateTime(now);
         row.setUpdateTime(now);
-        warningMapper.updateBizYakDiseaseWarning(row);
-        return false;
+        warningMapper.insertBizYakDiseaseWarning(row);
+        return true;
     }
 
     private void resolvePasture(BizYakDiseaseWarning row, String pastureName)

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/YakDiseaseWarningRules.java

@@ -15,7 +15,7 @@ public final class YakDiseaseWarningRules
 
     public static final int WARNING_TYPE_OTHER = 9;
 
-    public static final String DATA_SOURCE_THIRD_PARTY = "third_party";
+    public static final String DATA_SOURCE_LOCAL = "local_analysis";
 
     public static final String MSG_DATE_RANGE_INVALID = "开始日期不能晚于结束日期";
 

baqing-admin/src/main/resources/mapper/industryservice/BizYakDiseaseWarningMapper.xml

@@ -4,7 +4,6 @@
 
     <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizYakDiseaseWarning" id="BizYakDiseaseWarningResult">
         <id     property="id"               column="id"/>
-        <result property="externalAlertId"  column="external_alert_id"/>
         <result property="yakNo"            column="yak_no"/>
         <result property="pastureId"        column="pasture_id"/>
         <result property="pastureName"      column="pasture_name"/>
@@ -23,7 +22,7 @@
     </resultMap>
 
     <sql id="selectVo">
-        select id, external_alert_id, yak_no, pasture_id, pasture_name, alert_time, alert_message,
+        select id, yak_no, pasture_id, pasture_name, alert_time, alert_message,
                warning_type, measured_value, reference_range, device_no, collect_time, yak_avatar_url,
                data_source, last_sync_time, create_time, update_time
         from biz_yak_disease_warning
@@ -34,11 +33,6 @@
         where id = #{id}
     </select>
 
-    <select id="selectByExternalAlertId" parameterType="string" resultMap="BizYakDiseaseWarningResult">
-        <include refid="selectVo"/>
-        where external_alert_id = #{externalAlertId}
-    </select>
-
     <select id="selectBizYakDiseaseWarningList" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakDiseaseWarning"
             resultMap="BizYakDiseaseWarningResult">
         <include refid="selectVo"/>
@@ -65,32 +59,13 @@
     <insert id="insertBizYakDiseaseWarning" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakDiseaseWarning"
             useGeneratedKeys="true" keyProperty="id">
         insert into biz_yak_disease_warning (
-            external_alert_id, yak_no, pasture_id, pasture_name, alert_time, alert_message,
+            yak_no, pasture_id, pasture_name, alert_time, alert_message,
             warning_type, measured_value, reference_range, device_no, collect_time, yak_avatar_url,
             data_source, last_sync_time, create_time, update_time
         ) values (
-            #{externalAlertId}, #{yakNo}, #{pastureId}, #{pastureName}, #{alertTime}, #{alertMessage},
+            #{yakNo}, #{pastureId}, #{pastureName}, #{alertTime}, #{alertMessage},
             #{warningType}, #{measuredValue}, #{referenceRange}, #{deviceNo}, #{collectTime}, #{yakAvatarUrl},
             #{dataSource}, #{lastSyncTime}, #{createTime}, #{updateTime}
         )
     </insert>
-
-    <update id="updateBizYakDiseaseWarning" parameterType="com.ruoyi.web.modules.industryservice.domain.BizYakDiseaseWarning">
-        update biz_yak_disease_warning
-        set yak_no = #{yakNo},
-            pasture_id = #{pastureId},
-            pasture_name = #{pastureName},
-            alert_time = #{alertTime},
-            alert_message = #{alertMessage},
-            warning_type = #{warningType},
-            measured_value = #{measuredValue},
-            reference_range = #{referenceRange},
-            device_no = #{deviceNo},
-            collect_time = #{collectTime},
-            yak_avatar_url = #{yakAvatarUrl},
-            data_source = #{dataSource},
-            last_sync_time = #{lastSyncTime},
-            update_time = #{updateTime}
-        where id = #{id}
-    </update>
 </mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/YakDiseaseWarningTestSamples.java

@@ -18,8 +18,6 @@ public final class YakDiseaseWarningTestSamples
 
     public static final Long OTHER_WARNING_ID = 8999L;
 
-    public static final String EXTERNAL_ID = "TP-ALERT-001";
-
     private YakDiseaseWarningTestSamples()
     {
     }
@@ -28,7 +26,6 @@ public final class YakDiseaseWarningTestSamples
     {
         BizYakDiseaseWarning row = new BizYakDiseaseWarning();
         row.setId(WARNING_ID);
-        row.setExternalAlertId(EXTERNAL_ID);
         row.setYakNo("YAK-W-001");
         row.setPastureId(PASTURE_P1);
         row.setPastureName("牧场甲");
@@ -37,7 +34,7 @@ public final class YakDiseaseWarningTestSamples
         row.setWarningType(YakDiseaseWarningRules.WARNING_TYPE_TEMP);
         row.setMeasuredValue("39.8℃");
         row.setReferenceRange("正常体温参考范围");
-        row.setDataSource(YakDiseaseWarningRules.DATA_SOURCE_THIRD_PARTY);
+        row.setDataSource(YakDiseaseWarningRules.DATA_SOURCE_LOCAL);
         return row;
     }
 
@@ -47,7 +44,6 @@ public final class YakDiseaseWarningTestSamples
         row.setId(OTHER_WARNING_ID);
         row.setPastureId(PASTURE_P2);
         row.setPastureName("牧场乙");
-        row.setExternalAlertId("TP-ALERT-OTHER");
         return row;
     }
 

doc/产业数据模型及服务/牦牛疾病预警/牦牛疾病预警功能需求.md

@@ -200,7 +200,7 @@ flowchart LR
 | 拉取范围 | 分页拉取三类 OpenAPI：**检疫记录**、**诊疗记录**、**养殖过程记录**（与 Apifox 文档一致）；按 `external_id` 合并写入本地健康源表 |
 | 分析生成 | 同步完成后，对 `analyzed_flag=0` 的源记录执行集中判断：**检疫**同地区同日异常/阳性 ≥3 条 → 健康预警；**诊疗**同地区同日 ≥3 条 → 健康预警；**养殖过程**本期仅标记已分析、不产预警 |
 | 已分析标记 | 参与判断的源记录在分析后置 **已分析**，下次同步不再重复判断 |
-| 预警去重 | 集中预警以「类型 + 地区 + 自然日」生成唯一 `external_alert_id`；重复同步时**更新**预警文案而非重复插多条 |
+| 预警去重 | 源记录分析后置 **已分析**，同一条健康源不再重复触发；预警表无第三方 ID，按分析批次插入 |
 | 成功反馈 | 提示完成及摘要（源记录新增/更新条数、预警生成计入新增摘要）；列表宜可刷新 |
 | 失败反馈 | 明确原因（超时、鉴权失败等）；**不删除**已有本地数据 |
 | 部分成功 | 宜区分成功/失败条数（单条源记录映射失败记 `failCount`） |

doc/产业数据模型及服务/牦牛疾病预警/牦牛疾病预警技术方案.md

@@ -22,7 +22,7 @@
 | --- | --- |
 | 健康源同步 | 分页拉取检疫/诊疗/养殖过程 OpenAPI；以 `external_id`（`Q:`/`D:`/`B:` + 第三方 ID）**唯一** upsert 至 `biz_yak_health_source_record` |
 | 预警生成 | 对 `analyzed_flag=0` 记录集中分析；检疫异常/阳性、诊疗同区同日 ≥3 条写入 `biz_yak_disease_warning`；分析后标记源记录已分析 |
-| 预警合并 | 以 `external_alert_id`（如 `WARN-Q:{regionKey}:{yyyy-MM-dd}`）**唯一**；有则更新，无则插入 |
+| 预警生成 | 健康源分析后**插入**预警记录；源记录 `analyzed_flag=1` 后不再重复分析 |
 | 列表/详情 | 无 `del_flag` 删除需求；全量展示有效同步记录；排序 `alert_time DESC, id DESC` |
 | 日期筛选 | `startDate`/`endDate`（`yyyy-MM-dd`）转当日 00:00:00～23:59:59（`Asia/Shanghai`） |
 | 牧场权限 | 列表/详情/移动端按用户可见 `pasture_id` 过滤（`@DataScope` 或 Service 注入牧场 ID 集合） |
@@ -37,7 +37,6 @@
 | 字段 | 类型 | 非空 | 说明 |
 | --- | --- | --- | --- |
 | `id` | `bigint(20)` | Y | 主键 |
-| `external_alert_id` | `varchar(64)` | Y | 第三方预警唯一 ID，**去重键** |
 | `yak_no` | `varchar(64)` | Y | 牦牛编号 |
 | `pasture_id` | `bigint(20)` | N | 映射 `biz_pasture.id` 成功时写入 |
 | `pasture_name` | `varchar(128)` | N | 所属牧场名称（冗余展示） |
@@ -58,7 +57,6 @@
 | 索引 | 字段 | 用途 |
 | --- | --- | --- |
 | `PRIMARY` | `id` | 主键 |
-| `UNIQUE uk_external_alert` | `external_alert_id` | 同步幂等 |
 | `KEY idx_alert_time` | `alert_time` | 列表排序、日期范围 |
 | `KEY idx_pasture_time` | `pasture_id`, `alert_time` | 牧场 + 时间筛选 |
 | `KEY idx_yak_no` | `yak_no` | 关联档案、产业统计去重 |
@@ -81,7 +79,6 @@
 ```sql
 CREATE TABLE `biz_yak_disease_warning` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `external_alert_id` varchar(64) NOT NULL COMMENT '第三方预警ID',
   `yak_no` varchar(64) NOT NULL COMMENT '牦牛编号',
   `pasture_id` bigint(20) DEFAULT NULL COMMENT '牧场ID',
   `pasture_name` varchar(128) DEFAULT NULL COMMENT '所属牧场名称',
@@ -93,12 +90,11 @@ CREATE TABLE `biz_yak_disease_warning` (
   `device_no` varchar(64) DEFAULT NULL COMMENT '设备编号',
   `collect_time` datetime DEFAULT NULL COMMENT '采集时间',
   `yak_avatar_url` varchar(512) DEFAULT NULL COMMENT '头像URL',
-  `data_source` varchar(32) DEFAULT 'third_party' COMMENT '数据来源',
+  `data_source` varchar(32) DEFAULT 'local_analysis' COMMENT '数据来源',
   `last_sync_time` datetime DEFAULT NULL COMMENT '最近同步时间',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_external_alert` (`external_alert_id`),
   KEY `idx_alert_time` (`alert_time`),
   KEY `idx_pasture_time` (`pasture_id`,`alert_time`),
   KEY `idx_yak_no` (`yak_no`),

doc/产业数据模型及服务/牦牛疾病预警/牦牛疾病预警测试用例.md

@@ -18,7 +18,6 @@
 | **AW1** | 近期预警 | `yak_no=YAK-W-001`，`pasture_id=P1`，`alert_time` 为 3 日内；`alert_message` 含「体温异常」 |
 | **AW2** | 超窗预警 | 同 P1，`alert_time` 为 4 个月前 |
 | **AW3** | 越权样本 | 归属 P2；UA 列表/详情应不可见 |
-| **AW-TP1** | 同步键 | `external_alert_id=TP-ALERT-001`；首次同步 insert，二次改 `alert_message` 为 update |
 
 **界面（UI）测试**：**Playwright** + **Chromium**（`channel: 'chrome'` 使用本机 **Google Chrome**）。菜单组件路径以 `dataModel/yakDiseaseWarning/index` 为准。
 
@@ -36,7 +35,7 @@
 | ZCZX-MYNBJY-UT-006 | 枚举 | warning_type 非法 | 单元测试 | JUnit5 | 枚举边界 | 无 | 入参 0、5、null（若业务禁止） | 映射失败或落 null（与实现一致并固定） |
 | ZCZX-MYNBJY-UT-007 | 文案拼接 | 组装 alert_message | 单元测试 | JUnit5 | 技术方案 §4 | 无 | `measured=39.8℃`、`reference=正常体温`、`type=1` | 生成文案含实测值、参考范围、体温异常语义 |
 | ZCZX-MYNBJY-UT-008 | 同步合并 | 源记录 external_id 新增 | 单元测试 | JUnit5+Mockito | 幂等 | DB 无 Q:2001 | `persistSourceRecord` | `insert`；`insertCount+1` |
-| ZCZX-MYNBJY-UT-009 | 同步合并 | 预警 external_alert_id 更新 | 单元测试 | JUnit5+Mockito | 去重 | 已有 WARN-Q:… | 同键再分析 | `update`；列表仅 1 行 |
+| ZCZX-MYNBJY-UT-009 | 预警入库 | 分析生成 insert | 单元测试 | JUnit5+Mockito | 本地分析 | DB 无对应预警 | `persistAlert` | `insert`；返回 true |
 | ZCZX-MYNBJY-UT-021 | 分析规则 | 检疫集中阈值 | 单元测试 | JUnit5+Mockito | 功能需求 §5 | 同区同日 3 条阳性/异常 | `analyzeAndGenerate` | 生成 1 条 `warning_type=3`；源记录已分析 |
 | ZCZX-MYNBJY-UT-022 | 分析规则 | 诊疗集中阈值 | 单元测试 | JUnit5+Mockito | 功能需求 §5 | 同区同日 3 条诊疗 | `analyzeAndGenerate` | 生成 1 条 `warning_type=4` |
 | ZCZX-MYNBJY-UT-023 | 映射 | 检疫 OpenAPI → 源表 | 单元测试 | JUnit5 | 技术方案 §4 | 样例 DTO | `HealthRecordOpenApiMapper.fromQuarantine` | `external_id=Q:{id}`；`analyzed_flag=0` |

sql/biz_yak_disease_warning.sql

@@ -1,24 +1,22 @@
 -- 牦牛疾病预警
 CREATE TABLE IF NOT EXISTS `biz_yak_disease_warning` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `external_alert_id` varchar(64) NOT NULL COMMENT '第三方预警ID',
   `yak_no` varchar(64) NOT NULL COMMENT '牦牛编号',
   `pasture_id` bigint(20) DEFAULT NULL COMMENT '牧场ID',
   `pasture_name` varchar(128) DEFAULT NULL COMMENT '所属牧场名称',
   `alert_time` datetime NOT NULL COMMENT '预警时间',
   `alert_message` varchar(1024) NOT NULL COMMENT '预警信息',
-  `warning_type` tinyint(4) DEFAULT NULL COMMENT '1体温 2运动量 9其他',
+  `warning_type` tinyint(4) DEFAULT NULL COMMENT '1体温 2运动量 3检疫集中 4诊疗集中 9其他',
   `measured_value` varchar(128) DEFAULT NULL COMMENT '实测值',
   `reference_range` varchar(128) DEFAULT NULL COMMENT '参考范围',
   `device_no` varchar(64) DEFAULT NULL COMMENT '设备编号',
   `collect_time` datetime DEFAULT NULL COMMENT '采集时间',
   `yak_avatar_url` varchar(512) DEFAULT NULL COMMENT '头像URL',
-  `data_source` varchar(32) DEFAULT 'third_party' COMMENT '数据来源',
+  `data_source` varchar(32) DEFAULT 'local_analysis' COMMENT '数据来源',
   `last_sync_time` datetime DEFAULT NULL COMMENT '最近同步时间',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_external_alert` (`external_alert_id`),
   KEY `idx_alert_time` (`alert_time`),
   KEY `idx_pasture_time` (`pasture_id`,`alert_time`),
   KEY `idx_yak_no` (`yak_no`),