畜牧产品产量登记

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.industryservice.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,14 +11,18 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizFarmerHousehold;
+import com.ruoyi.web.modules.industryservice.domain.BizYakDiseaseWarning;
 import com.ruoyi.web.modules.industryservice.domain.vo.FarmerHouseholdImportResultVo;
 import com.ruoyi.web.modules.industryservice.mapper.BizFarmerHouseholdMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizYakDiseaseWarningMapper;
 import com.ruoyi.web.modules.industryservice.service.IBizFarmerHouseholdService;
+import com.ruoyi.web.modules.industryservice.support.FarmerHouseholdDerivedSupport;
 import com.ruoyi.web.modules.industryservice.support.FarmerHouseholdExcelExporter;
 import com.ruoyi.web.modules.industryservice.support.FarmerHouseholdExcelParser;
 import com.ruoyi.web.modules.industryservice.support.FarmerHouseholdExcelParser.ParsedRow;
 import com.ruoyi.web.modules.industryservice.support.FarmerHouseholdValidation;
 import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
+import com.ruoyi.web.modules.industryservice.support.YakDiseaseWarningRules;
 import com.ruoyi.web.modules.industryservice.support.YakHerdInventoryMonthSupport;
 import com.ruoyi.web.modules.industryservice.support.YakHerdInventoryYearSupport;
 
@@ -30,6 +35,9 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
     @Autowired
     private BizFarmerHouseholdMapper bizFarmerHouseholdMapper;
 
+    @Autowired
+    private BizYakDiseaseWarningMapper bizYakDiseaseWarningMapper;
+
     @Autowired
     private TownDeptSupport townDeptSupport;
 
@@ -54,7 +62,9 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
     {
         FarmerHouseholdValidation.validateRowForSave(row, townDeptSupport);
         assertUniqueYearMonthVillage(row.getStatYear(), row.getStatMonth(), row.getVillageDeptId(), null);
-        return bizFarmerHouseholdMapper.insertBizFarmerHousehold(row);
+        int rows = bizFarmerHouseholdMapper.insertBizFarmerHousehold(row);
+        syncGrassImbalanceWarning(row);
+        return rows;
     }
 
     @Override
@@ -68,7 +78,9 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
         FarmerHouseholdValidation.validateRowForSave(row, townDeptSupport);
         requireExistingRow(row.getId());
         assertUniqueYearMonthVillage(row.getStatYear(), row.getStatMonth(), row.getVillageDeptId(), row.getId());
-        return bizFarmerHouseholdMapper.updateBizFarmerHousehold(row);
+        int rows = bizFarmerHouseholdMapper.updateBizFarmerHousehold(row);
+        syncGrassImbalanceWarning(row);
+        return rows;
     }
 
     @Override
@@ -91,7 +103,15 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
         {
             return 0;
         }
