对接牦牛资产档案

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

@@ -1,18 +0,0 @@
-package com.ruoyi.web.modules.industryservice.domain;
-
-public class BizYakBatchRel
-{
-    private Long id;
-    private Long yakAssetId;
-    private String batchNo;
-    private String yakNo;
-
-    public Long getId() { return id; }
-    public void setId(Long id) { this.id = id; }
-    public Long getYakAssetId() { return yakAssetId; }
-    public void setYakAssetId(Long yakAssetId) { this.yakAssetId = yakAssetId; }
-    public String getBatchNo() { return batchNo; }
-    public void setBatchNo(String batchNo) { this.batchNo = batchNo; }
-    public String getYakNo() { return yakNo; }
-    public void setYakNo(String yakNo) { this.yakNo = yakNo; }
-}

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

@@ -1,18 +0,0 @@
-package com.ruoyi.web.modules.industryservice.domain;
-
-public class BizYakPenRel
-{
-    private Long id;
-    private Long yakAssetId;
-    private String penName;
-    private String yakNo;
-
-    public Long getId() { return id; }
-    public void setId(Long id) { this.id = id; }
-    public Long getYakAssetId() { return yakAssetId; }
-    public void setYakAssetId(Long yakAssetId) { this.yakAssetId = yakAssetId; }
-    public String getPenName() { return penName; }
-    public void setPenName(String penName) { this.penName = penName; }
-    public String getYakNo() { return yakNo; }
-    public void setYakNo(String yakNo) { this.yakNo = yakNo; }
-}

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

@@ -2,9 +2,7 @@ package com.ruoyi.web.modules.industryservice.domain.dto;
 
 import java.util.List;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
-import com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakFeedingRecord;
-import com.ruoyi.web.modules.industryservice.domain.BizYakPenRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.BizYakPhysioSeries;
 import com.ruoyi.web.modules.industryservice.domain.BizYakReproductionRecord;
@@ -27,10 +25,6 @@ public class YakAssetBundleDto
 
     private List<BizYakFeedingRecord> feedingRecords;
 
-    private List<BizYakPenRel> penRecords;
-
-    private List<BizYakBatchRel> batchRecords;
-
     public BizYakAsset getAsset()
     {
         return asset;
@@ -90,24 +84,4 @@ public class YakAssetBundleDto
     {
         this.feedingRecords = feedingRecords;
     }
-
-    public List<BizYakPenRel> getPenRecords()
-    {
-        return penRecords;
-    }
-
-    public void setPenRecords(List<BizYakPenRel> penRecords)
-    {
-        this.penRecords = penRecords;
-    }
-
-    public List<BizYakBatchRel> getBatchRecords()
-    {
-        return batchRecords;
-    }
-
-    public void setBatchRecords(List<BizYakBatchRel> batchRecords)
-    {
-        this.batchRecords = batchRecords;
-    }
 }

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

@@ -2,10 +2,8 @@ package com.ruoyi.web.modules.industryservice.domain.vo;
 
 import java.util.List;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
-import com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakFeedingRecord;
 import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
-import com.ruoyi.web.modules.industryservice.domain.BizYakPenRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakPhysioSeries;
 import com.ruoyi.web.modules.industryservice.domain.BizYakReproductionRecord;
 
@@ -16,8 +14,6 @@ public class YakAssetDetailVo
     private List<BizYakGrowthRecord> growthRecords;
     private List<BizYakReproductionRecord> reproductionRecords;
     private List<BizYakFeedingRecord> feedingRecords;
-    private List<BizYakPenRel> penRecords;
-    private List<BizYakBatchRel> batchRecords;
 
     public BizYakAsset getAsset() { return asset; }
     public void setAsset(BizYakAsset asset) { this.asset = asset; }
@@ -29,8 +25,4 @@ public class YakAssetDetailVo
     public void setReproductionRecords(List<BizYakReproductionRecord> reproductionRecords) { this.reproductionRecords = reproductionRecords; }
     public List<BizYakFeedingRecord> getFeedingRecords() { return feedingRecords; }
     public void setFeedingRecords(List<BizYakFeedingRecord> feedingRecords) { this.feedingRecords = feedingRecords; }
-    public List<BizYakPenRel> getPenRecords() { return penRecords; }
-    public void setPenRecords(List<BizYakPenRel> penRecords) { this.penRecords = penRecords; }
-    public List<BizYakBatchRel> getBatchRecords() { return batchRecords; }
-    public void setBatchRecords(List<BizYakBatchRel> batchRecords) { this.batchRecords = batchRecords; }
 }

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

