diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/controller/BasSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/produce/sheep/controller/BasSheepController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java index 4726cf1..54f3003 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/controller/BasSheepController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java @@ -1,14 +1,11 @@ -package com.zhyc.module.produce.sheep.controller; +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.produce.sheep.domain.BasSheep; -import com.zhyc.module.produce.sheep.mapper.BasSheepMapper; -import com.zhyc.module.produce.sheep.service.IBasSheepService; +import com.zhyc.module.base.domain.BasSheep; +import com.zhyc.module.base.mapper.BasSheepMapper; +import com.zhyc.module.base.service.IBasSheepService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java index 0413aad..f681ab3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java @@ -1,12 +1,12 @@ -package com.zhyc.module.fileManagement.controller; +package com.zhyc.module.base.controller; 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.common.utils.poi.ExcelUtil; -import com.zhyc.module.fileManagement.domain.BasSheepGroup; -import com.zhyc.module.fileManagement.service.IBasSheepGroupService; +import com.zhyc.module.base.domain.BasSheepGroup; +import com.zhyc.module.base.service.IBasSheepGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupMappingController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupMappingController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java index 99aac40..ae73bad 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupMappingController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.controller; +package com.zhyc.module.base.controller; import java.util.Arrays; import java.util.List; @@ -6,6 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.zhyc.common.utils.StringUtils; +import com.zhyc.module.base.domain.BasSheepGroupMapping; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,8 +14,7 @@ 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.fileManagement.domain.BasSheepGroupMapping; -import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService; +import com.zhyc.module.base.service.IBasSheepGroupMappingService; 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/base/variety/controller/BasSheepVarietyController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepVarietyController.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/base/variety/controller/BasSheepVarietyController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepVarietyController.java index 1c24dfa..0954dc3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/variety/controller/BasSheepVarietyController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepVarietyController.java @@ -1,7 +1,10 @@ -package com.zhyc.module.base.variety.controller; +package com.zhyc.module.base.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.base.domain.BasSheepVariety; +import com.zhyc.module.base.service.IBasSheepVarietyService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +19,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.base.variety.domain.BasSheepVariety; -import com.zhyc.module.base.variety.service.IBasSheepVarietyService; 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/fileManagement/controller/DaSheepfoldController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/DaSheepfoldController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java index 2a8f8bc..d4bfeb6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/DaSheepfoldController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.controller; +package com.zhyc.module.base.controller; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; @@ -6,8 +6,8 @@ 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.fileManagement.domain.DaSheepfold; -import com.zhyc.module.fileManagement.service.IDaSheepfoldService; +import com.zhyc.module.base.domain.DaSheepfold; +import com.zhyc.module.base.service.IDaSheepfoldService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java rename to zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java index 4ac2cd7..dc1c0c2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.controller; +package com.zhyc.module.base.controller; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; @@ -6,8 +6,8 @@ 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.fileManagement.domain.SheepFile; -import com.zhyc.module.fileManagement.service.ISheepFileService; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.service.ISheepFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/domain/BasSheep.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/sheep/domain/BasSheep.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java index c75cf31..f202443 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/domain/BasSheep.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.sheep.domain; +package com.zhyc.module.base.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java index c39a308..bd1a9f4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.domain; +package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.TreeEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroupMapping.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroupMapping.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java index 37798f3..2dfdd71 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroupMapping.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.domain; +package com.zhyc.module.base.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/variety/domain/BasSheepVariety.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/base/variety/domain/BasSheepVariety.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java index 35a541a..df8c797 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/variety/domain/BasSheepVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java @@ -1,4 +1,4 @@ -package com.zhyc.module.base.variety.domain; +package com.zhyc.module.base.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java index 4b19b03..75bf6c4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.domain; +package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java rename to zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java index d8aea83..7fd6fa5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java @@ -1,4 +1,4 @@ -package com.zhyc.module.fileManagement.domain; +package com.zhyc.module.base.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhyc.common.annotation.Excel; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java index a7a434d..575929b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.mapper; +package com.zhyc.module.base.mapper; -import com.zhyc.module.fileManagement.domain.BasSheepGroup; +import com.zhyc.module.base.domain.BasSheepGroup; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMappingMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMappingMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java index d919e95..caf186e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMappingMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java @@ -1,9 +1,9 @@ -package com.zhyc.module.fileManagement.mapper; +package com.zhyc.module.base.mapper; import java.util.List; import java.util.Map; -import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping; +import com.zhyc.module.base.domain.BasSheepGroupMapping; import org.apache.ibatis.annotations.Param; /** * 羊只分组关联Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/mapper/BasSheepMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/produce/sheep/mapper/BasSheepMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java index d31d003..b565a9c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/mapper/BasSheepMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.sheep.mapper; +package com.zhyc.module.base.mapper; import java.util.List; -import com.zhyc.module.produce.sheep.domain.BasSheep; -import org.apache.ibatis.annotations.Param; + +import com.zhyc.module.base.domain.BasSheep; /** * 羊只基本信息Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/variety/mapper/BasSheepVarietyMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/base/variety/mapper/BasSheepVarietyMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java index 02927cb..4135097 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/variety/mapper/BasSheepVarietyMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java @@ -1,7 +1,8 @@ -package com.zhyc.module.base.variety.mapper; +package com.zhyc.module.base.mapper; import java.util.List; -import com.zhyc.module.base.variety.domain.BasSheepVariety; + +import com.zhyc.module.base.domain.BasSheepVariety; /** * 羊只品种Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java index 0d9a57c..21bb2d0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.mapper; +package com.zhyc.module.base.mapper; -import com.zhyc.module.fileManagement.domain.DaSheepfold; +import com.zhyc.module.base.domain.DaSheepfold; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java index ef9c9a0..b4af8dc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.mapper; +package com.zhyc.module.base.mapper; -import com.zhyc.module.fileManagement.domain.SheepFile; +import com.zhyc.module.base.domain.SheepFile; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupMappingService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupMappingService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java index 0c543e4..a9f08a1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupMappingService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java @@ -1,9 +1,9 @@ -package com.zhyc.module.fileManagement.service; +package com.zhyc.module.base.service; import java.util.List; import java.util.Map; -import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping; +import com.zhyc.module.base.domain.BasSheepGroupMapping; /** * 羊只分组关联Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupService.java index 7f55e6f..330d5fc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupService.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.service; +package com.zhyc.module.base.service; -import com.zhyc.module.fileManagement.domain.BasSheepGroup; +import com.zhyc.module.base.domain.BasSheepGroup; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/IBasSheepService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/IBasSheepService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepService.java index 3d94ce2..5e87c22 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/IBasSheepService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.produce.sheep.service; +package com.zhyc.module.base.service; import java.util.List; -import com.zhyc.module.produce.sheep.domain.BasSheep; + +import com.zhyc.module.base.domain.BasSheep; /** * 羊只基本信息Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/variety/service/IBasSheepVarietyService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepVarietyService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/base/variety/service/IBasSheepVarietyService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepVarietyService.java index f2fc713..29b288f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/variety/service/IBasSheepVarietyService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepVarietyService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.base.variety.service; +package com.zhyc.module.base.service; import java.util.List; -import com.zhyc.module.base.variety.domain.BasSheepVariety; + +import com.zhyc.module.base.domain.BasSheepVariety; /** * 羊只品种Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/IDaSheepfoldService.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/IDaSheepfoldService.java index 83a336b..fa2486f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IDaSheepfoldService.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.service; +package com.zhyc.module.base.service; -import com.zhyc.module.fileManagement.domain.DaSheepfold; +import com.zhyc.module.base.domain.DaSheepfold; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java index 7bc76ed..9084727 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java @@ -1,6 +1,6 @@ -package com.zhyc.module.fileManagement.service; +package com.zhyc.module.base.service; -import com.zhyc.module.fileManagement.domain.SheepFile; +import com.zhyc.module.base.domain.SheepFile; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupMappingServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupMappingServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java index f119bed..b0b38ab 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupMappingServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java @@ -1,13 +1,13 @@ -package com.zhyc.module.fileManagement.service.impl; +package com.zhyc.module.base.service.impl; import java.util.List; import java.util.Map; +import com.zhyc.module.base.domain.BasSheepGroupMapping; +import com.zhyc.module.base.mapper.BasSheepGroupMappingMapper; +import com.zhyc.module.base.service.IBasSheepGroupMappingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.fileManagement.mapper.BasSheepGroupMappingMapper; -import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping; -import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService; /** * 羊只分组关联Service业务层处理 @@ -16,7 +16,7 @@ import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService; * @date 2025-07-16 */ @Service -public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingService +public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingService { @Autowired private BasSheepGroupMappingMapper basSheepGroupMappingMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java index 9df99d3..3d375b3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java @@ -1,9 +1,9 @@ -package com.zhyc.module.fileManagement.service.impl; +package com.zhyc.module.base.service.impl; import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.fileManagement.domain.BasSheepGroup; -import com.zhyc.module.fileManagement.mapper.BasSheepGroupMapper; -import com.zhyc.module.fileManagement.service.IBasSheepGroupService; +import com.zhyc.module.base.domain.BasSheepGroup; +import com.zhyc.module.base.mapper.BasSheepGroupMapper; +import com.zhyc.module.base.service.IBasSheepGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * @date 2025-07-14 */ @Service -public class BasSheepGroupServiceImpl implements IBasSheepGroupService +public class BasSheepGroupServiceImpl implements IBasSheepGroupService { @Autowired private BasSheepGroupMapper basSheepGroupMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/impl/BasSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/impl/BasSheepServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java index 5c4aa1c..36c8897 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/impl/BasSheepServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhyc.module.produce.sheep.service.impl; +package com.zhyc.module.base.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.module.base.domain.BasSheep; +import com.zhyc.module.base.mapper.BasSheepMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.produce.sheep.mapper.BasSheepMapper; -import com.zhyc.module.produce.sheep.domain.BasSheep; -import com.zhyc.module.produce.sheep.service.IBasSheepService; +import com.zhyc.module.base.service.IBasSheepService; /** * 羊只基本信息Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/variety/service/impl/BasSheepVarietyServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepVarietyServiceImpl.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/base/variety/service/impl/BasSheepVarietyServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepVarietyServiceImpl.java index beacc22..048930e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/variety/service/impl/BasSheepVarietyServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepVarietyServiceImpl.java @@ -1,11 +1,12 @@ -package com.zhyc.module.base.variety.service.impl; +package com.zhyc.module.base.service.impl; import java.util.List; + +import com.zhyc.module.base.domain.BasSheepVariety; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.base.variety.mapper.BasSheepVarietyMapper; -import com.zhyc.module.base.variety.domain.BasSheepVariety; -import com.zhyc.module.base.variety.service.IBasSheepVarietyService; +import com.zhyc.module.base.mapper.BasSheepVarietyMapper; +import com.zhyc.module.base.service.IBasSheepVarietyService; /** * 羊只品种Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java index 6e8189a..ac74ecd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java @@ -1,8 +1,8 @@ -package com.zhyc.module.fileManagement.service.impl; +package com.zhyc.module.base.service.impl; -import com.zhyc.module.fileManagement.domain.DaSheepfold; -import com.zhyc.module.fileManagement.mapper.DaSheepfoldMapper; -import com.zhyc.module.fileManagement.service.IDaSheepfoldService; +import com.zhyc.module.base.domain.DaSheepfold; +import com.zhyc.module.base.mapper.DaSheepfoldMapper; +import com.zhyc.module.base.service.IDaSheepfoldService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java similarity index 86% rename from zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index b5e8d29..9402a6b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -1,9 +1,9 @@ -package com.zhyc.module.fileManagement.service.impl; +package com.zhyc.module.base.service.impl; import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.fileManagement.domain.SheepFile; -import com.zhyc.module.fileManagement.mapper.SheepFileMapper; -import com.zhyc.module.fileManagement.service.ISheepFileService; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.base.service.ISheepFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * @date 2025-07-13 */ @Service -public class SheepFileServiceImpl implements ISheepFileService +public class SheepFileServiceImpl implements ISheepFileService { @Autowired private SheepFileMapper sheepFileMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/controller/NpFreshMilkInspController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpFreshMilkInspController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/controller/NpFreshMilkInspController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpFreshMilkInspController.java index d91901c..4c1aa3f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/controller/NpFreshMilkInspController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpFreshMilkInspController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.freshMilkTest.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ 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.freshMilkTest.domain.NpFreshMilkInsp; -import com.zhyc.module.dairyProducts.freshMilkTest.service.INpFreshMilkInspService; +import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; +import com.zhyc.module.dairyProducts.service.INpFreshMilkInspService; 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/rawMilkTest/controller/NpRawMilkInspeController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpRawMilkInspeController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/controller/NpRawMilkInspeController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpRawMilkInspeController.java index d7989f1..bf88fcd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/controller/NpRawMilkInspeController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpRawMilkInspeController.java @@ -1,7 +1,9 @@ -package com.zhyc.module.dairyProducts.rawMilkTest.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.dairyProducts.service.INpRawMilkInspeService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +18,7 @@ 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.rawMilkTest.domain.NpRawMilkInspe; -import com.zhyc.module.dairyProducts.rawMilkTest.service.INpRawMilkInspeService; +import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; 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/yogurtTest/controller/NpYogurtInspController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpYogurtInspController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/controller/NpYogurtInspController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpYogurtInspController.java index bcb7ed1..fc7fda2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/controller/NpYogurtInspController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpYogurtInspController.java @@ -1,7 +1,9 @@ -package com.zhyc.module.dairyProducts.yogurtTest.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +18,7 @@ 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.yogurtTest.domain.NpYogurtInsp; -import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService; +import com.zhyc.module.dairyProducts.service.INpYogurtInspService; 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/dryMatterCorrection/controller/XzDryMatterCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzDryMatterCorrectionController.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/controller/XzDryMatterCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzDryMatterCorrectionController.java index d250d5c..bca0801 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/controller/XzDryMatterCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzDryMatterCorrectionController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.dryMatterCorrection.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ 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.dryMatterCorrection.domain.XzDryMatterCorrection; -import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; +import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.service.IXzDryMatterCorrectionService; 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/parityCorrection/controller/XzParityCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/controller/XzParityCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java index edc1fba..e103d79 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/controller/XzParityCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.parityCorrection.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ 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.parityCorrection.domain.XzParityCorrection; -import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; +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; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzWegihCorrectionController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzWegihCorrectionController.java index 36baa44..ace94f9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzWegihCorrectionController.java @@ -1,7 +1,10 @@ -package com.zhyc.module.dairyProducts.weightCorrection.controller; +package com.zhyc.module.dairyProducts.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.service.IXzWegihCorrectionService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +19,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.weightCorrection.domain.XzWegihCorrection; -import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; 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/freshMilkTest/domain/NpFreshMilkInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/domain/NpFreshMilkInsp.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java index a1c7fad..15e6314 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/domain/NpFreshMilkInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.freshMilkTest.domain; +package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/domain/NpRawMilkInspe.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/domain/NpRawMilkInspe.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java index 34bd7b2..5b140c6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/domain/NpRawMilkInspe.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java @@ -340,7 +340,7 @@ // .toString(); // } //} -package com.zhyc.module.dairyProducts.rawMilkTest.domain; +package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/domain/NpYogurtInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/domain/NpYogurtInsp.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java index d3e6110..cb57bbc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/domain/NpYogurtInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.yogurtTest.domain; +package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java index 5ea4e82..e7b1e13 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.dryMatterCorrection.domain; +package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java index 3c9e098..f74f452 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.parityCorrection.domain; +package com.zhyc.module.dairyProducts.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java similarity index 97% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java index 5a53ac8..a44abe3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dairyProducts.weightCorrection.domain; +package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/mapper/NpFreshMilkInspMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/mapper/NpFreshMilkInspMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java index e0671e5..1ec98fa 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/mapper/NpFreshMilkInspMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.freshMilkTest.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp; +import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; /** * 鲜奶生产，成品检验记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/mapper/NpRawMilkInspeMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/mapper/NpRawMilkInspeMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java index cbfd525..0391549 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/mapper/NpRawMilkInspeMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.rawMilkTest.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe; +import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; /** * 生乳检验记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/mapper/NpYogurtInspMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/mapper/NpYogurtInspMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java index 6d0d8dd..eae3d67 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/mapper/NpYogurtInspMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java @@ -1,7 +1,8 @@ -package com.zhyc.module.dairyProducts.yogurtTest.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp; + +import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; /** * 酸奶生产，成品检疫记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java index 8566be9..0db0aff 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.dryMatterCorrection.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; /** * 干物质校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java index 392ff04..e19c509 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.parityCorrection.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.domain.XzParityCorrection; /** * 胎次校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java index 2d1a65b..c21fab8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.weightCorrection.mapper; +package com.zhyc.module.dairyProducts.mapper; import java.util.List; -import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; /** * 称重校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/INpFreshMilkInspService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpFreshMilkInspService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/INpFreshMilkInspService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpFreshMilkInspService.java index 6c709e4..3f7c523 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/INpFreshMilkInspService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpFreshMilkInspService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.freshMilkTest.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp; +import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; /** * 鲜奶生产，成品检验记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/INpRawMilkInspeService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpRawMilkInspeService.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/INpRawMilkInspeService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpRawMilkInspeService.java index 2d4c1e3..dd12502 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/INpRawMilkInspeService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpRawMilkInspeService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.rawMilkTest.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe; +import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; /** * 生乳检验记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/INpYogurtInspService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpYogurtInspService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/INpYogurtInspService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpYogurtInspService.java index b2f8201..01582c4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/INpYogurtInspService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpYogurtInspService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.dairyProducts.yogurtTest.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp; + +import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; /** * 酸奶生产，成品检疫记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzDryMatterCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzDryMatterCorrectionService.java index ce3a891..522d857 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzDryMatterCorrectionService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.dryMatterCorrection.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; /** * 干物质校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzParityCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzParityCorrectionService.java index 099dfa2..d5c9ce2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzParityCorrectionService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.dairyProducts.parityCorrection.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; + +import com.zhyc.module.dairyProducts.domain.XzParityCorrection; /** * 胎次校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzWegihCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzWegihCorrectionService.java index 04f070a..d24ed2b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzWegihCorrectionService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dairyProducts.weightCorrection.service; +package com.zhyc.module.dairyProducts.service; import java.util.List; -import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; /** * 称重校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/impl/NpFreshMilkInspServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpFreshMilkInspServiceImpl.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/impl/NpFreshMilkInspServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpFreshMilkInspServiceImpl.java index c990280..cd59779 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/freshMilkTest/service/impl/NpFreshMilkInspServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpFreshMilkInspServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhyc.module.dairyProducts.freshMilkTest.service.impl; +package com.zhyc.module.dairyProducts.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.dairyProducts.freshMilkTest.mapper.NpFreshMilkInspMapper; -import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp; -import com.zhyc.module.dairyProducts.freshMilkTest.service.INpFreshMilkInspService; +import com.zhyc.module.dairyProducts.mapper.NpFreshMilkInspMapper; +import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; +import com.zhyc.module.dairyProducts.service.INpFreshMilkInspService; /** * 鲜奶生产，成品检验记录Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/impl/NpRawMilkInspeServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpRawMilkInspeServiceImpl.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/impl/NpRawMilkInspeServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpRawMilkInspeServiceImpl.java index fa12858..3422dff 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/rawMilkTest/service/impl/NpRawMilkInspeServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpRawMilkInspeServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhyc.module.dairyProducts.rawMilkTest.service.impl; +package com.zhyc.module.dairyProducts.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.dairyProducts.rawMilkTest.mapper.NpRawMilkInspeMapper; -import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe; -import com.zhyc.module.dairyProducts.rawMilkTest.service.INpRawMilkInspeService; +import com.zhyc.module.dairyProducts.mapper.NpRawMilkInspeMapper; +import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; +import com.zhyc.module.dairyProducts.service.INpRawMilkInspeService; /** * 生乳检验记录Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/impl/NpYogurtInspServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpYogurtInspServiceImpl.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/impl/NpYogurtInspServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpYogurtInspServiceImpl.java index e9096cc..f80e745 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/yogurtTest/service/impl/NpYogurtInspServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpYogurtInspServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhyc.module.dairyProducts.yogurtTest.service.impl; +package com.zhyc.module.dairyProducts.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; +import com.zhyc.module.dairyProducts.mapper.NpYogurtInspMapper; +import com.zhyc.module.dairyProducts.service.INpYogurtInspService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.dairyProducts.yogurtTest.mapper.NpYogurtInspMapper; -import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp; -import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService; /** * 酸奶生产，成品检疫记录Service业务层处理 @@ -15,7 +15,7 @@ import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService; * @date 2025-07-17 */ @Service -public class NpYogurtInspServiceImpl implements INpYogurtInspService +public class NpYogurtInspServiceImpl implements INpYogurtInspService { @Autowired private NpYogurtInspMapper npYogurtInspMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzDryMatterCorrectionServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzDryMatterCorrectionServiceImpl.java index dcf666f..4bf9fb2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzDryMatterCorrectionServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhyc.module.dairyProducts.dryMatterCorrection.service.impl; +package com.zhyc.module.dairyProducts.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.dairyProducts.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper; -import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; -import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; +import com.zhyc.module.dairyProducts.mapper.XzDryMatterCorrectionMapper; +import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.service.IXzDryMatterCorrectionService; /** * 干物质校正Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzParityCorrectionServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzParityCorrectionServiceImpl.java index ef55515..49f5731 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzParityCorrectionServiceImpl.java @@ -1,11 +1,12 @@ -package com.zhyc.module.dairyProducts.parityCorrection.service.impl; +package com.zhyc.module.dairyProducts.service.impl; import java.util.List; + +import com.zhyc.module.dairyProducts.mapper.XzParityCorrectionMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.dairyProducts.parityCorrection.mapper.XzParityCorrectionMapper; -import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; -import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; +import com.zhyc.module.dairyProducts.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.service.IXzParityCorrectionService; /** * 胎次校正Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzWegihCorrectionServiceImpl.java similarity index 86% rename from zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzWegihCorrectionServiceImpl.java index a8c59fb..7869c42 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzWegihCorrectionServiceImpl.java @@ -1,11 +1,12 @@ -package com.zhyc.module.dairyProducts.weightCorrection.service.impl; +package com.zhyc.module.dairyProducts.service.impl; import java.util.List; + +import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.mapper.XzWegihCorrectionMapper; +import com.zhyc.module.dairyProducts.service.IXzWegihCorrectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.dairyProducts.weightCorrection.mapper.XzWegihCorrectionMapper; -import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; -import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; /** * 称重校正Service业务层处理 @@ -14,7 +15,7 @@ import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrection * @date 2025-07-12 */ @Service -public class XzWegihCorrectionServiceImpl implements IXzWegihCorrectionService +public class XzWegihCorrectionServiceImpl implements IXzWegihCorrectionService { @Autowired private XzWegihCorrectionMapper xzWegihCorrectionMapper; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/controller/ScBreedPlanController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/controller/ScBreedPlanController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanController.java index 3dbfd57..7b6b947 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/controller/ScBreedPlanController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanController.java @@ -1,7 +1,9 @@ -package com.zhyc.module.produce.mating_plan.controller; +package com.zhyc.module.produce.breed.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.produce.breed.domain.ScBreedPlan; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +18,7 @@ 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.produce.mating_plan.domain.ScBreedPlan; -import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService; +import com.zhyc.module.produce.breed.service.IScBreedPlanService; 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/produce/mating_plan/controller/ScBreedPlanGenerateController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanGenerateController.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/controller/ScBreedPlanGenerateController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanGenerateController.java index 48daa6d..c872868 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/controller/ScBreedPlanGenerateController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanGenerateController.java @@ -1,9 +1,11 @@ -package com.zhyc.module.produce.mating_plan.controller; +package com.zhyc.module.produce.breed.controller; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate; +import com.zhyc.module.produce.breed.service.IScBreedPlanGenerateService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -18,11 +20,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.produce.mating_plan.domain.ScBreedPlan; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate; -import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService; -import com.zhyc.module.produce.mating_plan.service.IScBreedPlanGenerateService; -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/produce/drymilk/controller/ScDryMilkController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/controller/ScDryMilkController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java index a319379..4013c1d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/controller/ScDryMilkController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.drymilk.controller; +package com.zhyc.module.produce.breed.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ 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.produce.drymilk.domain.ScDryMilk; -import com.zhyc.module.produce.drymilk.service.IScDryMilkService; +import com.zhyc.module.produce.breed.domain.ScDryMilk; +import com.zhyc.module.produce.breed.service.IScDryMilkService; 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/produce/wean/controller/ScWeanRecordController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java similarity index 97% rename from zhyc-module/src/main/java/com/zhyc/module/produce/wean/controller/ScWeanRecordController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java index 79c05c5..d454abf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/controller/ScWeanRecordController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java @@ -1,7 +1,9 @@ -package com.zhyc.module.produce.wean.controller; +package com.zhyc.module.produce.breed.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.produce.breed.domain.ScWeanRecord; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +18,7 @@ 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.produce.wean.domain.ScWeanRecord; -import com.zhyc.module.produce.wean.service.IScWeanRecordService; +import com.zhyc.module.produce.breed.service.IScWeanRecordService; 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/produce/mating_plan/domain/ScBreedPlan.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlan.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java index 92380fc..c888a03 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlan.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.mating_plan.domain; +package com.zhyc.module.produce.breed.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanGenerate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanGenerate.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java index a09c184..1622ae6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanGenerate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.mating_plan.domain; +package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanTemp.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanTemp.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java index 4bcefbe..132ce77 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/domain/ScBreedPlanTemp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.mating_plan.domain; +package com.zhyc.module.produce.breed.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/domain/ScDryMilk.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/domain/ScDryMilk.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java index 115e443..7ffa127 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/domain/ScDryMilk.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.drymilk.domain; +package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/domain/ScWeanRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/produce/wean/domain/ScWeanRecord.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java index 1d11f7d..06ca783 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/domain/ScWeanRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.wean.domain; +package com.zhyc.module.produce.breed.domain; import java.math.BigDecimal; import java.util.Date; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanGenerateMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanGenerateMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java index f889fcc..a578784 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanGenerateMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java @@ -1,10 +1,10 @@ -package com.zhyc.module.produce.mating_plan.mapper; +package com.zhyc.module.produce.breed.mapper; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan; +import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate; +import com.zhyc.module.produce.breed.domain.ScBreedPlan; /** * 配种计划生成Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java index 9890750..f2a9c66 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/mapper/ScBreedPlanMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.produce.mating_plan.mapper; +package com.zhyc.module.produce.breed.mapper; import java.util.List; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan; +import com.zhyc.module.produce.breed.domain.ScBreedPlan; /** * 配种计划Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/mapper/ScDryMilkMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/mapper/ScDryMilkMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java index 9d5522b..daba529 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/mapper/ScDryMilkMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.produce.drymilk.mapper; +package com.zhyc.module.produce.breed.mapper; import java.util.List; -import com.zhyc.module.produce.drymilk.domain.ScDryMilk; +import com.zhyc.module.produce.breed.domain.ScDryMilk; /** * 干奶记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/mapper/ScWeanRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/wean/mapper/ScWeanRecordMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java index 1d56581..599621f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/mapper/ScWeanRecordMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.produce.wean.mapper; +package com.zhyc.module.produce.breed.mapper; import java.util.List; -import com.zhyc.module.produce.wean.domain.ScWeanRecord; +import com.zhyc.module.produce.breed.domain.ScWeanRecord; /** * 断奶记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanGenerateService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanGenerateService.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanGenerateService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanGenerateService.java index d54afc4..4580492 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanGenerateService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanGenerateService.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.mating_plan.service; +package com.zhyc.module.produce.breed.service; import java.util.List; import java.util.Map; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate; +import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate; /** * 配种计划生成Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanService.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanService.java index 44002cb..256778e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/IScBreedPlanService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.produce.mating_plan.service; +package com.zhyc.module.produce.breed.service; import java.util.List; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan; + +import com.zhyc.module.produce.breed.domain.ScBreedPlan; /** * 配种计划Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/IScDryMilkService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/IScDryMilkService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java index 3ec0649..ad90b57 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/IScDryMilkService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.produce.drymilk.service; +package com.zhyc.module.produce.breed.service; import java.util.List; -import com.zhyc.module.produce.drymilk.domain.ScDryMilk; +import com.zhyc.module.produce.breed.domain.ScDryMilk; /** * 干奶记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/IScWeanRecordService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/IScWeanRecordService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java index 9926de0..9f49b44 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/IScWeanRecordService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.produce.wean.service; +package com.zhyc.module.produce.breed.service; import java.util.List; -import com.zhyc.module.produce.wean.domain.ScWeanRecord; + +import com.zhyc.module.produce.breed.domain.ScWeanRecord; /** * 断奶记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanGenerateServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanGenerateServiceImpl.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanGenerateServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanGenerateServiceImpl.java index b67865f..3e88f7c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanGenerateServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanGenerateServiceImpl.java @@ -1,20 +1,20 @@ -package com.zhyc.module.produce.mating_plan.service.impl; +package com.zhyc.module.produce.breed.service.impl; import java.util.List; import java.util.Map; import java.util.HashMap; -import java.util.ArrayList; import java.util.Date; import java.text.SimpleDateFormat; + +import com.zhyc.module.produce.breed.domain.ScBreedPlan; +import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate; +import com.zhyc.module.produce.breed.mapper.ScBreedPlanGenerateMapper; +import com.zhyc.module.produce.breed.mapper.ScBreedPlanMapper; +import com.zhyc.module.produce.breed.service.IScBreedPlanGenerateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zhyc.common.utils.SecurityUtils; -import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanGenerateMapper; -import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanMapper; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan; -import com.zhyc.module.produce.mating_plan.service.IScBreedPlanGenerateService; /** * 配种计划生成Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanServiceImpl.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanServiceImpl.java index 7e4fc56..f6ae9b0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/mating_plan/service/impl/ScBreedPlanServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanServiceImpl.java @@ -1,11 +1,12 @@ -package com.zhyc.module.produce.mating_plan.service.impl; +package com.zhyc.module.produce.breed.service.impl; import java.util.List; + +import com.zhyc.module.produce.breed.domain.ScBreedPlan; +import com.zhyc.module.produce.breed.mapper.ScBreedPlanMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanMapper; -import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan; -import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService; +import com.zhyc.module.produce.breed.service.IScBreedPlanService; /** * 配种计划Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/impl/ScDryMilkServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/impl/ScDryMilkServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java index 3e7bf5d..dd87f80 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/drymilk/service/impl/ScDryMilkServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhyc.module.produce.drymilk.service.impl; +package com.zhyc.module.produce.breed.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.produce.drymilk.mapper.ScDryMilkMapper; -import com.zhyc.module.produce.drymilk.domain.ScDryMilk; -import com.zhyc.module.produce.drymilk.service.IScDryMilkService; +import com.zhyc.module.produce.breed.mapper.ScDryMilkMapper; +import com.zhyc.module.produce.breed.domain.ScDryMilk; +import com.zhyc.module.produce.breed.service.IScDryMilkService; import com.zhyc.common.utils.StringUtils; import com.zhyc.common.exception.ServiceException; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/impl/ScWeanRecordServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/impl/ScWeanRecordServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java index 1bf5e54..9efcaff 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/wean/service/impl/ScWeanRecordServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.zhyc.module.produce.wean.service.impl; +package com.zhyc.module.produce.breed.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.module.produce.breed.domain.ScWeanRecord; +import com.zhyc.module.produce.breed.mapper.ScWeanRecordMapper; +import com.zhyc.module.produce.breed.service.IScWeanRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.zhyc.module.produce.wean.mapper.ScWeanRecordMapper; -import com.zhyc.module.produce.wean.domain.ScWeanRecord; -import com.zhyc.module.produce.wean.service.IScWeanRecordService; /** * 断奶记录Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/controller/ScAddSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScAddSheepController.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/controller/ScAddSheepController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScAddSheepController.java index 07d8261..33d8118 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/controller/ScAddSheepController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScAddSheepController.java @@ -1,14 +1,14 @@ -package com.zhyc.module.produce.manage_sheep.add_sheep.controller; +package com.zhyc.module.produce.manage_sheep.controller; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.poi.ExcelUtil; -import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep; -import com.zhyc.module.produce.manage_sheep.add_sheep.service.IScAddSheepService; -import com.zhyc.module.fileManagement.domain.DaSheepfold; -import com.zhyc.module.fileManagement.service.IDaSheepfoldService; +import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep; +import com.zhyc.module.produce.manage_sheep.service.IScAddSheepService; +import com.zhyc.module.base.domain.DaSheepfold; +import com.zhyc.module.base.service.IDaSheepfoldService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/controller/ScTransGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/controller/ScTransGroupController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java index 3c303ff..1b5069f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/controller/ScTransGroupController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java @@ -1,11 +1,11 @@ -package com.zhyc.module.produce.manage_sheep.trans_group.controller; +package com.zhyc.module.produce.manage_sheep.controller; import java.io.IOException; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup; -import com.zhyc.module.produce.manage_sheep.trans_group.service.IScTransGroupService; +import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; +import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService; 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/manage_sheep/transition_info/controller/ScTransitionInfoController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/controller/ScTransitionInfoController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java index 0b438fd..2697a7a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/controller/ScTransitionInfoController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.transition_info.controller; +package com.zhyc.module.produce.manage_sheep.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ 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.produce.manage_sheep.transition_info.domain.ScTransitionInfo; -import com.zhyc.module.produce.manage_sheep.transition_info.service.IScTransitionInfoService; +import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo; +import com.zhyc.module.produce.manage_sheep.service.IScTransitionInfoService; 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/produce/manage_sheep/add_sheep/domain/ScAddSheep.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java similarity index 97% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/domain/ScAddSheep.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java index 625a90b..b493b4e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/domain/ScAddSheep.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.add_sheep.domain; +package com.zhyc.module.produce.manage_sheep.domain; 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/trans_group/domain/ScTransGroup.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/domain/ScTransGroup.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java index 5c23503..da94cbb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/domain/ScTransGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.trans_group.domain; +package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; @@ -66,12 +66,6 @@ public class ScTransGroup extends BaseEntity { @Excel(name = "品种") private String varietyName; - /** 品种id */ - private Long varietyId; - - /** 品种名称（联表查询返回，非数据库字段） */ - @Excel(name = "品种") - private String varietyName; private Integer reason; /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/domain/ScTransitionInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/domain/ScTransitionInfo.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java index 419d406..01899f4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/domain/ScTransitionInfo.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.transition_info.domain; +package com.zhyc.module.produce.manage_sheep.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/mapper/ScAddSheepMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScAddSheepMapper.java similarity index 73% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/mapper/ScAddSheepMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScAddSheepMapper.java index 87ed239..c6e3b27 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/mapper/ScAddSheepMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScAddSheepMapper.java @@ -1,6 +1,6 @@ -package com.zhyc.module.produce.manage_sheep.add_sheep.mapper; +package com.zhyc.module.produce.manage_sheep.mapper; -import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep; +import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/mapper/ScTransGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/mapper/ScTransGroupMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java index 3e4820e..01cb430 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/mapper/ScTransGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.manage_sheep.trans_group.mapper; +package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; -import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup; +import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; /** * 转群记录Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/mapper/ScTransitionInfoMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/mapper/ScTransitionInfoMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java index 3e0c734..0cfc78c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/mapper/ScTransitionInfoMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.manage_sheep.transition_info.mapper; +package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; -import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo; +import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo; /** * 转场Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/IScAddSheepService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScAddSheepService.java similarity index 67% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/IScAddSheepService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScAddSheepService.java index eadecb8..24f81d0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/IScAddSheepService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScAddSheepService.java @@ -1,7 +1,6 @@ -package com.zhyc.module.produce.manage_sheep.add_sheep.service; +package com.zhyc.module.produce.manage_sheep.service; -import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep; +import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/IScTransGroupService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/IScTransGroupService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java index a5053db..b9a63dd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/IScTransGroupService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.manage_sheep.trans_group.service; +package com.zhyc.module.produce.manage_sheep.service; import java.util.List; -import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup; +import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; /** * 转群记录Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/IScTransitionInfoService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/IScTransitionInfoService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java index 8c1dfd8..d84a886 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/IScTransitionInfoService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.manage_sheep.transition_info.service; +package com.zhyc.module.produce.manage_sheep.service; import java.util.List; -import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo; +import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo; /** * 转场Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/impl/ScAddSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/impl/ScAddSheepServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java index 95e5e72..f9bcdf9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/add_sheep/service/impl/ScAddSheepServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java @@ -1,16 +1,14 @@ -package com.zhyc.module.produce.manage_sheep.add_sheep.service.impl; +package com.zhyc.module.produce.manage_sheep.service.impl; import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.StringUtils; -import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep; -import com.zhyc.module.produce.manage_sheep.add_sheep.mapper.ScAddSheepMapper; -import com.zhyc.module.produce.manage_sheep.add_sheep.service.IScAddSheepService; -import com.zhyc.module.produce.sheep.domain.BasSheep; -import com.zhyc.module.produce.sheep.mapper.BasSheepMapper; -import com.zhyc.module.produce.sheep.service.IBasSheepService; -import com.zhyc.module.produce.sheep.service.impl.BasSheepServiceImpl; -import com.zhyc.module.fileManagement.domain.DaSheepfold; -import com.zhyc.module.fileManagement.mapper.DaSheepfoldMapper; +import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep; +import com.zhyc.module.produce.manage_sheep.mapper.ScAddSheepMapper; +import com.zhyc.module.produce.manage_sheep.service.IScAddSheepService; +import com.zhyc.module.base.domain.BasSheep; +import com.zhyc.module.base.service.IBasSheepService; +import com.zhyc.module.base.domain.DaSheepfold; +import com.zhyc.module.base.mapper.DaSheepfoldMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/impl/ScTransGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/impl/ScTransGroupServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java index 2eeb360..6bea8d1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/impl/ScTransGroupServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java @@ -1,13 +1,13 @@ -package com.zhyc.module.produce.manage_sheep.trans_group.service.impl; +package com.zhyc.module.produce.manage_sheep.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup; -import com.zhyc.module.produce.manage_sheep.trans_group.mapper.ScTransGroupMapper; -import com.zhyc.module.produce.manage_sheep.trans_group.service.IScTransGroupService; +import com.zhyc.module.produce.manage_sheep.mapper.ScTransGroupMapper; +import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService; +import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/impl/ScTransitionInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java similarity index 86% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/impl/ScTransitionInfoServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java index 25ed41d..24ff65f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/service/impl/ScTransitionInfoServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.zhyc.module.produce.manage_sheep.transition_info.service.impl; +package com.zhyc.module.produce.manage_sheep.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo; -import com.zhyc.module.produce.manage_sheep.transition_info.mapper.ScTransitionInfoMapper; +import com.zhyc.module.produce.manage_sheep.mapper.ScTransitionInfoMapper; +import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.produce.manage_sheep.transition_info.service.IScTransitionInfoService; +import com.zhyc.module.produce.manage_sheep.service.IScTransitionInfoService; /** * 转场Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/controller/ScCastrateController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/controller/ScCastrateController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java index 7c4c28a..914a781 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/controller/ScCastrateController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java @@ -1,10 +1,10 @@ -package com.zhyc.module.produce.other.castrate.controller; +package com.zhyc.module.produce.other.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.zhyc.module.produce.other.castrate.domain.ScCastrate; -import com.zhyc.module.produce.other.castrate.service.IScCastrateService; +import com.zhyc.module.produce.other.domain.ScCastrate; +import com.zhyc.module.produce.other.service.IScCastrateService; 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/other/fixHoof/controller/ScFixHoofController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/controller/ScFixHoofController.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java index 4fabe07..83e5a18 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/controller/ScFixHoofController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java @@ -1,10 +1,10 @@ -package com.zhyc.module.produce.other.fixHoof.controller; +package com.zhyc.module.produce.other.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof; -import com.zhyc.module.produce.other.fixHoof.service.IScFixHoofService; +import com.zhyc.module.produce.other.domain.ScFixHoof; +import com.zhyc.module.produce.other.service.IScFixHoofService; 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/other/castrate/domain/ScCastrate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/domain/ScCastrate.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java index c8d0b88..69d7d38 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/domain/ScCastrate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.other.castrate.domain; +package com.zhyc.module.produce.other.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/domain/ScFixHoof.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/domain/ScFixHoof.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java index 03cd9e3..9dafaaa 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/domain/ScFixHoof.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.other.fixHoof.domain; +package com.zhyc.module.produce.other.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/mapper/ScCastrateMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/mapper/ScCastrateMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java index 057bafd..7ea9527 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/mapper/ScCastrateMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.other.castrate.mapper; +package com.zhyc.module.produce.other.mapper; import java.util.List; -import com.zhyc.module.produce.other.castrate.domain.ScCastrate; +import com.zhyc.module.produce.other.domain.ScCastrate; /** * 去势Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/mapper/ScFixHoofMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java similarity index 83% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/mapper/ScFixHoofMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java index e2bea53..580a4ca 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/mapper/ScFixHoofMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java @@ -1,10 +1,8 @@ -package com.zhyc.module.produce.other.fixHoof.mapper; +package com.zhyc.module.produce.other.mapper; import java.util.List; -import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof; -import com.zhyc.module.produce.sheep.domain.BasSheep; -import org.apache.ibatis.annotations.Param; +import com.zhyc.module.produce.other.domain.ScFixHoof; /** * 修蹄Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/IScCastrateService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/IScCastrateService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java index e19f312..5f579c0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/IScCastrateService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java @@ -1,8 +1,8 @@ -package com.zhyc.module.produce.other.castrate.service; +package com.zhyc.module.produce.other.service; import java.util.List; -import com.zhyc.module.produce.other.castrate.domain.ScCastrate; +import com.zhyc.module.produce.other.domain.ScCastrate; /** * 去势Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/IScFixHoofService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/IScFixHoofService.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java index 11cda69..b567788 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/IScFixHoofService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.produce.other.fixHoof.service; +package com.zhyc.module.produce.other.service; import java.util.List; -import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof; + +import com.zhyc.module.produce.other.domain.ScFixHoof; /** * 修蹄Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/impl/ScCastrateServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/impl/ScCastrateServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java index bde1c4d..2ba46d3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/castrate/service/impl/ScCastrateServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java @@ -1,10 +1,10 @@ -package com.zhyc.module.produce.other.castrate.service.impl; +package com.zhyc.module.produce.other.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.produce.other.castrate.domain.ScCastrate; -import com.zhyc.module.produce.other.castrate.mapper.ScCastrateMapper; -import com.zhyc.module.produce.other.castrate.service.IScCastrateService; +import com.zhyc.module.produce.other.domain.ScCastrate; +import com.zhyc.module.produce.other.mapper.ScCastrateMapper; +import com.zhyc.module.produce.other.service.IScCastrateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/impl/ScFixHoofServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java similarity index 86% rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/impl/ScFixHoofServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java index e60ec7a..201eacc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/impl/ScFixHoofServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java @@ -1,18 +1,17 @@ -package com.zhyc.module.produce.other.fixHoof.service.impl; +package com.zhyc.module.produce.other.service.impl; import java.util.List; import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.StringUtils; -import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof; -import com.zhyc.module.produce.other.fixHoof.mapper.ScFixHoofMapper; -import com.zhyc.module.produce.sheep.domain.BasSheep; -import com.zhyc.module.produce.sheep.mapper.BasSheepMapper; +import com.zhyc.module.produce.other.domain.ScFixHoof; +import com.zhyc.module.produce.other.mapper.ScFixHoofMapper; +import com.zhyc.module.base.domain.BasSheep; +import com.zhyc.module.base.mapper.BasSheepMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.produce.other.fixHoof.service.IScFixHoofService; -import org.springframework.transaction.annotation.Transactional; +import com.zhyc.module.produce.other.service.IScFixHoofService; /** * 修蹄Service业务层处理 diff --git a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml rename to zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml index 379f397..5f0aab6 100644 --- a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMappingMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMappingMapper.xml similarity index 97% rename from zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMappingMapper.xml rename to zhyc-module/src/main/resources/mapper/base/BasSheepGroupMappingMapper.xml index f67f033..7eaaf52 100644 --- a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMappingMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMappingMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/produce/sheep/BasSheepMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml similarity index 99% rename from zhyc-module/src/main/resources/mapper/produce/sheep/BasSheepMapper.xml rename to zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml index de4fe9f..9e3928c 100644 --- a/zhyc-module/src/main/resources/mapper/produce/sheep/BasSheepMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml @@ -2,7 +2,7 @@ - + @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE s.id = #{id} - SELECT id, sheepfold_id AS sheepfoldId, variety_id AS varietyId FROM bas_sheep WHERE LOWER(TRIM(manage_tags)) = LOWER(TRIM(#{manageTags})) diff --git a/zhyc-module/src/main/resources/mapper/variety/BasSheepVarietyMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepVarietyMapper.xml similarity index 96% rename from zhyc-module/src/main/resources/mapper/variety/BasSheepVarietyMapper.xml rename to zhyc-module/src/main/resources/mapper/base/BasSheepVarietyMapper.xml index dcc97fc..ede615b 100644 --- a/zhyc-module/src/main/resources/mapper/variety/BasSheepVarietyMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepVarietyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/fileManagement/DaSheepfoldMapper.xml b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/fileManagement/DaSheepfoldMapper.xml rename to zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml index 6b25173..f5c1afa 100644 --- a/zhyc-module/src/main/resources/mapper/fileManagement/DaSheepfoldMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml similarity index 99% rename from zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml rename to zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml index e1280ed..cec4acf 100644 --- a/zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/freshMilkTest/NpFreshMilkInspMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpFreshMilkInspMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/dairyProducts/freshMilkTest/NpFreshMilkInspMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/NpFreshMilkInspMapper.xml index 399c1cd..f807312 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/freshMilkTest/NpFreshMilkInspMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpFreshMilkInspMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/rawMilkTest/NpRawMilkInspeMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpRawMilkInspeMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/dairyProducts/rawMilkTest/NpRawMilkInspeMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/NpRawMilkInspeMapper.xml index e4ee584..c6aba37 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/rawMilkTest/NpRawMilkInspeMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpRawMilkInspeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/yogurtTest/NpYogurtInspMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpYogurtInspMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/dairyProducts/yogurtTest/NpYogurtInspMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/NpYogurtInspMapper.xml index f1aa3c7..c229608 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/yogurtTest/NpYogurtInspMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpYogurtInspMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/XzDryMatterCorrectionMapper.xml similarity index 96% rename from zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/XzDryMatterCorrectionMapper.xml index 4099d6e..eb20ee1 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/XzDryMatterCorrectionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/XzParityCorrectionMapper.xml similarity index 95% rename from zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/XzParityCorrectionMapper.xml index 3e76551..9cf78ff 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/XzParityCorrectionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/XzWegihCorrectionMapper.xml similarity index 97% rename from zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/XzWegihCorrectionMapper.xml index 38696ad..d1f8424 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/XzWegihCorrectionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.txt b/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.txt deleted file mode 100644 index be9a507..0000000 --- a/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.txt +++ /dev/null @@ -1,80 +0,0 @@ -This XML file does not appear to have any style information associated with it. The document tree is shown below. - - - - - - - - - - - - - - - - - - - -SELECT g.group_id, g.parent_id, g.group_name, g.ancestors, g.status, g.create_by, g.create_time, g.update_by, g.update_time, - -(SELECT GROUP_CONCAT(parent.group_name ORDER BY FIND_IN_SET(parent.group_id, g.ancestors)) FROM bas_sheep_group parent WHERE FIND_IN_SET(parent.group_id, g.ancestors) > 0 ) AS ancestor_names, (CASE WHEN (SELECT COUNT(1) FROM bas_sheep_group child WHERE child.parent_id = g.group_id) > 0 THEN 0 ELSE 1 END) AS is_leaf FROM bas_sheep_group g - - - - -insert into bas_sheep_group - -parent_id, -group_name, -ancestors, -status, -create_by, -create_time, -update_by, -update_time, - - -#{parentId}, -#{groupName}, -#{ancestors}, -#{status}, -#{createBy}, -#{createTime}, -#{updateBy}, -#{updateTime}, - - - -update bas_sheep_group - -parent_id = #{parentId}, -group_name = #{groupName}, -ancestors = #{ancestors}, -status = #{status}, -create_by = #{createBy}, -create_time = #{createTime}, -update_by = #{updateBy}, -update_time = #{updateTime}, - -where group_id = #{groupId} - - delete from bas_sheep_group where group_id = #{groupId} - -delete from bas_sheep_group where group_id in - #{groupId} - - \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanGenerateMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanGenerateMapper.xml similarity index 99% rename from zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanGenerateMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanGenerateMapper.xml index 12123e8..7d08f16 100644 --- a/zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanGenerateMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanGenerateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanMapper.xml similarity index 96% rename from zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanMapper.xml index 8262ba3..9419804 100644 --- a/zhyc-module/src/main/resources/mapper/mating_plan/ScBreedPlanMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/breed/ScBreedPlanMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/drymilk/ScDryMilkMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScDryMilkMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/drymilk/ScDryMilkMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScDryMilkMapper.xml index 338841f..2304ba9 100644 --- a/zhyc-module/src/main/resources/mapper/drymilk/ScDryMilkMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/breed/ScDryMilkMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/breed/ScLambDetailMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScLambDetailMapper.xml similarity index 100% rename from zhyc-module/src/main/resources/mapper/breed/ScLambDetailMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScLambDetailMapper.xml diff --git a/zhyc-module/src/main/resources/mapper/breed/ScLambingRecordMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScLambingRecordMapper.xml similarity index 100% rename from zhyc-module/src/main/resources/mapper/breed/ScLambingRecordMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScLambingRecordMapper.xml diff --git a/zhyc-module/src/main/resources/mapper/Weaning/ScWeanRecordMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScWeanRecordMapper.xml similarity index 99% rename from zhyc-module/src/main/resources/mapper/Weaning/ScWeanRecordMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/breed/ScWeanRecordMapper.xml index c1d76f3..897a971 100644 --- a/zhyc-module/src/main/resources/mapper/Weaning/ScWeanRecordMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/breed/ScWeanRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/add_sheep/ScAddSheepMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScAddSheepMapper.xml similarity index 95% rename from zhyc-module/src/main/resources/mapper/produce/manage_sheep/add_sheep/ScAddSheepMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScAddSheepMapper.xml index fa44bff..8a2fdac 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/add_sheep/ScAddSheepMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScAddSheepMapper.xml @@ -3,10 +3,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/trans_group/ScTransGroupMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/produce/manage_sheep/trans_group/ScTransGroupMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml index e0d4df0..93bdee8 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/trans_group/ScTransGroupMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/transition_info/ScTransitionInfoMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/produce/manage_sheep/transition_info/ScTransitionInfoMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml index 027b6f3..5b2a4e2 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/transition_info/ScTransitionInfoMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/produce/other/castrate/ScCastrateMapper.xml b/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/produce/other/castrate/ScCastrateMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml index 1d067c0..c861b13 100644 --- a/zhyc-module/src/main/resources/mapper/produce/other/castrate/ScCastrateMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/produce/other/fixHoof/ScFixHoofMapper.xml b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml similarity index 98% rename from zhyc-module/src/main/resources/mapper/produce/other/fixHoof/ScFixHoofMapper.xml rename to zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml index 3ec4178..ff66103 100644 --- a/zhyc-module/src/main/resources/mapper/produce/other/fixHoof/ScFixHoofMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml @@ -2,7 +2,7 @@ - +