diff --git a/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java b/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java index 1867b29..ec34567 100644 --- a/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java +++ b/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java @@ -3,7 +3,6 @@ package com.zhyc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; /** * 启动程序 diff --git a/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java b/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java index 0cc658e..a0b6d0d 100644 --- a/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java +++ b/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java @@ -4,7 +4,6 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.List; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; @@ -12,7 +11,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; -import org.springframework.stereotype.Component; import com.zhyc.common.annotation.RateLimiter; import com.zhyc.common.enums.LimitType; import com.zhyc.common.exception.ServiceException; diff --git a/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java b/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java index 00a1ff4..9c43b1b 100644 --- a/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java +++ b/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java @@ -1,9 +1,6 @@ package com.zhyc.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java index fede094..007a1dc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java @@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletResponse; import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.BasSheepVariety; -import com.zhyc.module.base.mapper.BasSheepMapper; import com.zhyc.module.base.service.IBasSheepService; import com.zhyc.module.base.service.IBasSheepVarietyService; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java index f847204..1667a96 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java @@ -1,12 +1,8 @@ package com.zhyc.module.base.controller; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.service.IBasSheepService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java index 5046e7c..6302bb3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java @@ -6,7 +6,6 @@ import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.core.page.TableDataInfo; import com.zhyc.common.enums.BusinessType; import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.service.ISheepFileService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java index 047d376..db9c9bc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java index e0d1adb..51a1b67 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java @@ -5,8 +5,6 @@ import com.zhyc.common.core.domain.TreeEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 分组管理对象 bas_sheep_group diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java index eed7c36..f17d010 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java @@ -3,8 +3,6 @@ package com.zhyc.module.base.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java index edf709e..ca7cbe4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java @@ -3,9 +3,6 @@ package com.zhyc.module.base.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java index 56e8a36..ed3ef4e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java @@ -3,8 +3,6 @@ package com.zhyc.module.base.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java index ef3c938..22388e2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java @@ -3,9 +3,6 @@ package com.zhyc.module.base.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java index 0216feb..2e6a8cf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java @@ -5,8 +5,6 @@ import com.zhyc.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 羊舍管理对象 da_sheepfold diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java index acefce9..460ab2d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java @@ -6,8 +6,6 @@ import com.zhyc.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java index 5f9721d..efba4f1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java @@ -2,7 +2,6 @@ package com.zhyc.module.base.service; import java.util.List; -import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.BasSheepType; /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java index 4c1a362..1f1c3ba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java @@ -2,7 +2,6 @@ package com.zhyc.module.base.service.impl; import java.util.List; -import com.zhyc.module.base.domain.BasSheep; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.base.mapper.BasSheepTypeMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index 351a4ad..929321c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -1,6 +1,5 @@ package com.zhyc.module.base.service.impl; -import com.zhyc.common.utils.DateUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; import com.zhyc.module.base.service.ISheepFileService; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index c3b60c5..f8b1f81 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java index 05fe6ad..6876dda 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java index 773ec33..1212838 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index 1a77298..be3a25c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java index 807962a..3b9fc71 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java index 0fa8f88..d20a3d4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; import org.apache.ibatis.type.Alias; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java index e128a0e..53e5129 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java index 65ab2c1..0f716be 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.TreeEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java index 247ef20..0325467 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index 95a6aea..442d76e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -5,8 +5,6 @@ import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java index 86eb829..34e0423 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java index 9820928..aeecc86 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java index 450c220..5a3ebbc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java @@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index e4217fc..ae2d1a0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -1,6 +1,5 @@ package com.zhyc.module.biosafety.domain; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -8,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java index ed72447..558ccc4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java @@ -3,7 +3,6 @@ package com.zhyc.module.biosafety.service; import java.util.List; import com.zhyc.module.biosafety.domain.Treatment; -import org.springframework.transaction.annotation.Transactional; /** * 治疗记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java index c6f850c..a7244ba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java @@ -10,7 +10,6 @@ import com.zhyc.module.base.mapper.SheepFileMapper; import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; -import com.zhyc.module.biosafety.domain.Treatment; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java index 24918ef..587f4b7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java @@ -5,9 +5,7 @@ import java.util.List; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; -import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; -import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java index bef0199..a28b76b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java @@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; -import com.zhyc.module.biosafety.domain.Health; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java index 6556faf..9c9e4c5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java @@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; -import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java index 4c55e78..a121c55 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; -import com.zhyc.common.utils.StringUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.service.impl.SheepFileServiceImpl; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java index 7ecd944..75845b6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java @@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; -import com.zhyc.module.base.service.impl.SheepFileServiceImpl; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java index 44cbccb..1d7f8e5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java @@ -4,7 +4,6 @@ import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.dairyProducts.domain.NpMilkInOutStore; import com.zhyc.module.dairyProducts.service.INpMilkInOutStoreService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java index 9447a07..f0cc313 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java @@ -2,13 +2,10 @@ package com.zhyc.module.dairyProducts.controller; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.module.dairyProducts.domain.Ranch; import com.zhyc.module.dairyProducts.service.IRanchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/dairyProducts/ranch") public class RanchController extends BaseController { diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java index ee52381..b0563fe 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java @@ -19,7 +19,6 @@ import com.zhyc.common.enums.BusinessType; import com.zhyc.module.dairyProducts.domain.XzParityCorrection; import com.zhyc.module.dairyProducts.service.IXzParityCorrectionService; import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.common.core.page.TableDataInfo; /** * 胎次校正Controller diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java index 64e71f6..d8631f1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java index 0c71d35..23131dc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java @@ -347,8 +347,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java index e284508..c7ddfc8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java index a211abb..ca33e13 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java index d1a93e6..d877065 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java @@ -3,8 +3,6 @@ package com.zhyc.module.dairyProducts.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java index 6bba703..3453e3f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java index 992573a..5bd59d5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java @@ -1,6 +1,5 @@ package com.zhyc.module.dairyProducts.service; -import com.zhyc.module.dairyProducts.domain.NpMilkInOutStore; import org.springframework.web.multipart.MultipartFile; import java.util.Date; diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedDetailsController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedDetailsController.java deleted file mode 100644 index 9ef4f87..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedDetailsController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zhyc.module.feed.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.zhyc.common.annotation.Log; -import com.zhyc.common.core.controller.BaseController; -import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.feed.domain.SgFeedDetails; -import com.zhyc.module.feed.service.ISgFeedDetailsService; -import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.common.core.page.TableDataInfo; - -/** - * 饲喂记录详情Controller - * - * @author ruoyi - * @date 2025-08-01 - */ -@RestController -@RequestMapping("/feed/details") -public class SgFeedDetailsController extends BaseController -{ - @Autowired - private ISgFeedDetailsService sgFeedDetailsService; - - /** - * 查询饲喂记录详情列表 - */ - @PreAuthorize("@ss.hasPermi('feed:details:list')") - @GetMapping("/list") - public TableDataInfo list(SgFeedDetails sgFeedDetails) - { - startPage(); - List list = sgFeedDetailsService.selectSgFeedDetailsList(sgFeedDetails); - return getDataTable(list); - } - - /** - * 导出饲喂记录详情列表 - */ - @PreAuthorize("@ss.hasPermi('feed:details:export')") - @Log(title = "饲喂记录详情", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SgFeedDetails sgFeedDetails) - { - List list = sgFeedDetailsService.selectSgFeedDetailsList(sgFeedDetails); - ExcelUtil util = new ExcelUtil(SgFeedDetails.class); - util.exportExcel(response, list, "饲喂记录详情数据"); - } - - /** - * 获取饲喂记录详情详细信息 - */ - @PreAuthorize("@ss.hasPermi('feed:details:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(sgFeedDetailsService.selectSgFeedDetailsById(id)); - } - - /** - * 新增饲喂记录详情 - */ - @PreAuthorize("@ss.hasPermi('feed:details:add')") - @Log(title = "饲喂记录详情", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SgFeedDetails sgFeedDetails) - { - return toAjax(sgFeedDetailsService.insertSgFeedDetails(sgFeedDetails)); - } - - /** - * 修改饲喂记录详情 - */ - @PreAuthorize("@ss.hasPermi('feed:details:edit')") - @Log(title = "饲喂记录详情", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SgFeedDetails sgFeedDetails) - { - return toAjax(sgFeedDetailsService.updateSgFeedDetails(sgFeedDetails)); - } - - /** - * 删除饲喂记录详情 - */ - @PreAuthorize("@ss.hasPermi('feed:details:remove')") - @Log(title = "饲喂记录详情", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(sgFeedDetailsService.deleteSgFeedDetailsByIds(ids)); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedInfoController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedInfoController.java deleted file mode 100644 index 8673f0c..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedInfoController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zhyc.module.feed.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.zhyc.common.annotation.Log; -import com.zhyc.common.core.controller.BaseController; -import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.feed.domain.SgFeedInfo; -import com.zhyc.module.feed.service.ISgFeedInfoService; -import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.common.core.page.TableDataInfo; - -/** - * 饲喂记录Controller - * - * @author ruoyi - * @date 2025-08-01 - */ -@RestController -@RequestMapping("/feed/info") -public class SgFeedInfoController extends BaseController -{ - @Autowired - private ISgFeedInfoService sgFeedInfoService; - - /** - * 查询饲喂记录列表 - */ - @PreAuthorize("@ss.hasPermi('feed:info:list')") - @GetMapping("/list") - public TableDataInfo list(SgFeedInfo sgFeedInfo) - { - startPage(); - List list = sgFeedInfoService.selectSgFeedInfoList(sgFeedInfo); - return getDataTable(list); - } - - /** - * 导出饲喂记录列表 - */ - @PreAuthorize("@ss.hasPermi('feed:info:export')") - @Log(title = "饲喂记录", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SgFeedInfo sgFeedInfo) - { - List list = sgFeedInfoService.selectSgFeedInfoList(sgFeedInfo); - ExcelUtil util = new ExcelUtil(SgFeedInfo.class); - util.exportExcel(response, list, "饲喂记录数据"); - } - - /** - * 获取饲喂记录详细信息 - */ - @PreAuthorize("@ss.hasPermi('feed:info:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(sgFeedInfoService.selectSgFeedInfoById(id)); - } - - /** - * 新增饲喂记录 - */ - @PreAuthorize("@ss.hasPermi('feed:info:add')") - @Log(title = "饲喂记录", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SgFeedInfo sgFeedInfo) - { - return toAjax(sgFeedInfoService.insertSgFeedInfo(sgFeedInfo)); - } - - /** - * 修改饲喂记录 - */ - @PreAuthorize("@ss.hasPermi('feed:info:edit')") - @Log(title = "饲喂记录", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SgFeedInfo sgFeedInfo) - { - return toAjax(sgFeedInfoService.updateSgFeedInfo(sgFeedInfo)); - } - - /** - * 删除饲喂记录 - */ - @PreAuthorize("@ss.hasPermi('feed:info:remove')") - @Log(title = "饲喂记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(sgFeedInfoService.deleteSgFeedInfoByIds(ids)); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java index ad2a6a2..4661361 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java @@ -3,6 +3,8 @@ package com.zhyc.module.feed.controller; import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.feed.domain.SgFeedPlan; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -16,21 +18,19 @@ import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.feed.domain.SgFeedPlan; import com.zhyc.module.feed.service.ISgFeedPlanService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; /** * 饲喂计划Controller - * + * * @author HashMap - * @date 2025-08-08 + * @date 2025-08-14 */ @RestController @RequestMapping("/feed/FeedPlan") -public class SgFeedPlanController extends BaseController -{ +public class SgFeedPlanController extends BaseController { private final ISgFeedPlanService sgFeedPlanService; public SgFeedPlanController(ISgFeedPlanService sgFeedPlanService) { @@ -42,8 +42,7 @@ public class SgFeedPlanController extends BaseController */ @PreAuthorize("@ss.hasPermi('feed:FeedPlan:list')") @GetMapping("/list") - public TableDataInfo list(SgFeedPlan sgFeedPlan) - { + public TableDataInfo list(SgFeedPlan sgFeedPlan) { startPage(); List list = sgFeedPlanService.selectSgFeedPlanList(sgFeedPlan); return getDataTable(list); @@ -55,8 +54,7 @@ public class SgFeedPlanController extends BaseController @PreAuthorize("@ss.hasPermi('feed:FeedPlan:export')") @Log(title = "饲喂计划", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SgFeedPlan sgFeedPlan) - { + public void export(HttpServletResponse response, SgFeedPlan sgFeedPlan) { List list = sgFeedPlanService.selectSgFeedPlanList(sgFeedPlan); ExcelUtil util = new ExcelUtil<>(SgFeedPlan.class); util.exportExcel(response, list, "饲喂计划数据"); @@ -67,8 +65,7 @@ public class SgFeedPlanController extends BaseController */ @PreAuthorize("@ss.hasPermi('feed:FeedPlan:query')") @GetMapping(value = "/{createDate}") - public AjaxResult getInfo(@PathVariable("createDate") Date createDate) - { + public AjaxResult getInfo(@PathVariable("createDate") Date createDate) { return success(sgFeedPlanService.selectSgFeedPlanByCreateDate(createDate)); } @@ -78,8 +75,13 @@ public class SgFeedPlanController extends BaseController @PreAuthorize("@ss.hasPermi('feed:FeedPlan:add')") @Log(title = "饲喂计划", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody SgFeedPlan sgFeedPlan) - { + public AjaxResult add(@RequestBody SgFeedPlan sgFeedPlan) { + if (null == sgFeedPlan) { + throw new RuntimeException("数据为空"); + } + sgFeedPlan.setCreateDate(new Date()); + // 计算其他字段值 + setPlan(sgFeedPlan); return toAjax(sgFeedPlanService.insertSgFeedPlan(sgFeedPlan)); } @@ -89,8 +91,9 @@ public class SgFeedPlanController extends BaseController @PreAuthorize("@ss.hasPermi('feed:FeedPlan:edit')") @Log(title = "饲喂计划", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SgFeedPlan sgFeedPlan) - { + public AjaxResult edit(@RequestBody SgFeedPlan sgFeedPlan) { + // 根据修改后的值重新计算 + setPlan(sgFeedPlan); return toAjax(sgFeedPlanService.updateSgFeedPlan(sgFeedPlan)); } @@ -99,9 +102,25 @@ public class SgFeedPlanController extends BaseController */ @PreAuthorize("@ss.hasPermi('feed:FeedPlan:remove')") @Log(title = "饲喂计划", businessType = BusinessType.DELETE) - @DeleteMapping("/{createDates}") - public AjaxResult remove(@PathVariable Date[] createDates) - { + @DeleteMapping("/{createDates}") + public AjaxResult remove(@PathVariable Date[] createDates) { return toAjax(sgFeedPlanService.deleteSgFeedPlanByCreateDates(createDates)); } + + /** + * 设定计划值 + * 用于添加和修改 + */ + private SgFeedPlan setPlan(SgFeedPlan sgFeedPlan) { + // 根据羊舍ID获取羊只数量 + int countByFoldId = sgFeedPlanService.getSheepCountByFoldId(sgFeedPlan.getSheepHouseId()); + sgFeedPlan.setSheepCount(countByFoldId); + // 计算总计划量 + sgFeedPlan.setPlanFeedTotal(countByFoldId * sgFeedPlan.getPlanDailySize()); + // 计算早中晚计划量 + sgFeedPlan.setPlanMorningSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioMorning() / 100)); + sgFeedPlan.setPlanNoonSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioNoon() / 100)); + sgFeedPlan.setPlanAfternoonSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioAfternoon() / 100)); + return sgFeedPlan; + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedRatioController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedRatioController.java deleted file mode 100644 index 81ddd36..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedRatioController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zhyc.module.feed.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.zhyc.common.annotation.Log; -import com.zhyc.common.core.controller.BaseController; -import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.feed.domain.SgFeedRatio; -import com.zhyc.module.feed.service.ISgFeedRatioService; -import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.common.core.page.TableDataInfo; - -/** - * 饲喂比例Controller - * - * @author ruoyi - * @date 2025-08-01 - */ -@RestController -@RequestMapping("/feed/ratio") -public class SgFeedRatioController extends BaseController -{ - @Autowired - private ISgFeedRatioService sgFeedRatioService; - - /** - * 查询饲喂比例列表 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:list')") - @GetMapping("/list") - public TableDataInfo list(SgFeedRatio sgFeedRatio) - { - startPage(); - List list = sgFeedRatioService.selectSgFeedRatioList(sgFeedRatio); - return getDataTable(list); - } - - /** - * 导出饲喂比例列表 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:export')") - @Log(title = "饲喂比例", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SgFeedRatio sgFeedRatio) - { - List list = sgFeedRatioService.selectSgFeedRatioList(sgFeedRatio); - ExcelUtil util = new ExcelUtil(SgFeedRatio.class); - util.exportExcel(response, list, "饲喂比例数据"); - } - - /** - * 获取饲喂比例详细信息 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(sgFeedRatioService.selectSgFeedRatioById(id)); - } - - /** - * 新增饲喂比例 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:add')") - @Log(title = "饲喂比例", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SgFeedRatio sgFeedRatio) - { - return toAjax(sgFeedRatioService.insertSgFeedRatio(sgFeedRatio)); - } - - /** - * 修改饲喂比例 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:edit')") - @Log(title = "饲喂比例", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SgFeedRatio sgFeedRatio) - { - return toAjax(sgFeedRatioService.updateSgFeedRatio(sgFeedRatio)); - } - - /** - * 删除饲喂比例 - */ - @PreAuthorize("@ss.hasPermi('feed:ratio:remove')") - @Log(title = "饲喂比例", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(sgFeedRatioService.deleteSgFeedRatioByIds(ids)); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFodderController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFodderController.java deleted file mode 100644 index 94b2161..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFodderController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zhyc.module.feed.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.zhyc.common.annotation.Log; -import com.zhyc.common.core.controller.BaseController; -import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.feed.domain.SgFodder; -import com.zhyc.module.feed.service.ISgFodderService; -import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.common.core.page.TableDataInfo; - -/** - * 原料Controller - * - * @author ruoyi - * @date 2025-08-01 - */ -@RestController -@RequestMapping("/feed/fodder") -public class SgFodderController extends BaseController -{ - @Autowired - private ISgFodderService sgFodderService; - - /** - * 查询原料列表 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:list')") - @GetMapping("/list") - public TableDataInfo list(SgFodder sgFodder) - { - startPage(); - List list = sgFodderService.selectSgFodderList(sgFodder); - return getDataTable(list); - } - - /** - * 导出原料列表 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:export')") - @Log(title = "原料", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SgFodder sgFodder) - { - List list = sgFodderService.selectSgFodderList(sgFodder); - ExcelUtil util = new ExcelUtil(SgFodder.class); - util.exportExcel(response, list, "原料数据"); - } - - /** - * 获取原料详细信息 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(sgFodderService.selectSgFodderById(id)); - } - - /** - * 新增原料 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:add')") - @Log(title = "原料", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SgFodder sgFodder) - { - return toAjax(sgFodderService.insertSgFodder(sgFodder)); - } - - /** - * 修改原料 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:edit')") - @Log(title = "原料", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SgFodder sgFodder) - { - return toAjax(sgFodderService.updateSgFodder(sgFodder)); - } - - /** - * 删除原料 - */ - @PreAuthorize("@ss.hasPermi('feed:fodder:remove')") - @Log(title = "原料", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(sgFodderService.deleteSgFodderByIds(ids)); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java index 8f4c789..b3e5ab0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java @@ -3,7 +3,6 @@ package com.zhyc.module.feed.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedDetails.java b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedDetails.java deleted file mode 100644 index a1404e2..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedDetails.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.zhyc.module.feed.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; -import com.zhyc.common.core.domain.BaseEntity; - -/** - * 饲喂记录详情对象 sg_feed_details - * - * @author ruoyi - * @date 2025-08-01 - */ -public class SgFeedDetails extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 原料id */ - @Excel(name = "原料id") - private String fodder; - - /** 数量 */ - @Excel(name = "数量") - private Long number; - - /** 单位 */ - @Excel(name = "单位") - private String nuit; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setFodder(String fodder) - { - this.fodder = fodder; - } - - public String getFodder() - { - return fodder; - } - - public void setNumber(Long number) - { - this.number = number; - } - - public Long getNumber() - { - return number; - } - - public void setNuit(String nuit) - { - this.nuit = nuit; - } - - public String getNuit() - { - return nuit; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("fodder", getFodder()) - .append("number", getNumber()) - .append("nuit", getNuit()) - .toString(); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedInfo.java b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedInfo.java deleted file mode 100644 index 37ed315..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedInfo.java +++ /dev/null @@ -1,252 +0,0 @@ -package com.zhyc.module.feed.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; -import com.zhyc.common.core.domain.BaseEntity; - -/** - * 饲喂记录对象 sg_feed_info - * - * @author ruoyi - * @date 2025-08-01 - */ -public class SgFeedInfo extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 配方编码 */ - @Excel(name = "配方编码") - private Long formulaId; - - /** 羊舍 */ - @Excel(name = "羊舍") - private String sheepfoldId; - - /** 日均计划量 */ - @Excel(name = "日均计划量") - private Long average; - - /** 早上计划量(通过饲喂比例算出来) */ - @Excel(name = "早上计划量(通过饲喂比例算出来)") - private Long planMonring; - - /** 实际添加（早） */ - @Excel(name = "实际添加", readConverterExp = "早=") - private Long actualMonring; - - /** 中午计划量 */ - @Excel(name = "中午计划量") - private Long planNoon; - - /** 实际添加（中） */ - @Excel(name = "实际添加", readConverterExp = "中=") - private Long actualNoon; - - /** 下午计划量 */ - @Excel(name = "下午计划量") - private Long planEvenig; - - /** 实际添加（下） */ - @Excel(name = "实际添加", readConverterExp = "下=") - private Long actualEvening; - - /** 颗粒原料 */ - @Excel(name = "颗粒原料") - private Long particle; - - /** 其他原料 */ - @Excel(name = "其他原料") - private Long other; - - /** 补饲饲料 */ - @Excel(name = "补饲饲料") - private Long replenish; - - /** 饲喂日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "饲喂日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date planDate; - - /** 备注 */ - @Excel(name = "备注") - private String comment; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setFormulaId(Long formulaId) - { - this.formulaId = formulaId; - } - - public Long getFormulaId() - { - return formulaId; - } - - public void setSheepfoldId(String sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public String getSheepfoldId() - { - return sheepfoldId; - } - - public void setAverage(Long average) - { - this.average = average; - } - - public Long getAverage() - { - return average; - } - - public void setPlanMonring(Long planMonring) - { - this.planMonring = planMonring; - } - - public Long getPlanMonring() - { - return planMonring; - } - - public void setActualMonring(Long actualMonring) - { - this.actualMonring = actualMonring; - } - - public Long getActualMonring() - { - return actualMonring; - } - - public void setPlanNoon(Long planNoon) - { - this.planNoon = planNoon; - } - - public Long getPlanNoon() - { - return planNoon; - } - - public void setActualNoon(Long actualNoon) - { - this.actualNoon = actualNoon; - } - - public Long getActualNoon() - { - return actualNoon; - } - - public void setPlanEvenig(Long planEvenig) - { - this.planEvenig = planEvenig; - } - - public Long getPlanEvenig() - { - return planEvenig; - } - - public void setActualEvening(Long actualEvening) - { - this.actualEvening = actualEvening; - } - - public Long getActualEvening() - { - return actualEvening; - } - - public void setParticle(Long particle) - { - this.particle = particle; - } - - public Long getParticle() - { - return particle; - } - - public void setOther(Long other) - { - this.other = other; - } - - public Long getOther() - { - return other; - } - - public void setReplenish(Long replenish) - { - this.replenish = replenish; - } - - public Long getReplenish() - { - return replenish; - } - - public void setPlanDate(Date planDate) - { - this.planDate = planDate; - } - - public Date getPlanDate() - { - return planDate; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("formulaId", getFormulaId()) - .append("sheepfoldId", getSheepfoldId()) - .append("average", getAverage()) - .append("planMonring", getPlanMonring()) - .append("actualMonring", getActualMonring()) - .append("planNoon", getPlanNoon()) - .append("actualNoon", getActualNoon()) - .append("planEvenig", getPlanEvenig()) - .append("actualEvening", getActualEvening()) - .append("particle", getParticle()) - .append("other", getOther()) - .append("replenish", getReplenish()) - .append("planDate", getPlanDate()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java index 596eac2..7d537c0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java @@ -13,86 +13,88 @@ import com.zhyc.common.core.domain.BaseEntity; * 饲喂计划对象 sg_feed_plan * * @author HashMap - * @date 2025-08-08 + * @date 2025-08-14 */ -@Setter @Getter +@Setter public class SgFeedPlan extends BaseEntity { private static final long serialVersionUID = 1L; /** 创建日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd") private Date createDate; /** 配方编码 */ @Excel(name = "配方编码") private String formulaId; + /** 批号 */ + @Excel(name = "批号") + private String batchId; + /** 羊舍 */ @Excel(name = "羊舍") - private Long sheepHouseId; + private Integer sheepHouseId; /** 羊只数量 */ @Excel(name = "羊只数量") - private Long sheepCount; + private Integer sheepCount; /** 日均计划量 */ @Excel(name = "日均计划量") - private Long planDailySize; - - /** 计划量(早) */ - @Excel(name = "计划量(早)") - private Long planMorningSize; - - /** 计划总量(早) */ - @Excel(name = "计划总量(早)") - private Long planMorningTotal; + private Double planDailySize; /** 饲喂比例(早) */ @Excel(name = "饲喂比例(早)") - private Long ratioMorning; - - /** 实际量(早) */ - @Excel(name = "实际量(早)") - private Long actualMorningSize; - - /** 计划量(中) */ - @Excel(name = "计划量(中)") - private Long planNoonSize; - - /** 计划总量(中) */ - @Excel(name = "计划总量(中)") - private Long planNoonTotal; - - /** 实际量(中) */ - @Excel(name = "实际量(中)") - private Long actualNoonSize; + private Double ratioMorning; /** 饲喂比例(中) */ @Excel(name = "饲喂比例(中)") - private Long ratioNoon; - - /** 计划量(下) */ - @Excel(name = "计划量(下)") - private Long planAfternoonSize; - - /** 计划总量(下) */ - @Excel(name = "计划总量(下)") - private Long planAfternoonTotal; - - /** 实际量(下) */ - @Excel(name = "实际量(下)") - private Long actualAfternoonSize; + private Double ratioNoon; /** 饲喂比例(下) */ @Excel(name = "饲喂比例(下)") - private Long ratioAfternoon; + private Double ratioAfternoon; + + /** 计划量(早) */ + @Excel(name = "计划量(早)") + private Double planMorningSize; + + /** 计划总量(早) */ + @Excel(name = "计划总量(早)") + private Double planMorningTotal; + + /** 实际量(早) */ + @Excel(name = "实际量(早)") + private Double actualMorningSize; + + /** 计划量(中) */ + @Excel(name = "计划量(中)") + private Double planNoonSize; + + /** 计划总量(中) */ + @Excel(name = "计划总量(中)") + private Double planNoonTotal; + + /** 实际量(中) */ + @Excel(name = "实际量(中)") + private Double actualNoonSize; + + /** 计划量(下) */ + @Excel(name = "计划量(下)") + private Double planAfternoonSize; + + /** 计划总量(下) */ + @Excel(name = "计划总量(下)") + private Double planAfternoonTotal; + + /** 实际量(下) */ + @Excel(name = "实际量(下)") + private Double actualAfternoonSize; /** 计划饲喂总量 */ @Excel(name = "计划饲喂总量") - private Long planFeedTotal; + private Double planFeedTotal; /** 饲草班人员 */ @Excel(name = "饲草班人员") @@ -108,21 +110,22 @@ public class SgFeedPlan extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("createDate", getCreateDate()) .append("formulaId", getFormulaId()) + .append("batchId", getBatchId()) .append("sheepHouseId", getSheepHouseId()) .append("sheepCount", getSheepCount()) .append("planDailySize", getPlanDailySize()) + .append("ratioMorning", getRatioMorning()) + .append("ratioNoon", getRatioNoon()) + .append("ratioAfternoon", getRatioAfternoon()) .append("planMorningSize", getPlanMorningSize()) .append("planMorningTotal", getPlanMorningTotal()) - .append("ratioMorning", getRatioMorning()) .append("actualMorningSize", getActualMorningSize()) .append("planNoonSize", getPlanNoonSize()) .append("planNoonTotal", getPlanNoonTotal()) .append("actualNoonSize", getActualNoonSize()) - .append("ratioNoon", getRatioNoon()) .append("planAfternoonSize", getPlanAfternoonSize()) .append("planAfternoonTotal", getPlanAfternoonTotal()) .append("actualAfternoonSize", getActualAfternoonSize()) - .append("ratioAfternoon", getRatioAfternoon()) .append("planFeedTotal", getPlanFeedTotal()) .append("zookeeper", getZookeeper()) .append("planDate", getPlanDate()) diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedRatio.java b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedRatio.java deleted file mode 100644 index 5e3834e..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedRatio.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.zhyc.module.feed.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; -import com.zhyc.common.core.domain.BaseEntity; - -/** - * 饲喂比例对象 sg_feed_ratio - * - * @author ruoyi - * @date 2025-08-01 - */ -public class SgFeedRatio extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 早晨计划比列 */ - @Excel(name = "早晨计划比列") - private String morning; - - /** 中午计划比例 */ - @Excel(name = "中午计划比例") - private String noon; - - /** 下午计划比例 */ - @Excel(name = "下午计划比例") - private String evening; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setMorning(String morning) - { - this.morning = morning; - } - - public String getMorning() - { - return morning; - } - - public void setNoon(String noon) - { - this.noon = noon; - } - - public String getNoon() - { - return noon; - } - - public void setEvening(String evening) - { - this.evening = evening; - } - - public String getEvening() - { - return evening; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("morning", getMorning()) - .append("noon", getNoon()) - .append("evening", getEvening()) - .toString(); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFodder.java b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFodder.java deleted file mode 100644 index 3b00b2d..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFodder.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zhyc.module.feed.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.zhyc.common.annotation.Excel; -import com.zhyc.common.core.domain.BaseEntity; - -/** - * 原料对象 sg_fodder - * - * @author ruoyi - * @date 2025-08-01 - */ -public class SgFodder extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 名称 */ - @Excel(name = "名称") - private String name; - - /** 0补饲饲料1配方原料2颗粒原料 */ - @Excel(name = "0补饲饲料1配方原料2颗粒原料") - private Long fodderType; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setFodderType(Long fodderType) - { - this.fodderType = fodderType; - } - - public Long getFodderType() - { - return fodderType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("fodderType", getFodderType()) - .toString(); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedDetailsMapper.java b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedDetailsMapper.java deleted file mode 100644 index 2817118..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedDetailsMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.mapper; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedDetails; - -/** - * 饲喂记录详情Mapper接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface SgFeedDetailsMapper -{ - /** - * 查询饲喂记录详情 - * - * @param id 饲喂记录详情主键 - * @return 饲喂记录详情 - */ - public SgFeedDetails selectSgFeedDetailsById(Long id); - - /** - * 查询饲喂记录详情列表 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 饲喂记录详情集合 - */ - public List selectSgFeedDetailsList(SgFeedDetails sgFeedDetails); - - /** - * 新增饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - public int insertSgFeedDetails(SgFeedDetails sgFeedDetails); - - /** - * 修改饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - public int updateSgFeedDetails(SgFeedDetails sgFeedDetails); - - /** - * 删除饲喂记录详情 - * - * @param id 饲喂记录详情主键 - * @return 结果 - */ - public int deleteSgFeedDetailsById(Long id); - - /** - * 批量删除饲喂记录详情 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSgFeedDetailsByIds(Long[] ids); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedInfoMapper.java b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedInfoMapper.java deleted file mode 100644 index 11ea688..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedInfoMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.mapper; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedInfo; - -/** - * 饲喂记录Mapper接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface SgFeedInfoMapper -{ - /** - * 查询饲喂记录 - * - * @param id 饲喂记录主键 - * @return 饲喂记录 - */ - public SgFeedInfo selectSgFeedInfoById(Long id); - - /** - * 查询饲喂记录列表 - * - * @param sgFeedInfo 饲喂记录 - * @return 饲喂记录集合 - */ - public List selectSgFeedInfoList(SgFeedInfo sgFeedInfo); - - /** - * 新增饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - public int insertSgFeedInfo(SgFeedInfo sgFeedInfo); - - /** - * 修改饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - public int updateSgFeedInfo(SgFeedInfo sgFeedInfo); - - /** - * 删除饲喂记录 - * - * @param id 饲喂记录主键 - * @return 结果 - */ - public int deleteSgFeedInfoById(Long id); - - /** - * 批量删除饲喂记录 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSgFeedInfoByIds(Long[] ids); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java index 7ea4493..f475ae5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 饲喂计划Mapper接口 * * @author HashMap - * @date 2025-08-08 + * @date 2025-08-14 */ @Mapper public interface SgFeedPlanMapper @@ -20,7 +20,7 @@ public interface SgFeedPlanMapper * @param createDate 饲喂计划主键 * @return 饲喂计划 */ - SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate); + public SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate); /** * 查询饲喂计划列表 @@ -28,7 +28,7 @@ public interface SgFeedPlanMapper * @param sgFeedPlan 饲喂计划 * @return 饲喂计划集合 */ - List selectSgFeedPlanList(SgFeedPlan sgFeedPlan); + public List selectSgFeedPlanList(SgFeedPlan sgFeedPlan); /** * 新增饲喂计划 @@ -36,7 +36,7 @@ public interface SgFeedPlanMapper * @param sgFeedPlan 饲喂计划 * @return 结果 */ - int insertSgFeedPlan(SgFeedPlan sgFeedPlan); + public int insertSgFeedPlan(SgFeedPlan sgFeedPlan); /** * 修改饲喂计划 @@ -44,7 +44,7 @@ public interface SgFeedPlanMapper * @param sgFeedPlan 饲喂计划 * @return 结果 */ - int updateSgFeedPlan(SgFeedPlan sgFeedPlan); + public int updateSgFeedPlan(SgFeedPlan sgFeedPlan); /** * 删除饲喂计划 @@ -52,7 +52,7 @@ public interface SgFeedPlanMapper * @param createDate 饲喂计划主键 * @return 结果 */ - int deleteSgFeedPlanByCreateDate(Date createDate); + public int deleteSgFeedPlanByCreateDate(Date createDate); /** * 批量删除饲喂计划 @@ -60,5 +60,7 @@ public interface SgFeedPlanMapper * @param createDates 需要删除的数据主键集合 * @return 结果 */ - int deleteSgFeedPlanByCreateDates(Date[] createDates); + public int deleteSgFeedPlanByCreateDates(Date[] createDates); + + int selectSheepCountByFoldId(Integer foldId); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedRatioMapper.java b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedRatioMapper.java deleted file mode 100644 index 5dbd1ce..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedRatioMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.mapper; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedRatio; - -/** - * 饲喂比例Mapper接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface SgFeedRatioMapper -{ - /** - * 查询饲喂比例 - * - * @param id 饲喂比例主键 - * @return 饲喂比例 - */ - public SgFeedRatio selectSgFeedRatioById(Long id); - - /** - * 查询饲喂比例列表 - * - * @param sgFeedRatio 饲喂比例 - * @return 饲喂比例集合 - */ - public List selectSgFeedRatioList(SgFeedRatio sgFeedRatio); - - /** - * 新增饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - public int insertSgFeedRatio(SgFeedRatio sgFeedRatio); - - /** - * 修改饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - public int updateSgFeedRatio(SgFeedRatio sgFeedRatio); - - /** - * 删除饲喂比例 - * - * @param id 饲喂比例主键 - * @return 结果 - */ - public int deleteSgFeedRatioById(Long id); - - /** - * 批量删除饲喂比例 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSgFeedRatioByIds(Long[] ids); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFodderMapper.java b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFodderMapper.java deleted file mode 100644 index c916e24..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFodderMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.mapper; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFodder; - -/** - * 原料Mapper接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface SgFodderMapper -{ - /** - * 查询原料 - * - * @param id 原料主键 - * @return 原料 - */ - public SgFodder selectSgFodderById(Long id); - - /** - * 查询原料列表 - * - * @param sgFodder 原料 - * @return 原料集合 - */ - public List selectSgFodderList(SgFodder sgFodder); - - /** - * 新增原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - public int insertSgFodder(SgFodder sgFodder); - - /** - * 修改原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - public int updateSgFodder(SgFodder sgFodder); - - /** - * 删除原料 - * - * @param id 原料主键 - * @return 结果 - */ - public int deleteSgFodderById(Long id); - - /** - * 批量删除原料 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSgFodderByIds(Long[] ids); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedDetailsService.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedDetailsService.java deleted file mode 100644 index ac695f8..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedDetailsService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.service; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedDetails; - -/** - * 饲喂记录详情Service接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface ISgFeedDetailsService -{ - /** - * 查询饲喂记录详情 - * - * @param id 饲喂记录详情主键 - * @return 饲喂记录详情 - */ - public SgFeedDetails selectSgFeedDetailsById(Long id); - - /** - * 查询饲喂记录详情列表 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 饲喂记录详情集合 - */ - public List selectSgFeedDetailsList(SgFeedDetails sgFeedDetails); - - /** - * 新增饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - public int insertSgFeedDetails(SgFeedDetails sgFeedDetails); - - /** - * 修改饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - public int updateSgFeedDetails(SgFeedDetails sgFeedDetails); - - /** - * 批量删除饲喂记录详情 - * - * @param ids 需要删除的饲喂记录详情主键集合 - * @return 结果 - */ - public int deleteSgFeedDetailsByIds(Long[] ids); - - /** - * 删除饲喂记录详情信息 - * - * @param id 饲喂记录详情主键 - * @return 结果 - */ - public int deleteSgFeedDetailsById(Long id); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedInfoService.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedInfoService.java deleted file mode 100644 index 8d412b8..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedInfoService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.service; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedInfo; - -/** - * 饲喂记录Service接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface ISgFeedInfoService -{ - /** - * 查询饲喂记录 - * - * @param id 饲喂记录主键 - * @return 饲喂记录 - */ - public SgFeedInfo selectSgFeedInfoById(Long id); - - /** - * 查询饲喂记录列表 - * - * @param sgFeedInfo 饲喂记录 - * @return 饲喂记录集合 - */ - public List selectSgFeedInfoList(SgFeedInfo sgFeedInfo); - - /** - * 新增饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - public int insertSgFeedInfo(SgFeedInfo sgFeedInfo); - - /** - * 修改饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - public int updateSgFeedInfo(SgFeedInfo sgFeedInfo); - - /** - * 批量删除饲喂记录 - * - * @param ids 需要删除的饲喂记录主键集合 - * @return 结果 - */ - public int deleteSgFeedInfoByIds(Long[] ids); - - /** - * 删除饲喂记录信息 - * - * @param id 饲喂记录主键 - * @return 结果 - */ - public int deleteSgFeedInfoById(Long id); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java index 3b172e0..6ab5cf3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java @@ -8,7 +8,7 @@ import com.zhyc.module.feed.domain.SgFeedPlan; * 饲喂计划Service接口 * * @author HashMap - * @date 2025-08-08 + * @date 2025-08-14 */ public interface ISgFeedPlanService { @@ -18,7 +18,7 @@ public interface ISgFeedPlanService * @param createDate 饲喂计划主键 * @return 饲喂计划 */ - SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate); + public SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate); /** * 查询饲喂计划列表 @@ -26,7 +26,7 @@ public interface ISgFeedPlanService * @param sgFeedPlan 饲喂计划 * @return 饲喂计划集合 */ - List selectSgFeedPlanList(SgFeedPlan sgFeedPlan); + public List selectSgFeedPlanList(SgFeedPlan sgFeedPlan); /** * 新增饲喂计划 @@ -34,7 +34,7 @@ public interface ISgFeedPlanService * @param sgFeedPlan 饲喂计划 * @return 结果 */ - int insertSgFeedPlan(SgFeedPlan sgFeedPlan); + public int insertSgFeedPlan(SgFeedPlan sgFeedPlan); /** * 修改饲喂计划 @@ -42,7 +42,7 @@ public interface ISgFeedPlanService * @param sgFeedPlan 饲喂计划 * @return 结果 */ - int updateSgFeedPlan(SgFeedPlan sgFeedPlan); + public int updateSgFeedPlan(SgFeedPlan sgFeedPlan); /** * 批量删除饲喂计划 @@ -50,7 +50,7 @@ public interface ISgFeedPlanService * @param createDates 需要删除的饲喂计划主键集合 * @return 结果 */ - int deleteSgFeedPlanByCreateDates(Date[] createDates); + public int deleteSgFeedPlanByCreateDates(Date[] createDates); /** * 删除饲喂计划信息 @@ -58,5 +58,7 @@ public interface ISgFeedPlanService * @param createDate 饲喂计划主键 * @return 结果 */ - int deleteSgFeedPlanByCreateDate(Date createDate); + public int deleteSgFeedPlanByCreateDate(Date createDate); + + int getSheepCountByFoldId(Integer foldId); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedRatioService.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedRatioService.java deleted file mode 100644 index 804130f..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedRatioService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.service; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFeedRatio; - -/** - * 饲喂比例Service接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface ISgFeedRatioService -{ - /** - * 查询饲喂比例 - * - * @param id 饲喂比例主键 - * @return 饲喂比例 - */ - public SgFeedRatio selectSgFeedRatioById(Long id); - - /** - * 查询饲喂比例列表 - * - * @param sgFeedRatio 饲喂比例 - * @return 饲喂比例集合 - */ - public List selectSgFeedRatioList(SgFeedRatio sgFeedRatio); - - /** - * 新增饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - public int insertSgFeedRatio(SgFeedRatio sgFeedRatio); - - /** - * 修改饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - public int updateSgFeedRatio(SgFeedRatio sgFeedRatio); - - /** - * 批量删除饲喂比例 - * - * @param ids 需要删除的饲喂比例主键集合 - * @return 结果 - */ - public int deleteSgFeedRatioByIds(Long[] ids); - - /** - * 删除饲喂比例信息 - * - * @param id 饲喂比例主键 - * @return 结果 - */ - public int deleteSgFeedRatioById(Long id); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFodderService.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFodderService.java deleted file mode 100644 index 3ddac8f..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFodderService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zhyc.module.feed.service; - -import java.util.List; -import com.zhyc.module.feed.domain.SgFodder; - -/** - * 原料Service接口 - * - * @author ruoyi - * @date 2025-08-01 - */ -public interface ISgFodderService -{ - /** - * 查询原料 - * - * @param id 原料主键 - * @return 原料 - */ - public SgFodder selectSgFodderById(Long id); - - /** - * 查询原料列表 - * - * @param sgFodder 原料 - * @return 原料集合 - */ - public List selectSgFodderList(SgFodder sgFodder); - - /** - * 新增原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - public int insertSgFodder(SgFodder sgFodder); - - /** - * 修改原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - public int updateSgFodder(SgFodder sgFodder); - - /** - * 批量删除原料 - * - * @param ids 需要删除的原料主键集合 - * @return 结果 - */ - public int deleteSgFodderByIds(Long[] ids); - - /** - * 删除原料信息 - * - * @param id 原料主键 - * @return 结果 - */ - public int deleteSgFodderById(Long id); -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedDetailsServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedDetailsServiceImpl.java deleted file mode 100644 index 2f58d33..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedDetailsServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zhyc.module.feed.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.zhyc.module.feed.mapper.SgFeedDetailsMapper; -import com.zhyc.module.feed.domain.SgFeedDetails; -import com.zhyc.module.feed.service.ISgFeedDetailsService; - -/** - * 饲喂记录详情Service业务层处理 - * - * @author ruoyi - * @date 2025-08-01 - */ -@Service -public class SgFeedDetailsServiceImpl implements ISgFeedDetailsService -{ - @Autowired - private SgFeedDetailsMapper sgFeedDetailsMapper; - - /** - * 查询饲喂记录详情 - * - * @param id 饲喂记录详情主键 - * @return 饲喂记录详情 - */ - @Override - public SgFeedDetails selectSgFeedDetailsById(Long id) - { - return sgFeedDetailsMapper.selectSgFeedDetailsById(id); - } - - /** - * 查询饲喂记录详情列表 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 饲喂记录详情 - */ - @Override - public List selectSgFeedDetailsList(SgFeedDetails sgFeedDetails) - { - return sgFeedDetailsMapper.selectSgFeedDetailsList(sgFeedDetails); - } - - /** - * 新增饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - @Override - public int insertSgFeedDetails(SgFeedDetails sgFeedDetails) - { - return sgFeedDetailsMapper.insertSgFeedDetails(sgFeedDetails); - } - - /** - * 修改饲喂记录详情 - * - * @param sgFeedDetails 饲喂记录详情 - * @return 结果 - */ - @Override - public int updateSgFeedDetails(SgFeedDetails sgFeedDetails) - { - return sgFeedDetailsMapper.updateSgFeedDetails(sgFeedDetails); - } - - /** - * 批量删除饲喂记录详情 - * - * @param ids 需要删除的饲喂记录详情主键 - * @return 结果 - */ - @Override - public int deleteSgFeedDetailsByIds(Long[] ids) - { - return sgFeedDetailsMapper.deleteSgFeedDetailsByIds(ids); - } - - /** - * 删除饲喂记录详情信息 - * - * @param id 饲喂记录详情主键 - * @return 结果 - */ - @Override - public int deleteSgFeedDetailsById(Long id) - { - return sgFeedDetailsMapper.deleteSgFeedDetailsById(id); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedInfoServiceImpl.java deleted file mode 100644 index ea2f711..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedInfoServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.zhyc.module.feed.service.impl; - -import java.util.List; -import com.zhyc.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.zhyc.module.feed.mapper.SgFeedInfoMapper; -import com.zhyc.module.feed.domain.SgFeedInfo; -import com.zhyc.module.feed.service.ISgFeedInfoService; - -/** - * 饲喂记录Service业务层处理 - * - * @author ruoyi - * @date 2025-08-01 - */ -@Service -public class SgFeedInfoServiceImpl implements ISgFeedInfoService -{ - @Autowired - private SgFeedInfoMapper sgFeedInfoMapper; - - /** - * 查询饲喂记录 - * - * @param id 饲喂记录主键 - * @return 饲喂记录 - */ - @Override - public SgFeedInfo selectSgFeedInfoById(Long id) - { - return sgFeedInfoMapper.selectSgFeedInfoById(id); - } - - /** - * 查询饲喂记录列表 - * - * @param sgFeedInfo 饲喂记录 - * @return 饲喂记录 - */ - @Override - public List selectSgFeedInfoList(SgFeedInfo sgFeedInfo) - { - return sgFeedInfoMapper.selectSgFeedInfoList(sgFeedInfo); - } - - /** - * 新增饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - @Override - public int insertSgFeedInfo(SgFeedInfo sgFeedInfo) - { - sgFeedInfo.setCreateTime(DateUtils.getNowDate()); - return sgFeedInfoMapper.insertSgFeedInfo(sgFeedInfo); - } - - /** - * 修改饲喂记录 - * - * @param sgFeedInfo 饲喂记录 - * @return 结果 - */ - @Override - public int updateSgFeedInfo(SgFeedInfo sgFeedInfo) - { - return sgFeedInfoMapper.updateSgFeedInfo(sgFeedInfo); - } - - /** - * 批量删除饲喂记录 - * - * @param ids 需要删除的饲喂记录主键 - * @return 结果 - */ - @Override - public int deleteSgFeedInfoByIds(Long[] ids) - { - return sgFeedInfoMapper.deleteSgFeedInfoByIds(ids); - } - - /** - * 删除饲喂记录信息 - * - * @param id 饲喂记录主键 - * @return 结果 - */ - @Override - public int deleteSgFeedInfoById(Long id) - { - return sgFeedInfoMapper.deleteSgFeedInfoById(id); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java index 937cd32..79bcfcc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 饲喂计划Service业务层处理 * * @author HashMap - * @date 2025-08-08 + * @date 2025-08-14 */ @Service @Transactional(rollbackFor=Exception.class) @@ -96,4 +96,9 @@ public class SgFeedPlanServiceImpl implements ISgFeedPlanService { return sgFeedPlanMapper.deleteSgFeedPlanByCreateDate(createDate); } + + @Override + public int getSheepCountByFoldId(Integer foldId) { + return sgFeedPlanMapper.selectSheepCountByFoldId(foldId); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedRatioServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedRatioServiceImpl.java deleted file mode 100644 index ee15ab0..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedRatioServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zhyc.module.feed.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.zhyc.module.feed.mapper.SgFeedRatioMapper; -import com.zhyc.module.feed.domain.SgFeedRatio; -import com.zhyc.module.feed.service.ISgFeedRatioService; - -/** - * 饲喂比例Service业务层处理 - * - * @author ruoyi - * @date 2025-08-01 - */ -@Service -public class SgFeedRatioServiceImpl implements ISgFeedRatioService -{ - @Autowired - private SgFeedRatioMapper sgFeedRatioMapper; - - /** - * 查询饲喂比例 - * - * @param id 饲喂比例主键 - * @return 饲喂比例 - */ - @Override - public SgFeedRatio selectSgFeedRatioById(Long id) - { - return sgFeedRatioMapper.selectSgFeedRatioById(id); - } - - /** - * 查询饲喂比例列表 - * - * @param sgFeedRatio 饲喂比例 - * @return 饲喂比例 - */ - @Override - public List selectSgFeedRatioList(SgFeedRatio sgFeedRatio) - { - return sgFeedRatioMapper.selectSgFeedRatioList(sgFeedRatio); - } - - /** - * 新增饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - @Override - public int insertSgFeedRatio(SgFeedRatio sgFeedRatio) - { - return sgFeedRatioMapper.insertSgFeedRatio(sgFeedRatio); - } - - /** - * 修改饲喂比例 - * - * @param sgFeedRatio 饲喂比例 - * @return 结果 - */ - @Override - public int updateSgFeedRatio(SgFeedRatio sgFeedRatio) - { - return sgFeedRatioMapper.updateSgFeedRatio(sgFeedRatio); - } - - /** - * 批量删除饲喂比例 - * - * @param ids 需要删除的饲喂比例主键 - * @return 结果 - */ - @Override - public int deleteSgFeedRatioByIds(Long[] ids) - { - return sgFeedRatioMapper.deleteSgFeedRatioByIds(ids); - } - - /** - * 删除饲喂比例信息 - * - * @param id 饲喂比例主键 - * @return 结果 - */ - @Override - public int deleteSgFeedRatioById(Long id) - { - return sgFeedRatioMapper.deleteSgFeedRatioById(id); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFodderServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFodderServiceImpl.java deleted file mode 100644 index 523fc3d..0000000 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFodderServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zhyc.module.feed.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.zhyc.module.feed.mapper.SgFodderMapper; -import com.zhyc.module.feed.domain.SgFodder; -import com.zhyc.module.feed.service.ISgFodderService; - -/** - * 原料Service业务层处理 - * - * @author ruoyi - * @date 2025-08-01 - */ -@Service -public class SgFodderServiceImpl implements ISgFodderService -{ - @Autowired - private SgFodderMapper sgFodderMapper; - - /** - * 查询原料 - * - * @param id 原料主键 - * @return 原料 - */ - @Override - public SgFodder selectSgFodderById(Long id) - { - return sgFodderMapper.selectSgFodderById(id); - } - - /** - * 查询原料列表 - * - * @param sgFodder 原料 - * @return 原料 - */ - @Override - public List selectSgFodderList(SgFodder sgFodder) - { - return sgFodderMapper.selectSgFodderList(sgFodder); - } - - /** - * 新增原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - @Override - public int insertSgFodder(SgFodder sgFodder) - { - return sgFodderMapper.insertSgFodder(sgFodder); - } - - /** - * 修改原料 - * - * @param sgFodder 原料 - * @return 结果 - */ - @Override - public int updateSgFodder(SgFodder sgFodder) - { - return sgFodderMapper.updateSgFodder(sgFodder); - } - - /** - * 批量删除原料 - * - * @param ids 需要删除的原料主键 - * @return 结果 - */ - @Override - public int deleteSgFodderByIds(Long[] ids) - { - return sgFodderMapper.deleteSgFodderByIds(ids); - } - - /** - * 删除原料信息 - * - * @param id 原料主键 - * @return 结果 - */ - @Override - public int deleteSgFodderById(Long id) - { - return sgFodderMapper.deleteSgFodderById(id); - } -} diff --git a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java index f26eb3a..320a9d3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java @@ -1,7 +1,6 @@ package com.zhyc.module.feed.service.impl; import java.util.List; -import java.util.Objects; import org.springframework.stereotype.Service; import com.zhyc.module.feed.mapper.SgFormulaListMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java index 23ac1e1..b94a01b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java @@ -3,7 +3,6 @@ package com.zhyc.module.produce.bodyManage.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.zhyc.common.utils.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java index cf9e617..3e73035 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java @@ -3,11 +3,8 @@ package com.zhyc.module.produce.bodyManage.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; -import org.springframework.data.annotation.AccessType; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java index 005eb4b..83ded3e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java index 3699f57..872bf26 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java index 2f1c625..187d22e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java index 1989341..b0991c9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.breed.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java index db6f059..2658186 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java index 4380caf..f96ecee 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.breed.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java index c5f548d..6746caf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java @@ -1,13 +1,8 @@ package com.zhyc.module.produce.breed.domain; -import java.math.BigDecimal; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java index 07f0fb8..07ffe30 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java index 69044e4..4c71d76 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java @@ -8,8 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java index f02d38f..41bcb5c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java @@ -1,13 +1,10 @@ package com.zhyc.module.produce.breed.domain; -import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java index 79c70ce..b0e4dcb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java @@ -8,8 +8,6 @@ import com.zhyc.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 断奶记录对象 sc_wean_record diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java index 85edef3..1a26677 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java @@ -2,7 +2,6 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import com.zhyc.module.produce.breed.domain.ScLambingRecord; -import com.zhyc.module.produce.breed.domain.ScLambDetail; import org.apache.ibatis.annotations.Mapper; /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java index dde2c3d..5c329c6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java @@ -3,7 +3,6 @@ package com.zhyc.module.produce.breed.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Date; import java.util.Calendar; import com.zhyc.common.utils.DateUtils; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java index 2243411..0667e48 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java index f2ef13f..f42ebf6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java index 5f5e8ee..1566b62 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java index ba62557..28a47ac 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java @@ -3,11 +3,8 @@ package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; -import org.springframework.beans.factory.annotation.Autowired; /** * 转群记录对象 sc_trans_group diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java index 554bf4d..fbb6538 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java index f45aa59..3f0f4dd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java @@ -2,7 +2,7 @@ package com.zhyc.module.produce.manage_sheep.service.impl; import java.util.Date; import java.util.List; -import com.zhyc.common.utils.DateUtils; + import com.zhyc.common.utils.SecurityUtils; import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.service.IBasSheepService; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java index cd8a96b..7c698af 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.zhyc.common.utils.StringUtils; import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.DaRanch; import com.zhyc.module.base.mapper.BasSheepMapper; -import com.zhyc.module.base.mapper.DaRanchMapper; import com.zhyc.module.base.service.IBasSheepService; import com.zhyc.module.base.service.IDaRanchService; import com.zhyc.module.produce.manage_sheep.mapper.ScTransitionInfoMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java index 1ebab6d..4b40215 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.other.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java index 60a92a8..1a723ec 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java @@ -3,8 +3,6 @@ package com.zhyc.module.produce.other.domain; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java index fde7034..298d6c5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java @@ -14,7 +14,6 @@ import com.zhyc.module.produce.other.mapper.ScFixHoofMapper; import com.zhyc.module.produce.other.service.IScFixHoofService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 修蹄Service业务层处理 diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedDetailsMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedDetailsMapper.xml deleted file mode 100644 index 0966729..0000000 --- a/zhyc-module/src/main/resources/mapper/feed/SgFeedDetailsMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, fodder, number, nuit from sg_feed_details - - - - - - - - insert into sg_feed_details - - fodder, - number, - nuit, - - - #{fodder}, - #{number}, - #{nuit}, - - - - - update sg_feed_details - - fodder = #{fodder}, - number = #{number}, - nuit = #{nuit}, - - where id = #{id} - - - - delete from sg_feed_details where id = #{id} - - - - delete from sg_feed_details where id in - - #{id} - - - \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedInfoMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedInfoMapper.xml deleted file mode 100644 index 536e136..0000000 --- a/zhyc-module/src/main/resources/mapper/feed/SgFeedInfoMapper.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select id, formula_id, sheepfold_id, average, plan_monring, actual_monring, plan_noon, actual_noon, plan_evenig, actual_evening, particle, other, replenish, plan_date, comment, create_by, create_time from sg_feed_info - - - - - - - - insert into sg_feed_info - - formula_id, - sheepfold_id, - average, - plan_monring, - actual_monring, - plan_noon, - actual_noon, - plan_evenig, - actual_evening, - particle, - other, - replenish, - plan_date, - comment, - create_by, - create_time, - - - #{formulaId}, - #{sheepfoldId}, - #{average}, - #{planMonring}, - #{actualMonring}, - #{planNoon}, - #{actualNoon}, - #{planEvenig}, - #{actualEvening}, - #{particle}, - #{other}, - #{replenish}, - #{planDate}, - #{comment}, - #{createBy}, - #{createTime}, - - - - - update sg_feed_info - - formula_id = #{formulaId}, - sheepfold_id = #{sheepfoldId}, - average = #{average}, - plan_monring = #{planMonring}, - actual_monring = #{actualMonring}, - plan_noon = #{planNoon}, - actual_noon = #{actualNoon}, - plan_evenig = #{planEvenig}, - actual_evening = #{actualEvening}, - particle = #{particle}, - other = #{other}, - replenish = #{replenish}, - plan_date = #{planDate}, - comment = #{comment}, - create_by = #{createBy}, - create_time = #{createTime}, - - where id = #{id} - - - - delete from sg_feed_info where id = #{id} - - - - delete from sg_feed_info where id in - - #{id} - - - \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml index fe2b6e3..b67f3df 100644 --- a/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml +++ b/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml @@ -7,21 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - - - @@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select create_date, formula_id, sheep_house_id, sheep_count, plan_daily_size, plan_morning_size, plan_morning_total, ratio_morning, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, ratio_noon, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, ratio_afternoon, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan + select create_date, formula_id, batch_id, sheep_house_id, sheep_count, plan_daily_size, ratio_morning, ratio_noon, ratio_afternoon, plan_morning_size, plan_morning_total, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan + SELECT COUNT(*) + FROM bas_sheep + WHERE sheepfold_id = #{foldId} + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedRatioMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedRatioMapper.xml deleted file mode 100644 index 2ebb1fd..0000000 --- a/zhyc-module/src/main/resources/mapper/feed/SgFeedRatioMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, morning, noon, evening from sg_feed_ratio - - - - - - - - insert into sg_feed_ratio - - morning, - noon, - evening, - - - #{morning}, - #{noon}, - #{evening}, - - - - - update sg_feed_ratio - - morning = #{morning}, - noon = #{noon}, - evening = #{evening}, - - where id = #{id} - - - - delete from sg_feed_ratio where id = #{id} - - - - delete from sg_feed_ratio where id in - - #{id} - - - \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFodderMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFodderMapper.xml deleted file mode 100644 index 8f4638b..0000000 --- a/zhyc-module/src/main/resources/mapper/feed/SgFodderMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - select id, name, fodder_type from sg_fodder - - - - - - - - insert into sg_fodder - - name, - fodder_type, - - - #{name}, - #{fodderType}, - - - - - update sg_fodder - - name = #{name}, - fodder_type = #{fodderType}, - - where id = #{id} - - - - delete from sg_fodder where id = #{id} - - - - delete from sg_fodder where id in - - #{id} - - - \ No newline at end of file