From f0acd149c75c2b8f72e55535d66cb3863d7df084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com> Date: Fri, 30 Jan 2026 15:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A7=E5=9C=BA=E8=B7=9F=E8=B7=9F=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 3 ++ .../common/core/domain/entity/SysDept.java | 20 ++++++++ .../common/core/domain/entity/SysRanch.java | 36 ++++++++++++++ .../resources/mapper/base/DaRanchMapper.xml | 12 ++--- .../produce/breed/ScPregnancyRecordMapper.xml | 4 +- .../com/zhyc/system/mapper/SysDeptMapper.java | 48 +++++++++++++------ .../zhyc/system/service/ISysDeptService.java | 4 ++ .../service/impl/SysDeptServiceImpl.java | 29 ++++++++++- .../resources/mapper/system/SysDeptMapper.xml | 24 +++++++--- 9 files changed, 150 insertions(+), 30 deletions(-) create mode 100644 zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysRanch.java diff --git a/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysDeptController.java b/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysDeptController.java index 8113089..983a84d 100644 --- a/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysDeptController.java +++ b/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysDeptController.java @@ -76,6 +76,9 @@ public class SysDeptController extends BaseController @PostMapping public AjaxResult add(@Validated @RequestBody SysDept dept) { + if (!deptService.checkRanchName(dept)){ + return error("新增部门'" + dept.getDeptName() + "'失败，牧场名称已存在"); + } if (!deptService.checkDeptNameUnique(dept)) { return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); diff --git a/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysDept.java b/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysDept.java index 04b80ee..3d1d6b2 100644 --- a/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysDept.java +++ b/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysDept.java @@ -31,6 +31,10 @@ public class SysDept extends BaseEntity /** 部门名称 */ private String deptName; + /** 牧场id */ + private Long ranchId; + private String ranchName; + /** 显示顺序 */ private Integer orderNum; @@ -55,6 +59,22 @@ public class SysDept extends BaseEntity /** 子部门 */ private List children = new ArrayList(); + public String getRanchName() { + return ranchName; + } + + public void setRanchName(String ranchName) { + this.ranchName = ranchName; + } + + public Long getRanchId() { + return ranchId; + } + + public void setRanchId(Long ranchId) { + this.ranchId = ranchId; + } + public Long getDeptId() { return deptId; diff --git a/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysRanch.java b/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysRanch.java new file mode 100644 index 0000000..559132b --- /dev/null +++ b/zhyc-common/src/main/java/com/zhyc/common/core/domain/entity/SysRanch.java @@ -0,0 +1,36 @@ +package com.zhyc.common.core.domain.entity; + +import com.zhyc.common.core.domain.BaseEntity; + +/** + * 牧场管理对象 da_ranch + * + * @author ruoyi + * @date 2025-07-22 + */ +public class SysRanch extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 牧场名称 */ + private String ranch; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRanch() { + return ranch; + } + + public void setRanch(String ranch) { + this.ranch = ranch; + } +} diff --git a/zhyc-module/src/main/resources/mapper/base/DaRanchMapper.xml b/zhyc-module/src/main/resources/mapper/base/DaRanchMapper.xml index 2b7afb2..abd9129 100644 --- a/zhyc-module/src/main/resources/mapper/base/DaRanchMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/DaRanchMapper.xml @@ -6,18 +6,18 @@ - + - select id, ranch + select id, sysRanch from da_ranch @@ -29,17 +29,17 @@ insert into da_ranch - ranch, + sysRanch, - #{ranch}, + #{sysRanch}, update da_ranch - ranch = #{ranch}, + sysRanch = #{sysRanch}, where id = #{id} diff --git a/zhyc-module/src/main/resources/mapper/produce/breed/ScPregnancyRecordMapper.xml b/zhyc-module/src/main/resources/mapper/produce/breed/ScPregnancyRecordMapper.xml index ae99b14..39f32c3 100644 --- a/zhyc-module/src/main/resources/mapper/produce/breed/ScPregnancyRecordMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/breed/ScPregnancyRecordMapper.xml @@ -29,7 +29,7 @@ - + @@ -54,7 +54,7 @@ sf.breed, sf.expected_date, sf.lambing_date as last_event_date, - sf.dr_ranch as ranch, + sf.dr_ranch as sysRanch, -- 关联配种信息 ram_sf.bs_manage_tags as father_manage_tags, ram_sf.variety as father_variety, diff --git a/zhyc-system/src/main/java/com/zhyc/system/mapper/SysDeptMapper.java b/zhyc-system/src/main/java/com/zhyc/system/mapper/SysDeptMapper.java index 671fc33..0b77785 100644 --- a/zhyc-system/src/main/java/com/zhyc/system/mapper/SysDeptMapper.java +++ b/zhyc-system/src/main/java/com/zhyc/system/mapper/SysDeptMapper.java @@ -1,7 +1,9 @@ package com.zhyc.system.mapper; import java.util.List; -import org.apache.ibatis.annotations.Param; + +import com.zhyc.common.core.domain.entity.SysRanch; +import org.apache.ibatis.annotations.*; import com.zhyc.common.core.domain.entity.SysDept; /** @@ -13,7 +15,7 @@ public interface SysDeptMapper { /** * 查询部门管理数据 - * + * * @param dept 部门信息 * @return 部门信息集合 */ @@ -21,7 +23,7 @@ public interface SysDeptMapper /** * 根据角色ID查询部门树信息 - * + * * @param roleId 角色ID * @param deptCheckStrictly 部门树选择项是否关联显示 * @return 选中部门列表 @@ -30,7 +32,7 @@ public interface SysDeptMapper /** * 根据部门ID查询信息 - * + * * @param deptId 部门ID * @return 部门信息 */ @@ -38,7 +40,7 @@ public interface SysDeptMapper /** * 根据ID查询所有子部门 - * + * * @param deptId 部门ID * @return 部门列表 */ @@ -46,7 +48,7 @@ public interface SysDeptMapper /** * 根据ID查询所有子部门（正常状态） - * + * * @param deptId 部门ID * @return 子部门数 */ @@ -54,7 +56,7 @@ public interface SysDeptMapper /** * 是否存在子节点 - * + * * @param deptId 部门ID * @return 结果 */ @@ -62,7 +64,7 @@ public interface SysDeptMapper /** * 查询部门是否存在用户 - * + * * @param deptId 部门ID * @return 结果 */ @@ -70,7 +72,7 @@ public interface SysDeptMapper /** * 校验部门名称是否唯一 - * + * * @param deptName 部门名称 * @param parentId 父部门ID * @return 结果 @@ -79,7 +81,7 @@ public interface SysDeptMapper /** * 新增部门信息 - * + * * @param dept 部门信息 * @return 结果 */ @@ -87,7 +89,7 @@ public interface SysDeptMapper /** * 修改部门信息 - * + * * @param dept 部门信息 * @return 结果 */ @@ -95,14 +97,14 @@ public interface SysDeptMapper /** * 修改所在部门正常状态 - * + * * @param deptIds 部门ID组 */ public void updateDeptStatusNormal(Long[] deptIds); /** * 修改子元素关系 - * + * * @param depts 子元素 * @return 结果 */ @@ -110,9 +112,27 @@ public interface SysDeptMapper /** * 删除部门管理信息 - * + * * @param deptId 部门ID * @return 结果 */ public int deleteDeptById(Long deptId); + + @Insert("insert into da_ranch(ranch) values(#{ranch})") + @Options(useGeneratedKeys = true, keyProperty = "id") + public void insertRanch(SysRanch r); + + @Insert("insert into sys_dept_ranch(dept_id,ranch_id) values(#{deptId},#{ranchId})") + void insertRanchDept(@Param("deptId") Long deptId, @Param("ranchId")Long ranchId); + + @Select("select * from da_ranch where ranch = #{ranchName}") + SysRanch checkRanchExist(String ranchName); + + @Select("select ranch_id from sys_dept_ranch where dept_id = #{deptId}") + Long selectSysRanchDeptById(@Param("deptId") Long deptId); + @Delete("delete from sys_dept_ranch where dept_id=#{deptId}") + void deleteSysRanchDeptById(Long deptId); + @Delete("delete from da_ranch where id= #{ranchId}") + void deleteRanchById(Long ranchId); } + diff --git a/zhyc-system/src/main/java/com/zhyc/system/service/ISysDeptService.java b/zhyc-system/src/main/java/com/zhyc/system/service/ISysDeptService.java index 7d8709c..1401c44 100644 --- a/zhyc-system/src/main/java/com/zhyc/system/service/ISysDeptService.java +++ b/zhyc-system/src/main/java/com/zhyc/system/service/ISysDeptService.java @@ -91,6 +91,8 @@ public interface ISysDeptService */ public boolean checkDeptNameUnique(SysDept dept); + boolean checkRanchName(SysDept dept); + /** * 校验部门是否有数据权限 * @@ -121,4 +123,6 @@ public interface ISysDeptService * @return 结果 */ public int deleteDeptById(Long deptId); + + } diff --git a/zhyc-system/src/main/java/com/zhyc/system/service/impl/SysDeptServiceImpl.java b/zhyc-system/src/main/java/com/zhyc/system/service/impl/SysDeptServiceImpl.java index cee10f2..38e81ba 100644 --- a/zhyc-system/src/main/java/com/zhyc/system/service/impl/SysDeptServiceImpl.java +++ b/zhyc-system/src/main/java/com/zhyc/system/service/impl/SysDeptServiceImpl.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; + +import com.zhyc.common.core.domain.entity.SysRanch; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.common.annotation.DataScope; @@ -20,6 +22,7 @@ import com.zhyc.common.utils.spring.SpringUtils; import com.zhyc.system.mapper.SysDeptMapper; import com.zhyc.system.mapper.SysRoleMapper; import com.zhyc.system.service.ISysDeptService; +import org.springframework.transaction.annotation.Transactional; /** * 部门管理 服务实现 @@ -182,6 +185,18 @@ public class SysDeptServiceImpl implements ISysDeptService return UserConstants.UNIQUE; } + @Override + public boolean checkRanchName(SysDept dept) { + if (!StringUtils.isNull(dept.getRanchName())){ + SysRanch ranch = deptMapper.checkRanchExist(dept.getRanchName()); + if (ranch!=null){ + return false; + } + } + + return true; + } + /** * 校验部门是否有数据权限 * @@ -209,6 +224,7 @@ public class SysDeptServiceImpl implements ISysDeptService * @return 结果 */ @Override + @Transactional public int insertDept(SysDept dept) { SysDept info = deptMapper.selectDeptById(dept.getParentId()); @@ -218,7 +234,15 @@ public class SysDeptServiceImpl implements ISysDeptService throw new ServiceException("部门停用，不允许新增"); } dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); - return deptMapper.insertDept(dept); + int i = deptMapper.insertDept(dept); + if (dept.getRanchName()!=null){ + SysRanch sysRanch = new SysRanch(); + sysRanch.setRanch(dept.getRanchName()); + deptMapper.insertRanch(sysRanch); + deptMapper.insertRanchDept(dept.getDeptId(), sysRanch.getId()); + } + + return i; } /** @@ -290,6 +314,9 @@ public class SysDeptServiceImpl implements ISysDeptService @Override public int deleteDeptById(Long deptId) { + Long ranchId=deptMapper.selectSysRanchDeptById(deptId); + deptMapper.deleteSysRanchDeptById(deptId); + deptMapper.deleteRanchById(ranchId); return deptMapper.deleteDeptById(deptId); } diff --git a/zhyc-system/src/main/resources/mapper/system/SysDeptMapper.xml b/zhyc-system/src/main/resources/mapper/system/SysDeptMapper.xml index 5f1817c..96b8569 100644 --- a/zhyc-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/zhyc-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -20,13 +20,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + + + - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time - from sys_dept d - - + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, + d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, + d.create_time, d.update_by, d.update_time, + r.ranch ranch_name + from sys_dept d + left join sys_dept_ranch dr on d.dept_id = dr.dept_id + left join da_ranch r on dr.ranch_id = r.id + + + - - + + + insert into sys_dept( dept_id, parent_id,