@@ -1,11 +0,0 @@
-package com.ruoyi.web.modules.industryservice.mapper;
-
-import java.util.List;
-import com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel;
-
-public interface BizYakBatchRelMapper
-{
-    List<BizYakBatchRel> selectByYakAssetId(Long yakAssetId);
-    int deleteByYakAssetId(Long yakAssetId);
-    int batchInsert(List<BizYakBatchRel> list);
-}

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

@@ -1,11 +0,0 @@
-package com.ruoyi.web.modules.industryservice.mapper;
-
-import java.util.List;
-import com.ruoyi.web.modules.industryservice.domain.BizYakPenRel;
-
-public interface BizYakPenRelMapper
-{
-    List<BizYakPenRel> selectByYakAssetId(Long yakAssetId);
-    int deleteByYakAssetId(Long yakAssetId);
-    int batchInsert(List<BizYakPenRel> list);
-}

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

@@ -1,6 +1,5 @@
 package com.ruoyi.web.modules.industryservice.service;
 
-import java.util.Collections;
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,18 +10,14 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizPasture;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
-import com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakFeedingRecord;
-import com.ruoyi.web.modules.industryservice.domain.BizYakPenRel;
 import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.BizYakPhysioSeries;
 import com.ruoyi.web.modules.industryservice.domain.BizYakReproductionRecord;
 import com.ruoyi.web.modules.industryservice.domain.dto.YakAssetBundleDto;
 import com.ruoyi.web.modules.industryservice.mapper.BizPastureMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakAssetMapper;
-import com.ruoyi.web.modules.industryservice.mapper.BizYakBatchRelMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakFeedingRecordMapper;
-import com.ruoyi.web.modules.industryservice.mapper.BizYakPenRelMapper;
 import com.ruoyi.web.modules.industryservice.support.YakAssetStatusMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakGrowthRecordMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakPhysioSeriesMapper;
@@ -51,12 +46,6 @@ public class YakAssetBundleSyncTxService
     @Autowired
     private BizYakFeedingRecordMapper feedingRecordMapper;
 
-    @Autowired
-    private BizYakPenRelMapper penRelMapper;
-
-    @Autowired
-    private BizYakBatchRelMapper batchRelMapper;
-
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public boolean persistBundle(YakAssetBundleDto bundle, Date syncTime)
     {
@@ -166,14 +155,6 @@ public class YakAssetBundleSyncTxService
         {
             feedingRecordMapper.deleteByYakAssetId(yakAssetId);
         }
-        if (bundle.getPenRecords() != null || StringUtils.isNotEmpty(bundle.getAsset().getPenLocation()))
-        {
-            penRelMapper.deleteByYakAssetId(yakAssetId);
-        }
-        if (bundle.getBatchRecords() != null || StringUtils.isNotEmpty(bundle.getAsset().getBatchNo()))
-        {
-            batchRelMapper.deleteByYakAssetId(yakAssetId);
-        }
 
         if (!CollectionUtils.isEmpty(bundle.getPhysioSeries()))
         {
@@ -215,35 +196,5 @@ public class YakAssetBundleSyncTxService
             }
             feedingRecordMapper.batchInsert(bundle.getFeedingRecords());
         }
-        if (!CollectionUtils.isEmpty(bundle.getPenRecords()))
-        {
-            for (BizYakPenRel row : bundle.getPenRecords())
-            {
-                row.setYakAssetId(yakAssetId);
-            }
-            penRelMapper.batchInsert(bundle.getPenRecords());
-        }
-        else if (StringUtils.isNotEmpty(bundle.getAsset().getPenLocation()))
-        {
-            BizYakPenRel pen = new BizYakPenRel();
-            pen.setYakAssetId(yakAssetId);
-            pen.setPenName(bundle.getAsset().getPenLocation().trim());
-            penRelMapper.batchInsert(Collections.singletonList(pen));
-        }
-        if (!CollectionUtils.isEmpty(bundle.getBatchRecords()))
-        {
-            for (BizYakBatchRel row : bundle.getBatchRecords())
-            {
-                row.setYakAssetId(yakAssetId);
-            }
-            batchRelMapper.batchInsert(bundle.getBatchRecords());
-        }
-        else if (StringUtils.isNotEmpty(bundle.getAsset().getBatchNo()))
-        {
-            BizYakBatchRel batch = new BizYakBatchRel();
-            batch.setYakAssetId(yakAssetId);
-            batch.setBatchNo(bundle.getAsset().getBatchNo().trim());
-            batchRelMapper.batchInsert(Collections.singletonList(batch));
-        }
     }
 }

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

