畜牧资源

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/controller/LivestockResourceScreenController.java

@@ -10,10 +10,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
 
 /**
- * 大屏 — 畜牧资源（AI 问诊）统计（只读）。
+ * 大屏 — 畜牧资源统计（只读）。
  * <p>
- * 数据来源：AI 咨询会话与消息表（{@code biz_consult_session} / {@code biz_consult_message}），
- * 统计活跃、分类占比、时段热力、回复成功率及本地分词关键词 Top30。
+ * 看板含产业总览、三资、产量、疫苗、线下预约、特派员/事业单位、农技课堂、实战培训等；
+ * 已屏蔽 AI 问诊相关区块（活跃度、用户结构、分类、模型调用、分时、会话分布、状态、热门、关键词）。
  *
  * @see ILivestockResourceScreenService
  */
@@ -25,7 +25,7 @@ public class LivestockResourceScreenController extends BaseController
     private ILivestockResourceScreenService livestockResourceScreenService;
 
     /**
-     * 畜牧资源看板；统计年为当前年时额外包含「今日」实时指标。
+     * 畜牧资源看板一屏数据（已屏蔽 AI 问诊九区块）。
      *
      * @param statYear 统计年份
      */

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/HomeScreenIndustryOverviewVo.java

@@ -3,6 +3,9 @@ package com.ruoyi.web.modules.screen.domain.vo;
 import java.math.BigDecimal;
 /**
  * 首页产业总览指标。
+ * <p>
+ * 已屏蔽：供应商/承销商/市场、草场块数。
+ * </p>
  */
 public class HomeScreenIndustryOverviewVo
 {
@@ -20,16 +23,8 @@ public class HomeScreenIndustryOverviewVo
     private int largeLivestockFarmerCount;
     /** 产业总览「有畜户数」（户）：所选年最大填报月全县村级 {@code with_livestock_household_count} 合计 */
     private int withLivestockHouseholdCount;
-    /** 草场块数（草场台账快照，供草场类型区块使用） */
-    private int grasslandCount;
     /** 产业总览「草场面积」（亩）：所选年最大填报月全县村级 {@code pasture_contract_area} 合计 */
     private BigDecimal grasslandAreaMu;
-    /** 入驻供应商数 */
-    private int supplierCount;
-    /** 入驻承销商数 */
-    private int distributorCount;
-    /** 交易市场数 */
-    private int tradeMarketCount;
 
     public int getInventoryTotal()
     {
@@ -101,16 +96,6 @@ public class HomeScreenIndustryOverviewVo
         this.withLivestockHouseholdCount = withLivestockHouseholdCount;
     }
 
-    public int getGrasslandCount()
-    {
-        return grasslandCount;
-    }
-
-    public void setGrasslandCount(int grasslandCount)
-    {
-        this.grasslandCount = grasslandCount;
-    }
-
     public BigDecimal getGrasslandAreaMu()
     {
         return grasslandAreaMu;
@@ -120,34 +105,4 @@ public class HomeScreenIndustryOverviewVo
     {
         this.grasslandAreaMu = grasslandAreaMu;
     }
-
-    public int getSupplierCount()
-    {
-        return supplierCount;
-    }
-
-    public void setSupplierCount(int supplierCount)
-    {
-        this.supplierCount = supplierCount;
-    }
-
-    public int getDistributorCount()
-    {
-        return distributorCount;
-    }
-
-    public void setDistributorCount(int distributorCount)
-    {
-        this.distributorCount = distributorCount;
-    }
-
-    public int getTradeMarketCount()
-    {
-        return tradeMarketCount;
-    }
-
-    public void setTradeMarketCount(int tradeMarketCount)
-    {
-        this.tradeMarketCount = tradeMarketCount;
-    }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/LivestockResourceDashboardVo.java

@@ -2,7 +2,11 @@ package com.ruoyi.web.modules.screen.domain.vo;
 
 import java.util.List;
 /**
- * 大屏畜牧资源（AI 问诊）看板（{@code GET /bigScreen/livestockResource/dashboard}）。
+ * 大屏畜牧资源看板（{@code GET /bigScreen/livestockResource/dashboard}）。
+ * <p>
+ * 已屏蔽 AI 问诊区块：高频关键词、热门问题、会话提问分布、会话状态、分时热度、
+ * 提问分类、模型调用、活跃度趋势、用户结构。
+ * </p>
  */
 public class LivestockResourceDashboardVo
 {
@@ -14,7 +18,7 @@ public class LivestockResourceDashboardVo
     private String statDateTime;
     /** 有会话数据的年份列表 */
     private List<Integer> availableYears;
-    /** 年度/今日概览 */
+    /** 核心数据总览 */
     private LivestockResourceOverviewVo overview;
     /** 农村三资数据 */
     private LivestockResourceRuralThreeAssetsVo ruralThreeAssets;
@@ -24,34 +28,16 @@ public class LivestockResourceDashboardVo
     private LivestockResourceProductOutputTrendVo productOutputTrend;
     /** 疫苗接种（最大月免疫率） */
     private LivestockResourceVaccinationOverviewVo vaccinationOverview;
-    /** 线下服务预约（自首页迁入） */
+    /** 线下服务预约 */
     private HomeScreenAppointmentVo appointment;
     /** 科技特派员结构（党员/其他、男/女） */
     private LivestockResourceTechEnvoyStructureVo techEnvoyStructure;
     /** 农业事业单位职级人数 */
     private LivestockResourceAgriUnitStructureVo agriUnitStructure;
-    /** 农技课堂（自首页迁入） */
+    /** 农技课堂 */
     private HomeScreenAgriClassroomVo agriClassroom;
-    /** 实战培训报名（自首页迁入） */
+    /** 实战培训报名 */
     private HomeScreenTrainingTrendVo trainingTrend;
-    /** 近 7 日活跃趋势 */
-    private LivestockResourceActivityTrendVo activityTrend;
-    /** 新老用户结构 */
-    private LivestockResourceUserStructureVo userStructure;
-    /** 提问分类占比 */
-    private LivestockResourceCategoryShareVo categoryShare;
-    /** 模型调用分类分析（同 categoryShare.items） */
-    private List<LivestockResourceCategoryItemVo> modelCallAnalysis;
-    /** statDate 当天 24 小时热力 */
-    private LivestockResourceHourlyHeatVo hourlyHeat;
-    /** 会话深度（回复条数）分布 */
-    private List<LivestockResourceSessionBandVo> sessionReplyDistribution;
-    /** AI 回复成功/失败占比 */
-    private LivestockResourceReplyStatusVo replyStatusDistribution;
-    /** 热门话题 Top5（按分类） */
-    private List<LivestockResourceCategoryItemVo> hotTopics;
-    /** 提问高频关键词 Top30（本地分词） */
-    private List<LivestockResourceKeywordVo> topKeywords;
 
     public int getStatYear() { return statYear; }
     public void setStatYear(int statYear) { this.statYear = statYear; }
@@ -81,22 +67,4 @@ public class LivestockResourceDashboardVo
     public void setAgriClassroom(HomeScreenAgriClassroomVo agriClassroom) { this.agriClassroom = agriClassroom; }
     public HomeScreenTrainingTrendVo getTrainingTrend() { return trainingTrend; }
     public void setTrainingTrend(HomeScreenTrainingTrendVo trainingTrend) { this.trainingTrend = trainingTrend; }
-    public LivestockResourceActivityTrendVo getActivityTrend() { return activityTrend; }
-    public void setActivityTrend(LivestockResourceActivityTrendVo activityTrend) { this.activityTrend = activityTrend; }
-    public LivestockResourceUserStructureVo getUserStructure() { return userStructure; }
-    public void setUserStructure(LivestockResourceUserStructureVo userStructure) { this.userStructure = userStructure; }
-    public LivestockResourceCategoryShareVo getCategoryShare() { return categoryShare; }
-    public void setCategoryShare(LivestockResourceCategoryShareVo categoryShare) { this.categoryShare = categoryShare; }
-    public List<LivestockResourceCategoryItemVo> getModelCallAnalysis() { return modelCallAnalysis; }
-    public void setModelCallAnalysis(List<LivestockResourceCategoryItemVo> modelCallAnalysis) { this.modelCallAnalysis = modelCallAnalysis; }
-    public LivestockResourceHourlyHeatVo getHourlyHeat() { return hourlyHeat; }
-    public void setHourlyHeat(LivestockResourceHourlyHeatVo hourlyHeat) { this.hourlyHeat = hourlyHeat; }
-    public List<LivestockResourceSessionBandVo> getSessionReplyDistribution() { return sessionReplyDistribution; }
-    public void setSessionReplyDistribution(List<LivestockResourceSessionBandVo> sessionReplyDistribution) { this.sessionReplyDistribution = sessionReplyDistribution; }
-    public LivestockResourceReplyStatusVo getReplyStatusDistribution() { return replyStatusDistribution; }
-    public void setReplyStatusDistribution(LivestockResourceReplyStatusVo replyStatusDistribution) { this.replyStatusDistribution = replyStatusDistribution; }
-    public List<LivestockResourceCategoryItemVo> getHotTopics() { return hotTopics; }
-    public void setHotTopics(List<LivestockResourceCategoryItemVo> hotTopics) { this.hotTopics = hotTopics; }
-    public List<LivestockResourceKeywordVo> getTopKeywords() { return topKeywords; }
-    public void setTopKeywords(List<LivestockResourceKeywordVo> topKeywords) { this.topKeywords = topKeywords; }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/ILivestockResourceScreenService.java

@@ -3,10 +3,10 @@ package com.ruoyi.web.modules.screen.service;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
 
 /**
- * 大屏畜牧资源（AI 问诊）统计服务。
+ * 大屏畜牧资源统计服务。
  */
 public interface ILivestockResourceScreenService
 {
-    /** AI 咨询活跃、分类、热力、关键词等年度看板 */
+    /** 畜牧资源看板（产业与培训相关区块；AI 问诊九区块已屏蔽） */
     LivestockResourceDashboardVo loadDashboard(String statYear);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImpl.java

@@ -21,8 +21,6 @@ import com.ruoyi.web.modules.industryservice.domain.BizLargeLivestockFarmer;
 import com.ruoyi.web.modules.industryservice.domain.BizLivestockOwnershipHousehold;
 import com.ruoyi.web.modules.industryservice.domain.BizYakHerdInventory;
 import com.ruoyi.web.modules.industryservice.domain.BizYakOutboundReport;
-import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDegradationStatVo;
-import com.ruoyi.web.modules.industryservice.mapper.BreedingIndustryStatsMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizCooperativeDevelopmentMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizDisposableIncomeMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizFamilyRanchMapper;
@@ -62,15 +60,12 @@ import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
  * 大屏首页统计服务实现。
  * <p>
  * 产业总览填报类指标取所选年<strong>最大填报月</strong>合计或记录数。
- * 看板已屏蔽：惠农补贴、草场类型占比、牦牛出栏月度、牦牛存栏变动。
+ * 看板已屏蔽：惠农补贴、草场类型占比、牦牛出栏月度、牦牛存栏变动、供应商/承销商/市场、草场块数。
  * </p>
  */
 @Service
 public class HomeScreenServiceImpl implements IHomeScreenService
 {
-    @Autowired
-    private BreedingIndustryStatsMapper breedingIndustryStatsMapper;
-
     @Autowired
     private HomeScreenStatsMapper homeScreenStatsMapper;
 
@@ -117,14 +112,8 @@ public class HomeScreenServiceImpl implements IHomeScreenService
         vo.setStatYear(year);
         vo.setStatDate(HomeScreenSupport.formatStatDate(statDate));
 
-        // 产业总览：供应商/承销商/市场；草场块数仍取台账
-        HomeScreenIndustryOverviewVo overview = new HomeScreenIndustryOverviewVo();
-        overview.setSupplierCount(homeScreenStatsMapper.countSupplierForScreen());
-        overview.setDistributorCount(homeScreenStatsMapper.countDistributorForScreen());
-        overview.setTradeMarketCount(homeScreenStatsMapper.countTradeMarketForScreen());
-        overview.setGrasslandCount(breedingIndustryStatsMapper.countGrassland());
-
         // 产业总览填报类：所选年份内最大填报月，全县（各村）合计/计数
+        HomeScreenIndustryOverviewVo overview = new HomeScreenIndustryOverviewVo();
         HomeScreenStatPeriodDto yearHerd = homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(year);
         HomeScreenStatPeriodDto yearOutbound = homeScreenStatsMapper.selectLatestOutboundReportStatPeriodByYear(year);
         HomeScreenStatPeriodDto yearFarmerHousehold =

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/impl/LivestockResourceScreenServiceImpl.java

@@ -4,7 +4,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
@@ -14,26 +13,20 @@ import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceProductOutputSum
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceTechPersonnelDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceThreeAssetsSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceVaccinationSumDto;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceActivityTrendVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceCategoryItemVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceCategoryShareVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceHourlyHeatVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceReplyStatusVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceUserStructureVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 import com.ruoyi.web.modules.screen.mapper.LivestockResourceScreenMapper;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
 import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
-import com.ruoyi.web.modules.screen.support.LivestockResourceScreenRules;
 import com.ruoyi.web.modules.screen.support.LivestockResourceScreenSupport;
 
 /**
  * 大屏畜牧资源统计服务实现。
  * <p>
- * 产业区块：总览、三资、问题上报、产量、疫苗、线下预约、特派员、事业单位、农技课堂、实战培训；
- * 其余区块仍统计 AI 咨询会话与消息。
+ * 产业区块：总览、三资、问题上报、产量、疫苗、线下预约、特派员、事业单位、农技课堂、实战培训。
+ * 已屏蔽 AI 问诊相关区块（活跃度、用户结构、分类、模型调用、分时热度、会话分布、状态、热门问题、关键词）。
+ * </p>
  */
 @Service
 public class LivestockResourceScreenServiceImpl implements ILivestockResourceScreenService
@@ -53,11 +46,6 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
 
         Date yearStart = toDate(LocalDate.of(year, 1, 1));
         Date yearEnd = toDateEndOfDay(statDate);
-        Date sevenStart = toDate(statDate.minusDays(LivestockResourceScreenRules.ACTIVITY_DAYS - 1));
-        Date sevenEnd = yearEnd;
-        LocalDateTime hourlyAnchor = statDateTime.truncatedTo(java.time.temporal.ChronoUnit.HOURS);
-        Date hourlyWindowStart = toDateTime(hourlyAnchor.minusHours(LivestockResourceScreenRules.HOURLY_BUCKETS - 1));
-        Date hourlyWindowEnd = toDateTime(hourlyAnchor.plusHours(1).minusSeconds(1));
 
         LivestockResourceThreeAssetsSumDto assetsSum = livestockResourceScreenMapper.sumRuralThreeAssetsFixed();
         LivestockResourceProductOutputSumDto productOutputSum = resolveProductOutputSum(year);
@@ -73,32 +61,6 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
                 livestockResourceScreenMapper.countVetMedicalResource(),
                 techPersonnel);
 
-        LivestockResourceActivityTrendVo activityTrend = LivestockResourceScreenSupport.buildActivityTrend(
-                livestockResourceScreenMapper.selectDailySessionCounts(sevenStart, sevenEnd),
-                livestockResourceScreenMapper.selectDailyAiReplyCounts(sevenStart, sevenEnd),
-                statDate);
-
-        LivestockResourceUserStructureVo userStructure = LivestockResourceScreenSupport.buildUserStructure(
-                livestockResourceScreenMapper.selectUserStructure());
-
-        long totalAiMessages = safeLong(livestockResourceScreenMapper.countAskerMessagesInYear(yearStart, yearEnd));
-        List<com.ruoyi.web.modules.screen.domain.dto.LivestockResourceCategoryCountDto> categoryRows =
-                livestockResourceScreenMapper.selectAskerCategoryCounts(yearStart, yearEnd);
-        LivestockResourceCategoryShareVo categoryShare = LivestockResourceScreenSupport.buildCategoryShare(
-                categoryRows, totalAiMessages);
-        List<LivestockResourceCategoryItemVo> categoryItems = categoryShare.getItems();
-
-        LivestockResourceHourlyHeatVo hourlyHeat = LivestockResourceScreenSupport.buildHourlyHeat(
-                livestockResourceScreenMapper.selectHourlySessionCounts(hourlyWindowStart, hourlyWindowEnd),
-                livestockResourceScreenMapper.selectHourlyAiReplyCounts(hourlyWindowStart, hourlyWindowEnd),
-                hourlyAnchor);
-
-        long yearSessionTotal = safeLong(livestockResourceScreenMapper.countYearSessions(yearStart, yearEnd));
-
-        long okCount = safeLong(livestockResourceScreenMapper.countAiRepliesOk(yearStart, yearEnd));
-        long failCount = safeLong(livestockResourceScreenMapper.countAiRepliesFail(yearStart, yearEnd));
-        LivestockResourceReplyStatusVo replyStatus = LivestockResourceScreenSupport.buildReplyStatus(okCount, failCount);
-
         LivestockResourceDashboardVo vo = new LivestockResourceDashboardVo();
         vo.setStatYear(year);
         vo.setStatDate(HomeScreenSupport.formatStatDate(statDate));
@@ -125,20 +87,6 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
         vo.setAgriClassroom(HomeScreenSupport.buildAgriClassroom(videoCount, trainingPublishCount));
         vo.setTrainingTrend(HomeScreenSupport.buildTrainingTrendForStatYear(
                 homeScreenStatsMapper.selectTrainingTrendByTrainingYear(year), year));
-        vo.setActivityTrend(activityTrend);
-        vo.setUserStructure(userStructure);
-        vo.setCategoryShare(categoryShare);
-        vo.setModelCallAnalysis(LivestockResourceScreenSupport.buildModelCallAnalysis(categoryItems));
-        vo.setHourlyHeat(hourlyHeat);
-        vo.setSessionReplyDistribution(LivestockResourceScreenSupport.buildSessionReplyDistribution(
-                livestockResourceScreenMapper.selectSessionReplyBuckets(yearStart, yearEnd),
-                yearSessionTotal));
-        vo.setReplyStatusDistribution(replyStatus);
-        vo.setHotTopics(LivestockResourceScreenSupport.buildHotTopics(
-                categoryRows, LivestockResourceScreenRules.HOT_TOPIC_TOP));
-        vo.setTopKeywords(LivestockResourceScreenSupport.extractTopKeywords(
-                livestockResourceScreenMapper.selectTextAskerContents(yearStart, yearEnd),
-                LivestockResourceScreenRules.KEYWORD_TOP));
         return vo;
     }
 
@@ -204,9 +152,4 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
         return Date.from(localDate.atTime(23, 59, 59)
                 .atZone(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI)).toInstant());
     }
-
-    private static Date toDateTime(LocalDateTime dateTime)
-    {
-        return Date.from(dateTime.atZone(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI)).toInstant());
-    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/controller/HomeScreenControllerApiTest.java

@@ -498,11 +498,7 @@ class HomeScreenControllerApiTest
         overview.setInventoryTotal(10);
         overview.setAnnualOutbound(2);
         overview.setPastureCount(1);
-        overview.setGrasslandCount(5);
         overview.setGrasslandAreaMu(new BigDecimal("100.00"));
-        overview.setSupplierCount(1);
-        overview.setDistributorCount(1);
-        overview.setTradeMarketCount(1);
         vo.setIndustryOverview(overview);
 
         vo.setAgeStructure(new ArrayList<>());

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/controller/LivestockResourceScreenControllerApiTest.java

@@ -7,7 +7,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.math.BigDecimal;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.jupiter.api.AfterEach;
@@ -27,14 +26,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceActivityTrendVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceCategoryShareVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDailyPointVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceHourlyHeatVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceHourlyPointVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
-import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceUserStructureVo;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
 
 /**
@@ -77,9 +70,7 @@ class LivestockResourceScreenControllerApiTest
                 .andExpect(jsonPath("$.data.statYear").value(2026))
                 .andExpect(jsonPath("$.data.overview.operatingFixedAssets").value(100.5))
                 .andExpect(jsonPath("$.data.overview.immunityRate").value(90.0))
-                .andExpect(jsonPath("$.data.overview.vetCount").value(15))
-                .andExpect(jsonPath("$.data.activityTrend.dailySeries.length()").value(7))
-                .andExpect(jsonPath("$.data.hourlyHeat.hourlySeries.length()").value(24));
+                .andExpect(jsonPath("$.data.overview.vetCount").value(15));
     }
 
     @Test
@@ -112,37 +103,6 @@ class LivestockResourceScreenControllerApiTest
         overview.setTechEnvoyCount(30);
         overview.setAgriUnitCount(40);
         vo.setOverview(overview);
-
-        LivestockResourceDailyPointVo day = new LivestockResourceDailyPointVo();
-        day.setDate("2026-05-20");
-        day.setSessionCount(3);
-        day.setQuestionCount(10);
-        LivestockResourceActivityTrendVo trend = new LivestockResourceActivityTrendVo();
-        trend.setDailySeries(Collections.nCopies(7, day));
-        vo.setActivityTrend(trend);
-
-        LivestockResourceUserStructureVo user = new LivestockResourceUserStructureVo();
-        user.setNewUserCount(3);
-        user.setOldUserCount(2);
-        vo.setUserStructure(user);
-
-        LivestockResourceCategoryShareVo share = new LivestockResourceCategoryShareVo();
-        share.setTotalAskerMessages(100);
-        share.setItems(Collections.emptyList());
-        vo.setCategoryShare(share);
-        vo.setModelCallAnalysis(Collections.emptyList());
-        vo.setHotTopics(Collections.emptyList());
-        vo.setTopKeywords(Collections.emptyList());
-        vo.setSessionReplyDistribution(Collections.emptyList());
-
-        LivestockResourceHourlyPointVo hour = new LivestockResourceHourlyPointVo();
-        hour.setBucketStart("14:00");
-        hour.setSessionCount(1);
-        hour.setQuestionCount(2);
-        LivestockResourceHourlyHeatVo heat = new LivestockResourceHourlyHeatVo();
-        heat.setWindowEnd("2026-05-20 15:30:00");
-        heat.setHourlySeries(Collections.nCopies(24, hour));
-        vo.setHourlyHeat(heat);
         return vo;
     }
 

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImplTest.java

@@ -33,7 +33,6 @@ import com.ruoyi.web.modules.industryservice.mapper.BizLargeLivestockFarmerMappe
 import com.ruoyi.web.modules.industryservice.mapper.BizLivestockOwnershipHouseholdMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakHerdInventoryMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakOutboundReportMapper;
-import com.ruoyi.web.modules.industryservice.mapper.BreedingIndustryStatsMapper;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenCoopBusinessModelSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenDisposableIncomeYearDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenEnterpriseFinanceSumDto;
@@ -68,9 +67,6 @@ import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
 class HomeScreenServiceImplTest
 {
 
-    @Mock
-    private BreedingIndustryStatsMapper breedingIndustryStatsMapper;
-
     @Mock
     private HomeScreenStatsMapper homeScreenStatsMapper;
 
@@ -107,27 +103,6 @@ class HomeScreenServiceImplTest
     @InjectMocks
     private HomeScreenServiceImpl service;
 
-    @Test
-    @DisplayName("DP-SY-UT-010 流通三项与年份无关")
-    void ut010_tradeCountsStable()
-    {
-        stubGrasslandAndReport();
-        stubOtherBlocks();
-        when(homeScreenStatsMapper.countSupplierForScreen()).thenReturn(3);
-        when(homeScreenStatsMapper.countDistributorForScreen()).thenReturn(2);
-        when(homeScreenStatsMapper.countTradeMarketForScreen()).thenReturn(1);
-
-        HomeScreenDashboardVo y2025 = service.loadDashboard("2025");
-        HomeScreenDashboardVo y2026 = service.loadDashboard("2026");
-
-        assertEquals(3, y2025.getIndustryOverview().getSupplierCount());
-        assertEquals(3, y2026.getIndustryOverview().getSupplierCount());
-        assertEquals(2, y2025.getIndustryOverview().getDistributorCount());
-        assertEquals(2, y2026.getIndustryOverview().getDistributorCount());
-        assertEquals(1, y2025.getIndustryOverview().getTradeMarketCount());
-        assertEquals(1, y2026.getIndustryOverview().getTradeMarketCount());
-    }
-
     @Test
     @DisplayName("DP-SY-API-001 看板结构完整")
     void dashboardStructure()
@@ -886,7 +861,6 @@ class HomeScreenServiceImplTest
 
     private void stubGrasslandAndReport()
     {
-        when(breedingIndustryStatsMapper.countGrassland()).thenReturn(5);
         lenient().when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod()).thenReturn(null);
         lenient().when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriod()).thenReturn(null);
         lenient().when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(any(Integer.class))).thenReturn(null);
@@ -906,9 +880,6 @@ class HomeScreenServiceImplTest
 
     private void stubOtherBlocks()
     {
-        when(homeScreenStatsMapper.countSupplierForScreen()).thenReturn(0);
-        when(homeScreenStatsMapper.countDistributorForScreen()).thenReturn(0);
-        when(homeScreenStatsMapper.countTradeMarketForScreen()).thenReturn(0);
         when(homeScreenStatsMapper.selectDistinctOutboundYears()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectDistinctAppointmentYears()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectDistinctSubsidyYears()).thenReturn(Collections.emptyList());

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/service/impl/LivestockResourceScreenServiceImplTest.java

@@ -20,7 +20,6 @@ import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceProductOutputSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceTechPersonnelDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceThreeAssetsSumDto;
-import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceUserStructureDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceVaccinationSumDto;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
@@ -95,22 +94,6 @@ class LivestockResourceScreenServiceImplTest
         when(homeScreenStatsMapper.countTrainingsPublishedInYear(any(), any())).thenReturn(3);
         when(homeScreenStatsMapper.selectTrainingTrendByTrainingYear(anyInt()))
                 .thenReturn(Collections.emptyList());
-
-        when(livestockResourceScreenMapper.selectDailySessionCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectDailyAiReplyCounts(any(), any())).thenReturn(Collections.emptyList());
-        LivestockResourceUserStructureDto user = new LivestockResourceUserStructureDto();
-        user.setNewUserCount(1L);
-        user.setOldUserCount(1L);
-        when(livestockResourceScreenMapper.selectUserStructure()).thenReturn(user);
-        when(livestockResourceScreenMapper.countAskerMessagesInYear(any(), any())).thenReturn(0L);
-        when(livestockResourceScreenMapper.selectAskerCategoryCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectHourlySessionCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectHourlyAiReplyCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.countYearSessions(any(), any())).thenReturn(10L);
-        when(livestockResourceScreenMapper.selectSessionReplyBuckets(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.countAiRepliesOk(any(), any())).thenReturn(15L);
-        when(livestockResourceScreenMapper.countAiRepliesFail(any(), any())).thenReturn(5L);
-        when(livestockResourceScreenMapper.selectTextAskerContents(any(), any())).thenReturn(Collections.emptyList());
         when(livestockResourceScreenMapper.selectDistinctSessionYears()).thenReturn(Arrays.asList(2026, 2025));
 
         int currentYear = java.time.LocalDate.now().getYear();
@@ -143,8 +126,6 @@ class LivestockResourceScreenServiceImplTest
         assertNotNull(vo.getAgriClassroom());
         assertEquals(2, vo.getAgriClassroom().getVideoCourseCount());
         assertNotNull(vo.getTrainingTrend());
-        assertEquals(7, vo.getActivityTrend().getDailySeries().size());
-        assertEquals(24, vo.getHourlyHeat().getHourlySeries().size());
     }
 
     @Test
@@ -167,18 +148,6 @@ class LivestockResourceScreenServiceImplTest
         when(homeScreenStatsMapper.countTrainingsPublishedInYear(any(), any())).thenReturn(0);
         when(homeScreenStatsMapper.selectTrainingTrendByTrainingYear(anyInt()))
                 .thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectDailySessionCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectDailyAiReplyCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectUserStructure()).thenReturn(new LivestockResourceUserStructureDto());
-        when(livestockResourceScreenMapper.countAskerMessagesInYear(any(), any())).thenReturn(0L);
-        when(livestockResourceScreenMapper.selectAskerCategoryCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectHourlySessionCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.selectHourlyAiReplyCounts(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.countYearSessions(any(), any())).thenReturn(0L);
-        when(livestockResourceScreenMapper.selectSessionReplyBuckets(any(), any())).thenReturn(Collections.emptyList());
-        when(livestockResourceScreenMapper.countAiRepliesOk(any(), any())).thenReturn(0L);
-        when(livestockResourceScreenMapper.countAiRepliesFail(any(), any())).thenReturn(0L);
-        when(livestockResourceScreenMapper.selectTextAskerContents(any(), any())).thenReturn(Collections.emptyList());
         when(livestockResourceScreenMapper.selectDistinctSessionYears()).thenReturn(Collections.singletonList(2020));
 
         LivestockResourceDashboardVo vo = service.loadDashboard("2020");

doc/大屏/畜牧资源/大屏畜牧资源技术方案.md

@@ -247,15 +247,8 @@ XML：`mapper/screen/LivestockResourceScreenMapper.xml`。
 | `agriUnitStructure` | object | 农业事业单位：员级/初级/中级/高级/管理级人数 |
 | `agriClassroom` | object | 农技课堂（自首页迁入） |
 | `trainingTrend` | object | 实战培训报名：所选年 1～库中最大月；`monthly[].statYear/month/activityCount/enrolledCount` |
-| `activityTrend` | object | 活跃度趋势 **§3.1.2** |
-| `userStructure` | object | 用户结构 **§3.1.3** |
-| `categoryShare` | object | 提问分类占比 **§3.1.4** |
-| `modelCallAnalysis` | array | 模型调用分析（与分类同源） **§3.1.5** |
-| `hourlyHeat` | object | 分时热度 **§3.1.6** |
-| `sessionReplyDistribution` | array | 会话提问数量分布 **§3.1.7** |
-| `replyStatusDistribution` | object | 会话状态分布 **§3.1.8** |
-| `hotTopics` | array | 热点问题榜单 Top5 **§3.1.9** |
-| `topKeywords` | array | 高频关键词 Top30 **§3.1.10** |
+
+> **已屏蔽（不再返回）：** `activityTrend`、`userStructure`、`categoryShare`、`modelCallAnalysis`、`hourlyHeat`、`sessionReplyDistribution`、`replyStatusDistribution`、`hotTopics`、`topKeywords`。
 
 #### 3.1.1 `overview`
 
@@ -454,6 +447,7 @@ SQL 示例：`sql/big_screen_livestock_resource_perm.sql`（挂载「大屏」
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.11 | 2026-07-24 | 看板屏蔽 AI 问诊九区块：活跃度/用户结构/分类/模型调用/分时/会话分布/状态/热门/关键词 |
 | 1.10 | 2026-07-24 | 线下服务预约三项汇总改为资源台账：兽医 004001、机构 004003、专家 004005 |
 | 1.9 | 2026-07-24 | 线下服务预约月度改为所选年 1～最大月 |
 | 1.8 | 2026-07-24 | 实战培训报名改为所选年 1～最大月；前端横轴仅月、悬停显年月 |

doc/大屏/首页/大屏首页技术方案.md

@@ -245,7 +245,7 @@
 | `cooperativeBusinessModel` / `farmerHouseholdClassification` | array | 合作社模式 / 农牧户分类 |
 | `perCapitaIncomeTrend` | array | 人均收入近 5 年 |
 
-> **已屏蔽（不再返回）：** `inventoryChange`（牦牛存栏变动）、`outboundMonthly`（牦牛出栏月度）、`grassland`（草场类型占比）、`subsidy`（惠农补贴发放）；以及此前迁出的预约/农技课堂/培训。
+> **已屏蔽（不再返回）：** `inventoryChange`（牦牛存栏变动）、`outboundMonthly`（牦牛出栏月度）、`grassland`（草场类型占比）、`subsidy`（惠农补贴发放）；产业总览内 `supplierCount`/`distributorCount`/`tradeMarketCount`/`grasslandCount`；以及此前迁出的预约/农技课堂/培训。
 
 #### 3.1.1 `industryOverview`
 
@@ -258,11 +258,11 @@
 | `familyRanchCount` | 家庭牧场（个），所选年 **Y** 内 `biz_family_ranch` 最大填报月记录条数 |
 | `largeLivestockFarmerCount` | 养殖大户（个），所选年 **Y** 内 `biz_large_livestock_farmer` 最大填报月记录条数 |
 | `withLivestockHouseholdCount` | 有畜户数（户），所选年 **Y** 内 `biz_livestock_ownership_household` 最大填报月全县村级 `with_livestock_household_count` 合计 |
-| `grasslandCount` | 草场块数（台账快照，供草场类型区块） |
 | `grasslandAreaMu` | 草场面积（亩），所选年 **Y** 内 `biz_farmer_household` 最大填报月全县村级 `pasture_contract_area` 合计 |
-| `supplierCount` / `distributorCount` / `tradeMarketCount` | 流通三项**实时**快照（接口保留；首页卡片改展示合作社等） |
 
-#### 3.1.2 `inventoryChange`
+> **已屏蔽（不再返回）：** `grasslandCount`、`supplierCount`、`distributorCount`、`tradeMarketCount`。
+
+#### 3.1.2 `inventoryChange`（已屏蔽）
 
 | 字段 | 说明 |
 | --- | --- |
@@ -665,6 +665,7 @@ SQL 示例：`sql/big_screen_home_perm.sql`（挂载「大屏」父菜单下）
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.22 | 2026-07-24 | 产业总览屏蔽：`supplierCount`/`distributorCount`/`tradeMarketCount`/`grasslandCount` |
 | 1.21 | 2026-07-24 | 看板屏蔽：`subsidy`、`grassland`、`outboundMonthly`、`inventoryChange` |
 | 1.20 | 2026-07-24 | 人均收入 `perCapitaIncomeTrend`：以库中最大所属年为终点向前 5 年 |
 | 1.19 | 2026-07-24 | 出栏 `outboundMonthly`：按填报最大月 N 输出 1～N |