-        return bizFarmerHouseholdMapper.deleteBizFarmerHouseholdByIds(cleaned.toArray(new Long[0]));
+        Long[] householdIds = cleaned.toArray(new Long[0]);
+        List<String> deviceNos = new ArrayList<>();
+        for (Long householdId : householdIds)
+        {
+            deviceNos.add(YakDiseaseWarningRules.farmerHouseholdDeviceNo(householdId));
+        }
+        bizYakDiseaseWarningMapper.deleteByDataSourceAndDeviceNos(
+                YakDiseaseWarningRules.DATA_SOURCE_FARMER_HOUSEHOLD, deviceNos);
+        return bizFarmerHouseholdMapper.deleteBizFarmerHouseholdByIds(householdIds);
     }
 
     /**
@@ -195,6 +215,7 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
                 bizFarmerHouseholdMapper.insertBizFarmerHousehold(row);
                 result.setInsertCount(result.getInsertCount() + 1);
             }
+            syncGrassImbalanceWarning(row);
         }
         return result;
     }
@@ -245,6 +266,90 @@ public class BizFarmerHouseholdServiceImpl implements IBizFarmerHouseholdService
         return farmerHouseholdExcelExporter.export(statYear, statMonth, list, fillerName);
     }
 
+    /**
+     * 草畜失衡时写入 biz_yak_disease_warning；恢复平衡则删除对应预警。
+     * 定位键：data_source=farmer_household + device_no=FH-{id}
+     */
+    private void syncGrassImbalanceWarning(BizFarmerHousehold row)
+    {
+        if (row == null || row.getId() == null)
+        {
+            return;
+        }
+        String deviceNo = YakDiseaseWarningRules.farmerHouseholdDeviceNo(row.getId());
+        if (FarmerHouseholdDerivedSupport.isImbalanced(row))
+        {
+            Date now = new Date();
+            BizYakDiseaseWarning existing = bizYakDiseaseWarningMapper.selectByDataSourceAndDeviceNo(
+                    YakDiseaseWarningRules.DATA_SOURCE_FARMER_HOUSEHOLD, deviceNo);
+            BizYakDiseaseWarning warning = new BizYakDiseaseWarning();
+            warning.setDeviceNo(deviceNo);
+            warning.setDataSource(YakDiseaseWarningRules.DATA_SOURCE_FARMER_HOUSEHOLD);
+            warning.setWarningType(YakDiseaseWarningRules.WARNING_TYPE_GRASS_IMBALANCE);
+            warning.setPastureId(null);
+            warning.setPastureName(row.getVillageName());
+            warning.setYakNo(null);
+            warning.setAlertTime(now);
+            warning.setCollectTime(now);
+            warning.setLastSyncTime(now);
+            warning.setUpdateTime(now);
+            warning.setMeasuredValue(row.getYearEndStockSheepUnit() == null ? null
+                    : row.getYearEndStockSheepUnit().stripTrailingZeros().toPlainString());
+            warning.setReferenceRange(row.getApprovedCarryingCapacity() == null ? null
+                    : row.getApprovedCarryingCapacity().stripTrailingZeros().toPlainString());
+            warning.setAlertMessage(buildGrassImbalanceMessage(row));
+            if (existing == null)
+            {
+                warning.setCreateTime(now);
+                bizYakDiseaseWarningMapper.insertBizYakDiseaseWarning(warning);
+            }
+            else
+            {
+                warning.setId(existing.getId());
+                bizYakDiseaseWarningMapper.updateAlertContent(warning);
+            }
+        }
+        else
+        {
+            bizYakDiseaseWarningMapper.deleteByDataSourceAndDeviceNo(
+                    YakDiseaseWarningRules.DATA_SOURCE_FARMER_HOUSEHOLD, deviceNo);
+        }
+    }
+
+    private static String buildGrassImbalanceMessage(BizFarmerHousehold row)
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("草畜失衡预警：");
+        if (row.getStatYear() != null)
+        {
+            sb.append(row.getStatYear()).append("年");
+        }
+        if (row.getStatMonth() != null)
+        {
+            sb.append(row.getStatMonth()).append("月");
+        }
+        if (StringUtils.isNotEmpty(row.getTownName()) || StringUtils.isNotEmpty(row.getVillageName()))
+        {
+            sb.append(" ");
+            if (StringUtils.isNotEmpty(row.getTownName()))
+            {
+                sb.append(row.getTownName());
+            }
+            if (StringUtils.isNotEmpty(row.getVillageName()))
+            {
+                sb.append(row.getVillageName());
+            }
+        }
+        sb.append("：核定年末草畜平衡载畜量(")
+                .append(row.getApprovedCarryingCapacity() == null ? "-"
+                        : row.getApprovedCarryingCapacity().stripTrailingZeros().toPlainString())
+                .append(")小于年底牲畜存栏绵羊单位(")
+                .append(row.getYearEndStockSheepUnit() == null ? "-"
+                        : row.getYearEndStockSheepUnit().stripTrailingZeros().toPlainString())
+                .append(")");
+        return sb.toString();
+    }
+
     private void assertUniqueYearMonthVillage(Integer statYear, Integer statMonth, Long villageDeptId, Long excludeId)
     {
         if (bizFarmerHouseholdMapper.countByYearMonthAndVillageExcludeId(statYear, statMonth, villageDeptId,

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

@@ -29,6 +29,16 @@ public final class FarmerHouseholdDerivedSupport
         row.setSubsidyTotal(safeDec(row.getAfterCapFloorSubsidy()).add(safeDec(row.getVillageSupervisorSubsidy())));
     }
 
+    /** 核定载畜量 < 年底存栏绵羊单位 → 草畜失衡 */
+    public static boolean isImbalanced(BizFarmerHousehold row)
+    {
+        if (row == null || row.getApprovedCarryingCapacity() == null || row.getYearEndStockSheepUnit() == null)
+        {
+            return false;
+        }
+        return row.getApprovedCarryingCapacity().compareTo(row.getYearEndStockSheepUnit()) < 0;
+    }
+
     public static String normalizeYesNo(String value, String fieldLabel)
     {
         if (StringUtils.isEmpty(value))

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_AI_CONSULT = 5;
 
-    /** 家庭牧场草畜失衡 */
+    /** 草畜失衡（家庭牧场 / 农牧户填报触发） */
     public static final int WARNING_TYPE_GRASS_IMBALANCE = 6;
 
     public static final int WARNING_TYPE_OTHER = 9;
@@ -25,9 +25,15 @@ public final class YakDiseaseWarningRules
     /** 家庭牧场填报触发的草畜失衡预警 */
     public static final String DATA_SOURCE_FAMILY_RANCH = "family_ranch";
 
-    /** device_no 前缀，用于按牧场记录定位预警 */
+    /** 农牧户填报触发的草畜失衡预警 */
+    public static final String DATA_SOURCE_FARMER_HOUSEHOLD = "farmer_household";
+
+    /** device_no 前缀，用于按家庭牧场记录定位预警 */
     public static final String FAMILY_RANCH_DEVICE_PREFIX = "FR-";
 
+    /** device_no 前缀，用于按农牧户填报记录定位预警 */
+    public static final String FARMER_HOUSEHOLD_DEVICE_PREFIX = "FH-";
+
     public static final String MSG_DATE_RANGE_INVALID = "开始日期不能晚于结束日期";
 
     public static final String MSG_NOT_FOUND = "预警记录不存在";
@@ -45,6 +51,11 @@ public final class YakDiseaseWarningRules
         return FAMILY_RANCH_DEVICE_PREFIX + ranchId;
     }
 
+    public static String farmerHouseholdDeviceNo(Long householdId)
+    {
+        return FARMER_HOUSEHOLD_DEVICE_PREFIX + householdId;
+    }
+
     public static boolean isValidWarningType(Integer type)
     {
         return type != null && (type == WARNING_TYPE_TEMP || type == WARNING_TYPE_STEPS

doc/产业数据模型及服务/农牧户数据填报/农牧户数据填报功能需求.md

@@ -22,6 +22,7 @@
   - 补助奖励总资金 = 禁牧补助 + 草畜平衡奖励
   - 补助合计金额 = 封顶保底后享受补助奖励总资金 + 村级草原监督员补助
 - 封顶保底六项（是否是纯牧户等）按模板填写「是 / 否」。
+- 草畜失衡预警：核定年末草畜平衡载畜量 < 年底牲畜存栏（绵羊单位）时写入 **`biz_yak_disease_warning`**（`warning_type=6`，`data_source=farmer_household`，`device_no=FH-{id}`）；恢复平衡或删除记录时清除对应预警。不另建预警表。
 
 ---
 
@@ -32,7 +33,7 @@
 | 分页列表 | 筛选：年、月、乡镇；列：年、月、乡镇、村、户数、人数、草场承包总面积 |
 | 新增 / 修改 | 选村（级联）；新增默认本年本月；不展示派生小计（保存后详情可见） |
 | 详情 | 全部字段含派生 |
-| 删除 | 物理删除 |
+| 删除 | 物理删除（级联清预警） |
 | Excel 导入 | 多级表头；另选年月；按唯一键 upsert；任一行失败整批不写 |
 | Excel 导出 | 另选年月；**所属乡镇与列表一致**（打开时带入列表当前乡镇，可清空表示全部）；填表人=登录用户 |
 
@@ -49,3 +50,4 @@
 | 版本 | 说明 |
 | --- | --- |
 | 1.0 | 首版：CRUD + upsert 导入 + 导出；派生三项；村级唯一键 |
+| 1.1 | 补草畜失衡预警：写入疾病预警表 type=6 |

doc/产业数据模型及服务/农牧户数据填报/农牧户数据填报技术方案.md

@@ -23,6 +23,12 @@ Base Path：`/dataModel/farmerHousehold`
 - 主表 `biz_farmer_household`
 - 唯一键 `(stat_year, stat_month, village_dept_id)`
 - 派生落库：`pasture_contract_area`、`subsidy_reward_subtotal`、`subsidy_total`
+- 草畜失衡预警：**复用** `biz_yak_disease_warning`
+  - `warning_type = 6`（草畜失衡）
+  - `data_source = farmer_household`
+  - `device_no = FH-{id}`（定位/去重）
+  - `pasture_name` = 村名；`measured_value` = 存栏绵羊单位；`reference_range` = 核定载畜量
+  - 失衡 upsert；平衡或删除填报记录时按 `data_source + device_no` 删除
 
 ## 3. Excel
 

doc/产业数据模型及服务/农牧户数据填报/农牧户数据填报测试用例.md

@@ -15,6 +15,7 @@
 | API-005 | 导出 | 选年月导出；可选乡镇；派生列回写；填表人为当前用户 |
 | API-005a | 列表已选乡镇后导出 | 导出弹窗所属乡镇与列表一致；传 `townDeptId` 仅该乡镇 |
 | API-005b | 导出弹窗清空乡镇 | 不传 `townDeptId`，导出全部乡镇 |
+| API-006 | 草畜失衡 | 载畜量<存栏绵羊单位 → `biz_yak_disease_warning` 有 `warning_type=6`、`data_source=farmer_household` 记录；改平衡后该预警消失 |
 | UI-001 | 列表筛选 | 年/月/乡镇 |
 | UI-002 | 表单村级联 | 只选村；新增默认本年本月 |
 | UI-003 | 列表选某乡镇后打开导出 | 标签/选项与列表相同，且已选中该乡镇 |

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

@@ -71,7 +71,7 @@
 | `3` | 检疫集中预警 |
 | `4` | 诊疗集中预警 |
 | `5` | AI问诊集中预警 |
-| `6` | 草畜失衡（家庭牧场填报触发，`data_source=family_ranch`） |
+| `6` | 草畜失衡（家庭牧场 `data_source=family_ranch`；农牧户 `data_source=farmer_household`） |
 | `9` | 其他 |
 
 第三方无类型码时，仅写 `alert_message`，`warning_type` 可空或由文案解析填充。