@@ -36,12 +36,6 @@ public class BizYakAssetServiceImpl implements IBizYakAssetService
     @Autowired
     private BizYakFeedingRecordMapper feedingRecordMapper;
 
-    @Autowired
-    private BizYakPenRelMapper penRelMapper;
-
-    @Autowired
-    private BizYakBatchRelMapper batchRelMapper;
-
     @Autowired
     private YakAssetSyncService yakAssetSyncService;
 
@@ -134,19 +128,6 @@ public class BizYakAssetServiceImpl implements IBizYakAssetService
         vo.setGrowthRecords(growthRecordMapper.selectByYakAssetId(yakAssetId));
         vo.setReproductionRecords(reproductionRecordMapper.selectByYakAssetId(yakAssetId));
         vo.setFeedingRecords(feedingRecordMapper.selectByYakAssetId(yakAssetId));
-        String yakNo = asset.getYakNo();
-        List<BizYakPenRel> pens = penRelMapper.selectByYakAssetId(yakAssetId);
-        for (BizYakPenRel pen : pens)
-        {
-            pen.setYakNo(yakNo);
-        }
-        vo.setPenRecords(pens);
-        List<BizYakBatchRel> batches = batchRelMapper.selectByYakAssetId(yakAssetId);
-        for (BizYakBatchRel batch : batches)
-        {
-            batch.setYakNo(yakNo);
-        }
-        vo.setBatchRecords(batches);
         return vo;
     }
 

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

@@ -11,8 +11,6 @@ import java.util.TimeZone;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.industryservice.domain.BizYakAsset;
-import com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel;
-import com.ruoyi.web.modules.industryservice.domain.BizYakPenRel;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenYakEntryDto;
 import com.ruoyi.web.modules.industryservice.domain.dto.YakAssetBundleDto;
 
@@ -69,8 +67,6 @@ public final class YakEntryOpenApiMapper
         {
             bundle.setThirdPartyPastureCode(String.valueOf(dto.getFarmId()));
         }
-        bundle.setPenRecords(buildPenRecords(dto));
-        bundle.setBatchRecords(buildBatchRecords(dto, asset.getBatchNo()));
         return bundle;
     }
 
@@ -118,29 +114,6 @@ public final class YakEntryOpenApiMapper
         return sex;
     }
 
