From 2f74b536d9f2ef63122f0b15bfcdbfa00034db77 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Fri, 29 Mar 2024 21:52:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 4 +-- .../couplet/common/system/domain/SysFirm.java | 27 +++++++++++++++---- .../src/main/resources/bootstrap.yml | 4 +-- .../src/main/resources/bootstrap.yml | 4 +-- .../src/main/resources/bootstrap.yml | 4 +-- .../src/main/resources/bootstrap.yml | 4 +-- .../system/controller/SysFirmController.java | 19 ++++++++++--- .../couplet/system/mapper/SysFirmMapper.java | 2 ++ .../system/service/SysFirmService.java | 2 ++ .../service/impl/SysFirmServiceImpl.java | 5 ++++ .../src/main/resources/bootstrap.yml | 4 +-- .../resources/mapper/system/SysFirmMapper.xml | 20 +++++++++----- couplet-modules/pom.xml | 1 - .../src/main/resources/bootstrap.yml | 4 +-- 14 files changed, 74 insertions(+), 30 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index c9f22f8..efc78ba 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java index 8ade07b..4d9d6a1 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java @@ -13,13 +13,30 @@ public class SysFirm { /** * 企业id **/ - private Integer firmId; + private Integer deptId; /** * 企业名称 **/ - private String firmName; + private String deptName; /** - * 企业认证 - **/ - private Integer approveId; + * 企业负责人 + **/ + private String leader; + /** + * 企业联系电话 + **/ + private String phone; + /** + * 企业删除 + **/ + private Integer delFlag; + /** + * 企业状态 + **/ + private String status; + /** + * 企业创建人 + **/ + private String createBy; + } diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 9707804..4fcc6ba 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index 8681657..abdb1a1 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index c041c96..79e5b8d 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index c7dbdbe..a0c84ca 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java index 404529b..c7d6bca 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java @@ -3,11 +3,9 @@ package com.couplet.system.controller; import com.couplet.common.core.domain.Result; import com.couplet.common.system.domain.SysFirm; import com.couplet.system.service.SysFirmService; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -61,4 +59,17 @@ public class SysFirmController { Result result = Result.success(i); return result; } + + /** + * @Description // 删除企业 附属的员工一并删除 + * @Date 2024/3/29 + * @param deptId + * @return com.couplet.common.core.domain.Result + **/ + @DeleteMapping("delFirm/{deptId}") + public Result delFirm(@PathVariable Integer deptId){ + int i = sysFirmService.delFirm(deptId); + Result success = Result.success(i); + return success; + } } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java index f5f1429..be1f1e4 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java @@ -19,4 +19,6 @@ public interface SysFirmMapper { int updateFirm(SysFirm sysFirm); + int delFirm(Integer deptId); + } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java index ceeebad..32adc9c 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java @@ -16,4 +16,6 @@ public interface SysFirmService { int addFirm(SysFirm sysFirm); int updateFirm(SysFirm sysFirm); + + int delFirm(Integer deptId); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java index 903a67a..15a2ddd 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java @@ -32,4 +32,9 @@ public class SysFirmServiceImpl implements SysFirmService { public int updateFirm(SysFirm sysFirm) { return sysFirmMapper.updateFirm(sysFirm); } + + @Override + public int delFirm(Integer deptId) { + return sysFirmMapper.delFirm(deptId); + } } diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 0c29b0b..3ae0d47 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml index 99ca2eb..0a4235b 100644 --- a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml +++ b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml @@ -4,19 +4,27 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - INSERT INTO `ry-cloud`.`yyh_firm` ( `firm_name`) - VALUES ( #{firmName}); + INSERT INTO `ry-cloud`.`sys_dept` + ( `dept_name`, `leader`, `phone`, `status`, `del_flag`, `create_by` ) + VALUES ( #{deptName}, #{leader}, #{phone}, #{status}, #{delFlag}, #{createBy}); + - UPDATE `ry-cloud`.`yyh_firm` - SET `firm_name` = #{firmName}, `approve_id` = #{approveId} - WHERE `firm_id` = #{firmId}; + UPDATE `ry-cloud`.`sys_dept` + SET `dept_name` = #{deptName}, `leader` = #{leader}, `phone` = #{phone}, `status` = #{status}, `del_flag` = 0, `create_by` = #{createBy} + WHERE `dept_id` = #{deptId}; + + + update `sys_dept` + set del_flag = '2' + where dept_id = #{deptId} + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 7e6ddf2..5d1cb7d 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,7 +13,6 @@ couplet-gen couplet-job couplet-file - couplet-enterprisemanagement couplet-modules diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index d08106c..812002a 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 # 配置文件格式 file-extension: yml # 共享配置