【feat】 添加对外服务 api

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/HuimvManageApplication.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api;
+package com.huimv.eartag2.manage2;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.config;
+package com.huimv.eartag2.manage2.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/config/WebSocket.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.config;
+package com.huimv.eartag2.manage2.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/config/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.config;
+package com.huimv.eartag2.manage2.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/BaseFarmController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.BaseFarmService;
+import com.huimv.eartag2.manage2.service.BaseFarmService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/BaseFarmerController.java

@@ -1,12 +1,12 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.api.pojo.BaseFarmer;
-import com.huimv.eartag2.api.service.BaseFarmerService;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
+import com.huimv.eartag2.manage2.service.BaseFarmerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BasePigpenController.java

@@ -1,9 +1,9 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.BasePigpenService;
+import com.huimv.eartag2.manage2.service.BasePigpenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BaseStageController.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BizBaseStageController.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.BizBaseStageService;
+import com.huimv.eartag2.manage2.service.BizBaseStageService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagAbnormalAlarmController.java

@@ -1,10 +1,10 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.api.pojo.BaseMap;
-import com.huimv.eartag2.api.service.*;
+import com.huimv.eartag2.manage2.pojo.BaseMap;
+import com.huimv.eartag2.manage2.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagAbnormalCountController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.EartagAbnormalCountService;
+import com.huimv.eartag2.manage2.service.EartagAbnormalCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagData2Controller.java

@@ -1,9 +1,9 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.IEartagData2Service;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagDataController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.EartagDataService;
+import com.huimv.eartag2.manage2.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagDeviceRegisterController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.EartagDeviceRegisterService;
+import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagEartagRegister2Controller.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagHourActController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.EartagHourActService;
+import com.huimv.eartag2.manage2.service.EartagHourActService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagOnlineStatusController.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagRegisterController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.IEartagEartagRegister2Service;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagResetController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.impl.EartagResetServiceImpl;
+import com.huimv.eartag2.manage2.service.impl.EartagResetServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/EartagResetCountController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.EartagResetCountService;
+import com.huimv.eartag2.manage2.service.EartagResetCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/FarmerAdoptController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.FarmerAdoptService;
+import com.huimv.eartag2.manage2.service.FarmerAdoptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/FarmerAssetController.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/FarmerDayageWeightController.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/OpenApi.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
-import com.huimv.eartag2.api.service.IEartagData2Service;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/OpenController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.IEartagEartagRegisterService;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/PliersDemoController.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/controller/StationLibController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.api.controller;
+package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.api.service.IPliersDemoService;
+import com.huimv.eartag2.manage2.service.IPliersDemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/BaseFarmMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.BaseFarm;
+import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseFarmerMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.BaseFarmer;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/BaseMapMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.api.pojo.BaseMap;
+import com.huimv.eartag2.manage2.pojo.BaseMap;
 
 /**
  * <p>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BasePigpenMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.BasePigpen;
+import com.huimv.eartag2.manage2.pojo.BasePigpen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseStageMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.BaseStage;
+import com.huimv.eartag2.manage2.pojo.BaseStage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/BizBaseStageMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.api.pojo.BizBaseStage;
+import com.huimv.eartag2.manage2.pojo.BizBaseStage;
 
 /**
  * <p>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagAbnormalAlarmMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagAbnormalAlarm;
+import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagAbnormalCountMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagAbnormalCount;
+import com.huimv.eartag2.manage2.pojo.EartagAbnormalCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagData2Mapper.java

@@ -1,12 +1,13 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.huimv.eartag2.api.pojo.EartagData2;
+import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto;
-import com.huimv.eartag2.api.pojo.pojovo.EartagDataDto;
+import com.huimv.eartag2.manage2.pojo.pojovo.AllHelthyDto;
+import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -18,6 +19,7 @@ import java.util.List;
  * @author author
  * @since 2022-07-29
  */