-    private static List<BizYakPenRel> buildPenRecords(OpenYakEntryDto dto)
-    {
-        if (StringUtils.isEmpty(dto.getFarmEnclosureName()))
-        {
-            return null;
-        }
-        BizYakPenRel pen = new BizYakPenRel();
-        pen.setPenName(dto.getFarmEnclosureName().trim());
-        return Collections.singletonList(pen);
-    }
-
-    private static List<BizYakBatchRel> buildBatchRecords(OpenYakEntryDto dto, String batchNo)
-    {
-        String resolved = batchNo;
-        if (StringUtils.isEmpty(resolved))
-        {
-            return null;
-        }
-        BizYakBatchRel batch = new BizYakBatchRel();
-        batch.setBatchNo(resolved);
-        return Collections.singletonList(batch);
-    }
-
     public static List<YakAssetBundleDto> toBundles(List<OpenYakEntryDto> entries)
     {
         if (entries == null || entries.isEmpty())

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizYakBatchRelMapper">
-    <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizYakBatchRel" id="BizYakBatchRelResult">
-        <id property="id" column="id"/>
-        <result property="yakAssetId" column="yak_asset_id"/>
-        <result property="batchNo" column="batch_no"/>
-    </resultMap>
-    <select id="selectByYakAssetId" resultMap="BizYakBatchRelResult">
-        select id, yak_asset_id, batch_no from biz_yak_batch_rel where yak_asset_id = #{yakAssetId} order by id desc
-    </select>
-    <delete id="deleteByYakAssetId">delete from biz_yak_batch_rel where yak_asset_id = #{yakAssetId}</delete>
-    <insert id="batchInsert">
-        insert into biz_yak_batch_rel (yak_asset_id, batch_no) values
-        <foreach collection="list" item="item" separator=",">(#{item.yakAssetId}, #{item.batchNo})</foreach>
-    </insert>
-</mapper>

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizYakPenRelMapper">
-    <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizYakPenRel" id="BizYakPenRelResult">
-        <id property="id" column="id"/>
-        <result property="yakAssetId" column="yak_asset_id"/>
-        <result property="penName" column="pen_name"/>
-    </resultMap>
-    <select id="selectByYakAssetId" resultMap="BizYakPenRelResult">
-        select id, yak_asset_id, pen_name from biz_yak_pen_rel where yak_asset_id = #{yakAssetId} order by id desc
-    </select>
-    <delete id="deleteByYakAssetId">delete from biz_yak_pen_rel where yak_asset_id = #{yakAssetId}</delete>
-    <insert id="batchInsert">
-        insert into biz_yak_pen_rel (yak_asset_id, pen_name) values
-        <foreach collection="list" item="item" separator=",">(#{item.yakAssetId}, #{item.penName})</foreach>
-    </insert>
-</mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/service/impl/BizYakAssetServiceImplTest.java

@@ -23,9 +23,7 @@ import com.ruoyi.web.modules.industryservice.domain.BizYakGrowthRecord;
 import com.ruoyi.web.modules.industryservice.domain.vo.YakAssetDetailVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.YakAssetGrowthChartVo;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakAssetMapper;
-import com.ruoyi.web.modules.industryservice.mapper.BizYakBatchRelMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakFeedingRecordMapper;
-import com.ruoyi.web.modules.industryservice.mapper.BizYakPenRelMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakGrowthRecordMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakPhysioSeriesMapper;
 import com.ruoyi.web.modules.industryservice.mapper.BizYakReproductionRecordMapper;
@@ -51,12 +49,6 @@ class BizYakAssetServiceImplTest
     @Mock
     private BizYakFeedingRecordMapper feedingRecordMapper;
 
-    @Mock
-    private BizYakPenRelMapper penRelMapper;
-
-    @Mock
-    private BizYakBatchRelMapper batchRelMapper;
-
     @Mock
     private YakAssetSyncService yakAssetSyncService;
 
@@ -73,8 +65,6 @@ class BizYakAssetServiceImplTest
         when(growthRecordMapper.selectByYakAssetId(1L)).thenReturn(Collections.emptyList());
         when(reproductionRecordMapper.selectByYakAssetId(1L)).thenReturn(Collections.emptyList());
         when(feedingRecordMapper.selectByYakAssetId(1L)).thenReturn(Collections.emptyList());
-        when(penRelMapper.selectByYakAssetId(1L)).thenReturn(Collections.emptyList());
-        when(batchRelMapper.selectByYakAssetId(1L)).thenReturn(Collections.emptyList());
         YakAssetDetailVo vo = service.selectDetailById(1L);
         assertEquals("YAK20250001", vo.getAsset().getYakNo());
         verify(physioSeriesMapper).selectByYakAssetId(1L);
@@ -118,8 +108,6 @@ class BizYakAssetServiceImplTest
         when(growthRecordMapper.selectByYakAssetId(3L)).thenReturn(Collections.emptyList());
         when(reproductionRecordMapper.selectByYakAssetId(3L)).thenReturn(Collections.emptyList());
         when(feedingRecordMapper.selectByYakAssetId(3L)).thenReturn(Collections.emptyList());
-        when(penRelMapper.selectByYakAssetId(3L)).thenReturn(Collections.emptyList());
-        when(batchRelMapper.selectByYakAssetId(3L)).thenReturn(Collections.emptyList());
         YakAssetDetailVo vo = service.selectDetailByYakNo("YAK20250001");
         assertEquals(3L, vo.getAsset().getId());
     }

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

@@ -51,7 +51,5 @@ class YakEntryOpenApiMapperTest
         assertEquals(new BigDecimal("220.5"), asset.getEntryWeightKg());
         assertEquals("测试备注", asset.getStatusChangeReason());
         assertEquals("1", bundle.getThirdPartyPastureCode());
-        assertEquals(1, bundle.getPenRecords().size());
-        assertEquals(1, bundle.getBatchRecords().size());
     }
 }

sql/biz_yak_asset.sql

@@ -95,19 +95,3 @@ CREATE TABLE IF NOT EXISTS `biz_yak_feeding_record` (
   PRIMARY KEY (`id`),
   KEY `idx_yak_feeding` (`yak_asset_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='牦牛饲喂数据';
-
-CREATE TABLE IF NOT EXISTS `biz_yak_pen_rel` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `yak_asset_id` bigint(20) NOT NULL,
-  `pen_name` varchar(128) NOT NULL COMMENT '圈舍名称',
-  PRIMARY KEY (`id`),
-  KEY `idx_yak_pen` (`yak_asset_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='牦牛圈舍关联';
-
-CREATE TABLE IF NOT EXISTS `biz_yak_batch_rel` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `yak_asset_id` bigint(20) NOT NULL,
-  `batch_no` varchar(64) NOT NULL COMMENT '批次编号',
-  PRIMARY KEY (`id`),
-  KEY `idx_yak_batch` (`yak_asset_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='牦牛批次关联';