diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index 856e56b2..60ac9c84 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -14,14 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index 3ea87249..6c5761a3 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -27,14 +27,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index 72a85087..4373fded 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -21,14 +21,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml index 3e2b6eeb..e66e28ea 100644 --- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml @@ -36,14 +36,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml index c86babdb..e907681b 100644 --- a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml @@ -14,14 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml index 189a6dc0..1b6de6a3 100644 --- a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml @@ -14,14 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index 7453becc..298ca172 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -21,14 +21,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml index a2e6e461..ad898852 100644 --- a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml @@ -14,14 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysDeptController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysDeptController.java index 0b878163..df3f901d 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysDeptController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysDeptController.java @@ -78,6 +78,20 @@ public class SysDeptController extends BaseController { } + /** + * 新增公司 + */ + //@RequiresPermissions("system:dept:add") + @Log(title = "公司管理", businessType = BusinessType.INSERT) + @PostMapping(value = "/addCompany") + public AjaxResult addCompany(@RequestBody List list) { + if (!deptService.checkCompaniesNameUnique(list)) { + return error("新增公司失败,其中有些公司名称已存在"); + } + return toAjax(deptService.insertCompanies(list)); + } + + /** * 新增部门 */ diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysDeptMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysDeptMapper.java index 6833da7e..e3105008 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysDeptMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysDeptMapper.java @@ -68,6 +68,8 @@ public interface SysDeptMapper */ public int checkDeptExistUser(Long deptId); + public int checkCompaniesNameUnique(@Param("depts") List list); + /** * 校验部门名称是否唯一 * @@ -77,6 +79,8 @@ public interface SysDeptMapper */ public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + public int insertCompanies(@Param("depts") List list); + /** * 新增部门信息 * @@ -124,4 +128,6 @@ public interface SysDeptMapper List selectDeptByAncestors(String[] deptIds); String getCompanyByAncestors(String split); + + int getMaxDeptId(); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysDeptService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysDeptService.java index 784e594a..f0a8e541 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysDeptService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysDeptService.java @@ -83,6 +83,7 @@ public interface ISysDeptService */ public boolean checkDeptExistUser(Long deptId); + public boolean checkCompaniesNameUnique(List list); /** * 校验部门名称是否唯一 * @@ -98,6 +99,8 @@ public interface ISysDeptService */ public void checkDeptDataScope(Long deptId); + public int insertCompanies(List list); + /** * 新增保存部门信息 * diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java index 5194b9f6..868c2554 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java @@ -162,6 +162,12 @@ public class SysDeptServiceImpl implements ISysDeptService { return result > 0; } + @Override + public boolean checkCompaniesNameUnique(List list) { + int count = deptMapper.checkCompaniesNameUnique(list); + return count == 0; + } + /** * 校验部门名称是否唯一 * @@ -195,6 +201,28 @@ public class SysDeptServiceImpl implements ISysDeptService { } } + @Override + public int insertCompanies(List list) { + int num = deptMapper.getMaxDeptId() + 1; + long nextMultiple = (int) Math.ceil((double) num / 100) * 100; + for (SysDept dept : list) { + dept.setCreateBy(SecurityUtils.getUsername()); + dept.setParentId(0L); + dept.setAncestors("0"); + dept.setOrderNum(999); + dept.setStatus("0"); + dept.setDeptId(nextMultiple); + dept.setCompanyId(nextMultiple); + } + return deptMapper.insertCompanies(list); + } + +// public static void main(String[] args) { +// int num = 1200; +// long nextMultiple = (int) Math.ceil((double) num / 100) * 100; +// System.out.print(num); +// } + /** * 新增保存部门信息 * diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index e4cd7122..79e7a967 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -25,14 +25,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev - username: nacos - password: N2$NjW2&CDEOx$mD*y5h + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 - server-addr: 172.16.36.33:8848 - namespace: sgzb_cloud_dev + server-addr: 127.0.0.1:8848 + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml index 8f94a006..21c037fb 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -85,11 +85,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + insert into sys_dept( + dept_id,parent_id,dept_name,ancestors,order_num,leader,phone,email,status,create_by,company_id,create_time) + values + + ( + #{item.deptId},#{item.parentId},#{item.deptName},#{item.ancestors},#{item.orderNum},#{item.leader}, + #{item.phone},#{item.email},#{item.status},#{item.createBy},#{item.companyId},sysdate() + ) + + insert into sys_dept( @@ -171,4 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file