+@Repository
 public interface EartagData2Mapper extends BaseMapper<EartagData2> {
     //
     List<EartagData2> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagDataMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagData;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/EartagDeviceRegisterMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagDeviceRegister;
+import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagEartagRegister2Mapper.java

@@ -1,10 +1,10 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.eartag2.api.pojo.EartagEartagRegister2;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.api.pojo.pojovo.QingShanData;
+import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagEartagRegisterMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagEartagRegister;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagHourActMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagHourAct;
+import com.huimv.eartag2.manage2.pojo.EartagHourAct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagOnlineStatusMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagOnlineStatus;
+import com.huimv.eartag2.manage2.pojo.EartagOnlineStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/EartagResetCountMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagResetCount;
+import com.huimv.eartag2.manage2.pojo.EartagResetCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/EartagResetMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.EartagReset;
+import com.huimv.eartag2.manage2.pojo.EartagReset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/FarmerAdoptMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.FarmerAdopt;
+import com.huimv.eartag2.manage2.pojo.FarmerAdopt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/FarmerAssetMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.FarmerAsset;
+import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/FarmerDayageWeightMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.FarmerDayageWeight;
+import com.huimv.eartag2.manage2.pojo.FarmerDayageWeight;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/PliersDemoMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.PliersDemo;
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/StationLibMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.StationLib;
+import com.huimv.eartag2.manage2.pojo.StationLib;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/SysAccountMultilevelMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.api.pojo.SysAccountMultilevel;
+import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
 import org.springframework.stereotype.Repository;
 
 /**

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/mapper/SysBaseConfigMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.api.mapper;
+package com.huimv.eartag2.manage2.mapper;
 
-import com.huimv.eartag2.api.pojo.SysBaseConfig;
+import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.stereotype.Component;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseFarmMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.BaseFarmMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseFarm">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BaseFarm">
         <id column="id" property="id" />
         <result column="farm_code" property="farmCode" />
         <result column="farm_name" property="farmName" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseFarmerMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.BaseFarmerMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseFarmer">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BaseFarmer">
         <id column="id" property="id" />
         <result column="farmer" property="farmer" />
         <result column="phone" property="phone" />
@@ -15,7 +15,7 @@
     <sql id="Base_Column_List">
         id, farmer, phone, address,farm_code
     </sql>
-    <select id="getFarmer" resultType="com.huimv.eartag2.api.pojo.BaseFarmer">
+    <select id="getFarmer" resultType="com.huimv.eartag2.manage2.pojo.BaseFarmer">
         select * from base_farmer
     </select>
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BasePigpenMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.BasePigpenMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BasePigpen">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BasePigpen">
         <id column="id" property="id" />
         <result column="pigpen_name" property="pigpenName" />
         <result column="pigpen_code" property="pigpenCode" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseStageMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.BaseStageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseStage">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BaseStage">
         <id column="id" property="id" />
         <result column="stage_code" property="stageCode" />
         <result column="stage_name" property="stageName" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BizBaseStageMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.BizBaseStageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BizBaseStage">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BizBaseStage">
         <id column="id" property="id" />
         <result column="stage_code" property="stageCode" />
         <result column="stage_name" property="stageName" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagAbnormalAlarmMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagAbnormalAlarmMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagAbnormalAlarm">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm">
         <id column="id" property="id" />
         <result column="farm_code" property="farmCode" />
         <result column="add_date" property="addDate" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagAbnormalCountMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagAbnormalCountMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagAbnormalCount">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagAbnormalCount">
         <id column="id" property="id" />
         <result column="farm_code" property="farmCode" />
         <result column="station_data_count" property="stationDataCount" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagData2Mapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagData2Mapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagData2">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagData2">
         <id column="id" property="id" />
         <result column="cmd_header" property="cmdHeader" />
         <result column="device" property="device" />
@@ -23,15 +23,15 @@
         <result column="farm_id" property="farmId" />
         <result column="ask_date" property="askDate" />
     </resultMap>
-    <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.api.pojo.EartagData2">
+    <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.manage2.pojo.EartagData2">
         SELECT * FROM eartag_data2 WHERE earmark=${earmark} ORDER BY add_time DESC LIMIT ${recordCount}
     </select>
-    <select id="getAct" resultType="com.huimv.eartag2.api.pojo.pojovo.EartagDataDto">
+    <select id="getAct" resultType="com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto">
           SELECT SUM(act1) `value` ,DATE_FORMAT(  ask_time, '%m-%d' ) `time` FROM `eartag_data2`
      ${ew.customSqlSegment}
 
     </select>
-    <select id="allHealthy" resultType="com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto">
+    <select id="allHealthy" resultType="com.huimv.eartag2.manage2.pojo.pojovo.AllHelthyDto">
         SELECT  NULLIF (ROUND(AVG(ear_temp1),2) ,0.0), NULLIF (ROUND(AVG(env_temp1),2) 0.0), DATE_FORMAT(add_time,'%m-%d %H') ask_time
          FROM `eartag_data2`
          ${ew.customSqlSegment}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagDataMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagDataMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagData">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagData">
         <id column="id" property="id" />
         <result column="cmd_header" property="cmdHeader" />
         <result column="device" property="device" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagDeviceRegisterMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagDeviceRegisterMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagDeviceRegister">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagDeviceRegister">
         <id column="id" property="id" />
         <result column="device_code" property="deviceCode" />
         <result column="chip_id" property="chipId" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagEartagRegister2Mapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagEartagRegister2Mapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="first_time" property="firstTime" />
@@ -45,16 +45,16 @@
             parameterType="java.lang.String">
         SELECT create_date FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} ORDER BY register_time DESC LIMIT 1
     </select>
-    <select id="getLastBatchPig" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+    <select id="getLastBatchPig" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
         SELECT * FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} AND create_date=#{createDate} ORDER BY register_time DESC
     </select>
-    <select id="getEartagByDeviceCode" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2"
+    <select id="getEartagByDeviceCode" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2"
             parameterType="java.lang.String">
         SELECT * FROM eartag_eartag_register2 WHERE last_device=${deviceCode}  ORDER BY register_time DESC
     </select>
 
 
-    <select id="qingShanData" resultType="com.huimv.eartag2.api.pojo.pojovo.QingShanData"
+    <select id="qingShanData" resultType="com.huimv.eartag2.manage2.pojo.pojovo.QingShanData"
             parameterType="java.lang.String">
         SELECT DATE_FORMAT(add_time,'%m-%d %H') add_time , ROUND(AVG(env_temp1),2) env_temp , ROUND(AVG(ear_temp1),2) ear_temp
          FROM `eartag_data2` WHERE farm_id=#{farmCode}
@@ -63,7 +63,7 @@
 
 
     </select>
-    <select id="page" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+    <select id="page" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
 
     </select>
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagEartagRegisterMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagEartagRegisterMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagEartagRegister">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagEartagRegister">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="first_time" property="firstTime" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagHourActMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagHourActMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagHourAct">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagHourAct">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="hour" property="hour" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagOnlineStatusMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagOnlineStatusMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagOnlineStatus">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagOnlineStatus">
         <id column="id" property="id" />
         <result column="farm_id" property="farmId" />
         <result column="unit_id" property="unitId" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagResetCountMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagResetCountMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagResetCount">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagResetCount">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="times" property="times" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagResetMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.EartagResetMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagReset">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagReset">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="reset_time" property="resetTime" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerAdoptMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.FarmerAdoptMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerAdopt">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerAdopt">
         <id column="id" property="id" />
         <result column="batch_code" property="batchCode" />
         <result column="adopt_date" property="adoptDate" />
@@ -20,7 +20,7 @@
     <sql id="Base_Column_List">
         id, batch_code, adopt_date, adopt_age, days, quantity, meat_price, plan_incomde, farm_code
     </sql>
-    <select id="getLastAdoptByFarmCode" resultType="com.huimv.eartag2.api.pojo.FarmerAdopt"
+    <select id="getLastAdoptByFarmCode" resultType="com.huimv.eartag2.manage2.pojo.FarmerAdopt"
             parameterType="java.lang.String">
         SELECT * FROM farmer_adopt WHERE farm_code = #{farmCode} ORDER BY batch_code DESC LIMIT 1
     </select>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerAssetMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.FarmerAssetMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerAsset">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerAsset">
         <id column="id" property="id" />
         <result column="farm_code" property="farmCode" />
         <result column="year" property="year" />
@@ -16,19 +16,19 @@
     <sql id="Base_Column_List">
         id, farm_code, year, month, avail_asset, unavail_asset
     </sql>
-    <select id="getLastManyMonthAssets" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+    <select id="getLastManyMonthAssets" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset">
         SELECT * FROM farmer_asset WHERE farm_code = #{farmCode} ORDER BY year desc,month desc;
     </select>
     <select id="getPigWeightByDayage" resultType="java.math.BigDecimal" parameterType="long">
         SELECT weight FROM farmer_dayage_weight WHERE start_dayage &lt;= #{days} AND #{days} &lt;= end_dayage
     </select>
-    <select id="getAssetByMonth" resultType="com.huimv.eartag2.api.pojo.FarmerAsset" parameterType="int">
+    <select id="getAssetByMonth" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset" parameterType="int">
         SELECT * FROM farmer_asset WHERE farm_code=${farmCode} ORDER BY YEAR DESC,MONTH DESC LIMIT ${months}
     </select>
-    <select id="getPigWeight" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+    <select id="getPigWeight" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset">
         SELECT * FROM farmer_dayage_weight
     </select>
-    <select id="getAssetByFarmerIdAndYearAndMonth" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+    <select id="getAssetByFarmerIdAndYearAndMonth" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset">
         SELECT * FROM farmer_asset WHERE farm_code=${farmerId} AND year=${year} AND month=${month}
     </select>
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerDayageWeightMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.FarmerDayageWeightMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerDayageWeight">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerDayageWeight">
         <id column="id" property="id" />
         <result column="start_dayage" property="startDayage" />
         <result column="end_dayage" property="endDayage" />
@@ -14,7 +14,7 @@
     <sql id="Base_Column_List">
         id, start_dayage, end_dayage, weight
     </sql>
-    <select id="getAllDayageWeight" resultType="com.huimv.eartag2.api.pojo.FarmerDayageWeight">
+    <select id="getAllDayageWeight" resultType="com.huimv.eartag2.manage2.pojo.FarmerDayageWeight">
         SELECT * FROM farmer_dayage_weight
     </select>
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/PliersDemoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.PliersDemoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.PliersDemo">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.PliersDemo">
         <id column="id" property="id" />
         <result column="earmark" property="earmark" />
         <result column="pliers_id" property="pliersId" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/StationLibMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.StationLibMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.StationLib">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.StationLib">
         <id column="id" property="id" />
         <result column="errcode" property="errcode" />
         <result column="lat" property="lat" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/SysBaseConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.api.mapper.SysBaseConfigMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.SysBaseConfig">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.SysBaseConfig">
         <id column="id" property="id" />
         <result column="config_name" property="configName" />
         <result column="config_key" property="configKey" />

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseFarm.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseFarmer.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseMap.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BasePigpen.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseStage.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BizBaseStage.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagAbnormalAlarm.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagAbnormalCount.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagData.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagData2.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagDeviceRegister.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagEartagRegister.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagEartagRegister2.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagHourAct.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagOnlineStatus.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagReset.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/EartagResetCount.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/FarmerAdopt.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/FarmerAsset.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/FarmerDayageWeight.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/PliersDemo.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/api/pojo/StationLib.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/SysAccountMultilevel.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/SysBaseConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo;
+package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/pojovo/AllHelthyDto.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.api.pojo.pojovo;
+package com.huimv.eartag2.manage2.pojo.pojovo;
 
 import lombok.Data;