diff --git a/zhyc-module/src/main/java/com/zhyc/module/group_management/controller/BasSheepGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java similarity index 81% rename from zhyc-module/src/main/java/com/zhyc/module/group_management/controller/BasSheepGroupController.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java index 167dd65..7326485 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/group_management/controller/BasSheepGroupController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/BasSheepGroupController.java @@ -1,24 +1,18 @@ -package com.zhyc.module.group_management.controller; +package com.zhyc.module.fileManagement.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.group_management.domain.BasSheepGroup; -import com.zhyc.module.group_management.service.IBasSheepGroupService; import com.zhyc.common.utils.poi.ExcelUtil; +import com.zhyc.module.fileManagement.domain.BasSheepGroup; +import com.zhyc.module.fileManagement.service.IBasSheepGroupService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 分组管理Controller @@ -99,4 +93,5 @@ public class BasSheepGroupController extends BaseController { return toAjax(basSheepGroupService.deleteBasSheepGroupByGroupIds(groupIds)); } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/controller/DaSheepfoldController.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/DaSheepfoldController.java similarity index 81% rename from zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/controller/DaSheepfoldController.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/DaSheepfoldController.java index e961f58..2a8f8bc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/controller/DaSheepfoldController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/DaSheepfoldController.java @@ -1,25 +1,19 @@ -package com.zhyc.module.sheepfold_management.controller; +package com.zhyc.module.fileManagement.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.sheepfold_management.domain.DaSheepfold; -import com.zhyc.module.sheepfold_management.service.IDaSheepfoldService; -import com.zhyc.common.utils.poi.ExcelUtil; 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 羊舍管理Controller @@ -101,4 +95,16 @@ public class DaSheepfoldController extends BaseController { return toAjax(daSheepfoldService.deleteDaSheepfoldByIds(ids)); } + /** + * 检查羊舍编号是否已存在 + */ + @GetMapping("/checkSheepfoldNoExist") + public AjaxResult checkSheepfoldNoExist( + @RequestParam Long ranchId, + @RequestParam Long sheepfoldTypeId, + @RequestParam String sheepfoldNo + ) { + boolean exist = daSheepfoldService.checkSheepfoldNoExist(ranchId, sheepfoldTypeId, sheepfoldNo); + return AjaxResult.success(exist); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java similarity index 81% rename from zhyc-module/src/main/java/com/zhyc/module/sheep_file/controller/SheepFileController.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java index 25ff2e5..4ac2cd7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/controller/SheepFileController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/controller/SheepFileController.java @@ -1,25 +1,19 @@ -package com.zhyc.module.sheep_file.controller; +package com.zhyc.module.fileManagement.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; -import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.sheep_file.domain.SheepFile; -import com.zhyc.module.sheep_file.service.ISheepFileService; -import com.zhyc.common.utils.poi.ExcelUtil; 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 羊只档案Controller diff --git a/zhyc-module/src/main/java/com/zhyc/module/group_management/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java similarity index 63% rename from zhyc-module/src/main/java/com/zhyc/module/group_management/domain/BasSheepGroup.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java index 09ac54e..c39a308 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/group_management/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/BasSheepGroup.java @@ -1,9 +1,9 @@ -package com.zhyc.module.group_management.domain; +package com.zhyc.module.fileManagement.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.TreeEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 分组管理对象 bas_sheep_group @@ -27,7 +27,45 @@ public class BasSheepGroup extends TreeEntity @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public void setGroupId(Long groupId) + /** 状态（0正常 1停用） */ + @Excel(name = "祖级列表") + private String ancestors; + + /** 祖级列表名称 */ + @Excel(name = "祖级列表名称") + private String ancestorNames; + + public void setAncestorNames(String ancestorNames) { + this.ancestorNames = ancestorNames; + } + + public String getAncestorNames() { + return ancestorNames; + } + + @Override + public String getAncestors() { + return ancestors; + } + + @Override + public void setAncestors(String ancestors) { + this.ancestors = ancestors; + } + + /** 是否为叶子节点 */ + private Boolean isLeaf; + + // ... getter 和 setter + public Boolean getIsLeaf() { + return isLeaf; + } + + public void setIsLeaf(Boolean isLeaf) { + this.isLeaf = isLeaf; + } + + public void setGroupId(Long groupId) { this.groupId = groupId; } @@ -64,6 +102,7 @@ public class BasSheepGroup extends TreeEntity .append("parentId", getParentId()) .append("groupName", getGroupName()) .append("ancestors", getAncestors()) + .append("ancestorNames", getAncestorNames()) // 新增这一行 .append("status", getStatus()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/domain/DaSheepfold.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java index ab1319e..4b19b03 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/DaSheepfold.java @@ -1,9 +1,9 @@ -package com.zhyc.module.sheepfold_management.domain; +package com.zhyc.module.fileManagement.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 羊舍管理对象 da_sheepfold diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/sheep_file/domain/SheepFile.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java index 917c2d4..d8aea83 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/domain/SheepFile.java @@ -1,11 +1,12 @@ -package com.zhyc.module.sheep_file.domain; +package com.zhyc.module.fileManagement.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 羊只档案对象 sheep_file diff --git a/zhyc-module/src/main/java/com/zhyc/module/group_management/mapper/BasSheepGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/group_management/mapper/BasSheepGroupMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java index d3b2bf0..dcdcaeb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/group_management/mapper/BasSheepGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/BasSheepGroupMapper.java @@ -1,7 +1,8 @@ -package com.zhyc.module.group_management.mapper; +package com.zhyc.module.fileManagement.mapper; + +import com.zhyc.module.fileManagement.domain.BasSheepGroup; import java.util.List; -import com.zhyc.module.group_management.domain.BasSheepGroup; /** * 分组管理Mapper接口 @@ -58,4 +59,5 @@ public interface BasSheepGroupMapper * @return 结果 */ public int deleteBasSheepGroupByGroupIds(Long[] groupIds); + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/mapper/DaSheepfoldMapper.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java similarity index 88% rename from zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/mapper/DaSheepfoldMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java index 0a82b50..0d9a57c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/mapper/DaSheepfoldMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/DaSheepfoldMapper.java @@ -1,7 +1,8 @@ -package com.zhyc.module.sheepfold_management.mapper; +package com.zhyc.module.fileManagement.mapper; + +import com.zhyc.module.fileManagement.domain.DaSheepfold; import java.util.List; -import com.zhyc.module.sheepfold_management.domain.DaSheepfold; /** * 羊舍管理Mapper接口 @@ -58,5 +59,7 @@ public interface DaSheepfoldMapper * @return 结果 */ public int deleteDaSheepfoldByIds(Long[] ids); + + public int selectCount(DaSheepfold daSheepfold); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/mapper/SheepFileMapper.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/sheep_file/mapper/SheepFileMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java index 480d02e..027a315 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/mapper/SheepFileMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/mapper/SheepFileMapper.java @@ -1,7 +1,8 @@ -package com.zhyc.module.sheep_file.mapper; +package com.zhyc.module.fileManagement.mapper; + +import com.zhyc.module.fileManagement.domain.SheepFile; import java.util.List; -import com.zhyc.module.sheep_file.domain.SheepFile; /** * 羊只档案Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/group_management/service/IBasSheepGroupService.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java similarity index 92% rename from zhyc-module/src/main/java/com/zhyc/module/group_management/service/IBasSheepGroupService.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java index ec68f13..2bd5c60 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/group_management/service/IBasSheepGroupService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IBasSheepGroupService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.group_management.service; +package com.zhyc.module.fileManagement.service; + +import com.zhyc.module.fileManagement.domain.BasSheepGroup; import java.util.List; -import com.zhyc.module.group_management.domain.BasSheepGroup; /** * 分组管理Service接口 @@ -58,4 +59,6 @@ public interface IBasSheepGroupService * @return 结果 */ public int deleteBasSheepGroupByGroupId(Long groupId); + + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/IDaSheepfoldService.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java similarity index 74% rename from zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/IDaSheepfoldService.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java index 84e0190..83a336b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/IDaSheepfoldService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/IDaSheepfoldService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.sheepfold_management.service; +package com.zhyc.module.fileManagement.service; + +import com.zhyc.module.fileManagement.domain.DaSheepfold; import java.util.List; -import com.zhyc.module.sheepfold_management.domain.DaSheepfold; /** * 羊舍管理Service接口 @@ -58,4 +59,14 @@ public interface IDaSheepfoldService * @return 结果 */ public int deleteDaSheepfoldById(Long id); + + /** + * 检查羊舍编号是否已存在 + * + * @param ranchId 羊舍所属牧场ID + * @param sheepfoldTypeId 羊舍类型ID + * @param sheepfoldNo 羊舍编号 + * @return 是否已存在 + */ + boolean checkSheepfoldNoExist(Long ranchId, Long sheepfoldTypeId, String sheepfoldNo); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/ISheepFileService.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java similarity index 91% rename from zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/ISheepFileService.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java index a5f012f..7bc76ed 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/ISheepFileService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/ISheepFileService.java @@ -1,7 +1,8 @@ -package com.zhyc.module.sheep_file.service; +package com.zhyc.module.fileManagement.service; + +import com.zhyc.module.fileManagement.domain.SheepFile; import java.util.List; -import com.zhyc.module.sheep_file.domain.SheepFile; /** * 羊只档案Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/group_management/service/impl/BasSheepGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java similarity index 70% rename from zhyc-module/src/main/java/com/zhyc/module/group_management/service/impl/BasSheepGroupServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java index 9543e9e..970e21d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/group_management/service/impl/BasSheepGroupServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/BasSheepGroupServiceImpl.java @@ -1,12 +1,13 @@ -package com.zhyc.module.group_management.service.impl; +package com.zhyc.module.fileManagement.service.impl; -import java.util.List; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.group_management.mapper.BasSheepGroupMapper; -import com.zhyc.module.group_management.domain.BasSheepGroup; -import com.zhyc.module.group_management.service.IBasSheepGroupService; + +import java.util.List; /** * 分组管理Service业务层处理 @@ -38,10 +39,24 @@ public class BasSheepGroupServiceImpl implements IBasSheepGroupService * @param basSheepGroup 分组管理 * @return 分组管理 */ +// @Override +// public List selectBasSheepGroupList(BasSheepGroup basSheepGroup) +// { +// return basSheepGroupMapper.selectBasSheepGroupList(basSheepGroup); +// } @Override - public List selectBasSheepGroupList(BasSheepGroup basSheepGroup) - { - return basSheepGroupMapper.selectBasSheepGroupList(basSheepGroup); + public List selectBasSheepGroupList(BasSheepGroup basSheepGroup) { + List groups = basSheepGroupMapper.selectBasSheepGroupList(basSheepGroup); + + // 处理祖先名称显示格式 + groups.forEach(group -> { + if (group.getAncestorNames() != null) { + String formattedNames = group.getAncestorNames().replace(",", " / "); + group.setAncestorNames(formattedNames); + } + }); + + return groups; } /** @@ -84,7 +99,7 @@ public class BasSheepGroupServiceImpl implements IBasSheepGroupService /** * 删除分组管理信息 - * + * * @param groupId 分组管理主键 * @return 结果 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/impl/DaSheepfoldServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java similarity index 76% rename from zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/impl/DaSheepfoldServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java index 019cf55..6e8189a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheepfold_management/service/impl/DaSheepfoldServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/DaSheepfoldServiceImpl.java @@ -1,11 +1,12 @@ -package com.zhyc.module.sheepfold_management.service.impl; +package com.zhyc.module.fileManagement.service.impl; -import java.util.List; +import com.zhyc.module.fileManagement.domain.DaSheepfold; +import com.zhyc.module.fileManagement.mapper.DaSheepfoldMapper; +import com.zhyc.module.fileManagement.service.IDaSheepfoldService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.sheepfold_management.mapper.DaSheepfoldMapper; -import com.zhyc.module.sheepfold_management.domain.DaSheepfold; -import com.zhyc.module.sheepfold_management.service.IDaSheepfoldService; + +import java.util.List; /** * 羊舍管理Service业务层处理 @@ -90,4 +91,14 @@ public class DaSheepfoldServiceImpl implements IDaSheepfoldService { return daSheepfoldMapper.deleteDaSheepfoldById(id); } + + + @Override + public boolean checkSheepfoldNoExist(Long ranchId, Long sheepfoldTypeId, String sheepfoldNo) { + DaSheepfold query = new DaSheepfold(); + query.setRanchId(ranchId); + query.setSheepfoldTypeId(sheepfoldTypeId); + query.setSheepfoldNo(sheepfoldNo); + return daSheepfoldMapper.selectCount(query) > 0; + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java similarity index 89% rename from zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/impl/SheepFileServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java index 6a61101..b5e8d29 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/fileManagement/service/impl/SheepFileServiceImpl.java @@ -1,12 +1,13 @@ -package com.zhyc.module.sheep_file.service.impl; +package com.zhyc.module.fileManagement.service.impl; -import java.util.List; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.sheep_file.mapper.SheepFileMapper; -import com.zhyc.module.sheep_file.domain.SheepFile; -import com.zhyc.module.sheep_file.service.ISheepFileService; + +import java.util.List; /** * 羊只档案Service业务层处理 diff --git a/zhyc-module/src/main/resources/mapper/group_management/BasSheepGroupMapper.xml b/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml similarity index 76% rename from zhyc-module/src/main/resources/mapper/group_management/BasSheepGroupMapper.xml rename to zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml index cf8ba5e..dd632fd 100644 --- a/zhyc-module/src/main/resources/mapper/group_management/BasSheepGroupMapper.xml +++ b/zhyc-module/src/main/resources/mapper/fileManagement/BasSheepGroupMapper.xml @@ -2,13 +2,15 @@ - + + + @@ -16,16 +18,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - select group_id, parent_id, group_name, ancestors, status, create_by, create_time, update_by, update_time from bas_sheep_group + 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 + SELECT COUNT(*) + FROM da_sheepfold + WHERE ranch_id = #{ranchId} + AND sheepfold_type_id = #{sheepfoldTypeId} + AND sheepfold_no = #{sheepfoldNo} + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/sheep_file/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml similarity index 99% rename from zhyc-module/src/main/resources/mapper/sheep_file/SheepFileMapper.xml rename to zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml index 5008631..85afd4d 100644 --- a/zhyc-module/src/main/resources/mapper/sheep_file/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/fileManagement/SheepFileMapper.xml @@ -2,7 +2,7 @@ - +