基础服务

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/BaseBuilding.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("base_pigpen")
+@TableName("base_building")
 public class BaseBuilding implements Serializable {
 
     private static final long serialVersionUID = 1L;

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvRegularCallEgg.java

@@ -44,7 +44,7 @@ public class EnvRegularCallEgg implements Serializable {
     private String duckCode;
 
     /**
-     * 采食重量 克
+     * 鸡蛋重量 克
      */
     private Integer duckWeight;
 
@@ -54,6 +54,11 @@ public class EnvRegularCallEgg implements Serializable {
     private Integer duckFeedingOriginal;
 
     /**
+     * 蛋个数
+     */
+    private Integer eggNum;
+
+    /**
      * 称重日期
      */
     private LocalDateTime callDate;

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvRegularCallFeeding.java

@@ -54,11 +54,6 @@ public class EnvRegularCallFeeding implements Serializable {
     private Integer duckFeedingOriginal;
 
     /**
-     * 蛋个数
-     */
-    private Integer eggNum;
-
-    /**
      * 称重日期
      */
     private LocalDateTime callDate;

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.mapper;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
+import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-06-01
  */
-public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallEgg> {
+public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallFeeding> {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.mapper;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
+import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-06-01
  */
-public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFeeding> {
+public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallEgg> {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallEggService.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.service;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
+import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author author
  * @since 2023-06-01
  */
-public interface IEnvRegularCallEggService extends IService<EnvRegularCallEgg> {
+public interface IEnvRegularCallEggService extends IService<EnvRegularCallFeeding> {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.service;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
+import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author author
  * @since 2023-06-01
  */
-public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallFeeding> {
+public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallEgg> {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
+import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import com.huimv.guowei.admin.mapper.EnvRegularCallEggMapper;
 import com.huimv.guowei.admin.service.IEnvRegularCallEggService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-06-01
  */
 @Service
-public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggMapper, EnvRegularCallEgg> implements IEnvRegularCallEggService {
+public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggMapper, EnvRegularCallFeeding> implements IEnvRegularCallEggService {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -1,6 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
-import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
+import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.huimv.guowei.admin.mapper.EnvRegularCallFeedingMapper;
 import com.huimv.guowei.admin.service.IEnvRegularCallFeedingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-06-01
  */
 @Service
-public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCallFeedingMapper, EnvRegularCallFeeding> implements IEnvRegularCallFeedingService {
+public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCallFeedingMapper, EnvRegularCallEgg> implements IEnvRegularCallFeedingService {
 
 }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.guowei.admin.mapper.EnvRegularCallEggMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
+    <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
         <id column="id" property="id" />
         <result column="call_name" property="callName" />
         <result column="call_code" property="callCode" />

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.guowei.admin.mapper.EnvRegularCallFeedingMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+    <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
         <id column="id" property="id" />
         <result column="call_name" property="callName" />
         <result column="call_code" property="callCode" />