From f9356bd0b74d1e1e1a2863b608f1b3c17037c7d6 Mon Sep 17 00:00:00 2001 From: ffr <492210217@qq.com> Date: Thu, 28 Mar 2024 17:00:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../pom.xml | 30 ++++++ .../pom.xml | 34 +++++++ .../com/couplet/remote/DeptServiceFegin.java | 36 ++++++++ .../factory/RemoteDeptFallbackFactory.java | 35 +++++++ .../pom.xml | 92 +++++++++++++++++++ .../couplet/server/CoupleManagementApp.java | 28 ++++++ .../server/controller/ManageController.java | 24 +++++ .../couplet/server/service/ManageServer.java | 9 ++ .../service/impl/ManageServiceImpl.java | 23 +++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 ++++++ .../src/main/resources/logback.xml | 74 +++++++++++++++ .../couplet-enterprisemanagement/pom.xml | 26 ++++++ .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../system/controller/SysDeptController.java | 3 - .../service/impl/SysUserServiceImpl.java | 2 + .../src/main/resources/bootstrap.yml | 2 + couplet-modules/pom.xml | 2 + .../src/main/resources/bootstrap.yml | 2 + pom.xml | 6 ++ 24 files changed, 467 insertions(+), 3 deletions(-) create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/pom.xml diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 2942ec3..c9f22f8 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 307a581..9707804 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml new file mode 100644 index 0000000..e34dd5a --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-common + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-common-core + + + com.couplet + couplet-common-system + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml new file mode 100644 index 0000000..c9c52a9 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-remote + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + com.couplet + couplet-common-security + + + com.couplet + couplet-common-security + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java new file mode 100644 index 0000000..08d8a37 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java @@ -0,0 +1,36 @@ +package com.couplet.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.security.annotation.RequiresPermissions; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.factory.RemoteDeptFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + + +@FeignClient(contextId = "remoteFileService" , value = ServiceNameConstants.SYSTEM_SERVICE,fallbackFactory = RemoteDeptFallbackFactory.class) +public interface DeptServiceFegin { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @RequiresPermissions("system:dept:list") + @GetMapping("/list") + public Result list (SysDept dept); + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description TODO + * @date + * 用户信息集合 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/list") + public Result> list (SysUser user); +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java new file mode 100644 index 0000000..816a3c7 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java @@ -0,0 +1,35 @@ +package com.couplet.remote.factory; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.DeptServiceFegin; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:29 + */ +@Slf4j + +public class RemoteDeptFallbackFactory implements FallbackFactory { + @Override + public DeptServiceFegin create(Throwable cause) { + log.error("sys服务调用失败:{}", cause.getMessage()); + return new DeptServiceFegin() { + @Override + public Result list(SysDept dept) { + return Result.error("调用失败..."+cause.getMessage()); + } + + @Override + public Result> list(SysUser user) { + return Result.error("调用失败..."+cause.getMessage()); + } + }; + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml new file mode 100644 index 0000000..a6c658e --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-server + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + com.couplet + couplet-enterprisemanagement-remote + + + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java new file mode 100644 index 0000000..ae96763 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java @@ -0,0 +1,28 @@ +package com.couplet.server; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author fufanrui + * 启动类 + * @version 1.0 + * @description: TODO + * @date 2024/3/27 14:04 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class CoupleManagementApp { + + public static void main(String[] args) { + + SpringApplication.run(CoupleManagementApp.class, args); + + + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java new file mode 100644 index 0000000..d51e9b6 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java @@ -0,0 +1,24 @@ +package com.couplet.server.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:33 + */ +@RestController +@RequestMapping("/manage") +public class ManageController { + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java new file mode 100644 index 0000000..3728604 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java @@ -0,0 +1,9 @@ +package com.couplet.server.service; + +import com.couplet.remote.DeptServiceFegin; +import org.springframework.beans.factory.annotation.Autowired; + +public interface ManageServer { + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java new file mode 100644 index 0000000..51df9a0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -0,0 +1,23 @@ +package com.couplet.server.service.impl; + +import com.couplet.remote.DeptServiceFegin; +import com.couplet.server.service.ManageServer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:34 + */ +@Service +public class ManageServiceImpl implements ManageServer { + + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..285745c --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9222 + +# Spring +spring: + application: + # 应用名称 + name: couplet-enterprisemanagement + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/pom.xml b/couplet-modules/couplet-enterprisemanagement/pom.xml new file mode 100644 index 0000000..8a9e031 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-enterprisemanagement + pom + + couplet-enterprisemanagement-common + couplet-enterprisemanagement-server + couplet-enterprisemanagement-remote + + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..8681657 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 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 df7344c..c041c96 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 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 49763a2..c7dbdbe 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index da7f6c0..b486bd4 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -14,12 +14,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; - /** * 部门信息 - * * @author couplet */ @RestController diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java index f0463f6..4683c96 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java @@ -61,6 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @DataScope(deptAlias = "d", userAlias = "u") public List selectUserList (SysUser user) { + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + user.setDeptId(deptId); return userMapper.selectUserList(user); } diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 16f0206..0c29b0b 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..6bec145 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,8 @@ couplet-gen couplet-job couplet-file + couplet-enterprisemanagement + 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 ff11d05..d08106c 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index 61b166e..5a689a7 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,12 @@ ${couplet.version} + + com.couplet + couplet-enterprisemanagement-common + ${couplet.version} + + From 0e4c1d3cba521a7b0e28d4ea0c611ee6e0f97481 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:05:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-modules/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 6bec145..5d1cb7d 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,8 +13,6 @@ couplet-gen couplet-job couplet-file - couplet-enterprisemanagement - couplet-enterprisemanagement couplet-modules From 8f9cf1a6c679142dfe8eccc52bd03cb12dd9a011 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:07:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-enterprisemanagement-server/pom.xml | 1 + couplet-modules/pom.xml | 1 + pom.xml | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml index a6c658e..f83a132 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -81,6 +81,7 @@ com.couplet couplet-common-swagger + com.couplet couplet-enterprisemanagement-remote diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..7e6ddf2 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,7 @@ couplet-gen couplet-job couplet-file + couplet-enterprisemanagement couplet-modules diff --git a/pom.xml b/pom.xml index 5a689a7..2e596a9 100644 --- a/pom.xml +++ b/pom.xml @@ -206,12 +206,20 @@ ${couplet.version} + com.couplet couplet-enterprisemanagement-common ${couplet.version} + + + com.couplet + couplet-enterprisemanagement-remote + ${couplet.version} + + From 847e150cbcb27f86e413bb666cc0a39f4a42a2ac Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:31:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BC=AA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/utils/SecurityUtils.java | 10 +++ .../common/system/domain/LoginUser.java | 82 +++---------------- .../system/remote/RemoteDeptService.java | 36 ++++++++ .../factory/RemoteDeptFallbackFactory.java | 20 +++-- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../com/couplet/remote/DeptServiceFegin.java | 36 -------- .../pom.xml | 5 -- .../couplet/server/CoupleManagementApp.java | 3 +- .../service/impl/ManageServiceImpl.java | 17 +++- .../system/controller/SysDeptController.java | 11 +++ .../system/controller/SysUserController.java | 3 + .../system/service/SysDeptService.java | 14 ++++ .../service/impl/SysDeptServiceImpl.java | 30 +++++++ 13 files changed, 144 insertions(+), 124 deletions(-) create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java rename {couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet => couplet-common/couplet-common-system/src/main/java/com/couplet/common/system}/remote/factory/RemoteDeptFallbackFactory.java (61%) delete mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java diff --git a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java index 4daf3da..27f67ea 100644 --- a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java +++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java @@ -7,6 +7,7 @@ import com.couplet.common.core.utils.ServletUtils; import com.couplet.common.core.utils.StringUtils; import com.couplet.common.system.domain.LoginUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.util.Assert; import javax.servlet.http.HttpServletRequest; @@ -44,6 +45,15 @@ public class SecurityUtils { return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, LoginUser.class); } + /** + * 获取登录企业ID + */ + public static Long getEnterpriseId(){ + Long enterpriseId = getLoginUser().getEnterpriseId(); + Assert.notNull(enterpriseId, "该用户未绑定负责企业"); + return enterpriseId; + } + /** * 获取请求token */ diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java index 1edfd94..338dcb9 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java @@ -1,6 +1,8 @@ package com.couplet.common.system.domain; +import lombok.*; + import java.io.Serializable; import java.util.Set; @@ -9,6 +11,10 @@ import java.util.Set; * * @author couplet */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; @@ -52,80 +58,14 @@ public class LoginUser implements Serializable { */ private Set roles; + /** + * 企业ID + */ + private Long enterpriseId; + /** * 用户信息 */ private SysUser sysUser; - public String getToken () { - return token; - } - - public void setToken (String token) { - this.token = token; - } - - public Long getUserid () { - return userid; - } - - public void setUserid (Long userid) { - this.userid = userid; - } - - public String getUsername () { - return username; - } - - public void setUsername (String username) { - this.username = username; - } - - public Long getLoginTime () { - return loginTime; - } - - public void setLoginTime (Long loginTime) { - this.loginTime = loginTime; - } - - public Long getExpireTime () { - return expireTime; - } - - public void setExpireTime (Long expireTime) { - this.expireTime = expireTime; - } - - public String getIpaddr () { - return ipaddr; - } - - public void setIpaddr (String ipaddr) { - this.ipaddr = ipaddr; - } - - public Set getPermissions () { - return permissions; - } - - public void setPermissions (Set permissions) { - this.permissions = permissions; - } - - public Set getRoles () { - return roles; - } - - public void setRoles (Set roles) { - this.roles = roles; - } - - public SysUser getSysUser () { - return sysUser; - } - - public void setSysUser (SysUser sysUser) { - this.sysUser = sysUser; - } } diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java new file mode 100644 index 0000000..a05dd4f --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java @@ -0,0 +1,36 @@ +package com.couplet.common.system.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + + +@FeignClient(contextId = "remoteFileService" , + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteDeptFallbackFactory.class, + path = "/dept" +) +public interface RemoteDeptService { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @GetMapping("/list") + public Result list (SysDept dept); + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") + public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId); +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java similarity index 61% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java index 816a3c7..24ef720 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java @@ -1,10 +1,10 @@ -package com.couplet.remote.factory; +package com.couplet.common.system.remote.factory; import com.couplet.common.core.domain.Result; import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.system.domain.SysDept; import com.couplet.common.system.domain.SysUser; -import com.couplet.remote.DeptServiceFegin; +import com.couplet.common.system.remote.RemoteDeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; @@ -16,20 +16,28 @@ import org.springframework.cloud.openfeign.FallbackFactory; */ @Slf4j -public class RemoteDeptFallbackFactory implements FallbackFactory { +public class RemoteDeptFallbackFactory implements FallbackFactory { @Override - public DeptServiceFegin create(Throwable cause) { + public RemoteDeptService create(Throwable cause) { log.error("sys服务调用失败:{}", cause.getMessage()); - return new DeptServiceFegin() { + return new RemoteDeptService() { @Override public Result list(SysDept dept) { return Result.error("调用失败..."+cause.getMessage()); } + /** + * 根据企业ID获取企业下部门 + * + * @param enterpriseId 企业ID + * + * @return 企业信息，内含有部门 + */ @Override - public Result> list(SysUser user) { + public Result getSysDeptByEnterpriseId (Long enterpriseId) { return Result.error("调用失败..."+cause.getMessage()); } + }; } } diff --git a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fe7c0f3..a990272 100644 --- a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,4 @@ com.couplet.common.system.remote.factory.RemoteUserFallbackFactory com.couplet.common.system.remote.factory.RemoteLogFallbackFactory com.couplet.common.system.remote.factory.RemoteFileFallbackFactory +com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java deleted file mode 100644 index 08d8a37..0000000 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.couplet.remote; - -import com.couplet.common.core.constant.ServiceNameConstants; -import com.couplet.common.core.domain.Result; -import com.couplet.common.core.web.page.TableDataInfo; -import com.couplet.common.security.annotation.RequiresPermissions; -import com.couplet.common.system.domain.SysDept; -import com.couplet.common.system.domain.SysUser; -import com.couplet.remote.factory.RemoteDeptFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - - -@FeignClient(contextId = "remoteFileService" , value = ServiceNameConstants.SYSTEM_SERVICE,fallbackFactory = RemoteDeptFallbackFactory.class) -public interface DeptServiceFegin { - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - @RequiresPermissions("system:dept:list") - @GetMapping("/list") - public Result list (SysDept dept); - /* - * @param user: - * @return Result> - * @author 付凡芮 - * @description TODO - * @date - * 用户信息集合 - */ - @RequiresPermissions("system:user:list") - @GetMapping("/list") - public Result> list (SysUser user); -} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml index f83a132..523c572 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -82,11 +82,6 @@ couplet-common-swagger - - com.couplet - couplet-enterprisemanagement-remote - - diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java index ae96763..2b72827 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java @@ -8,9 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author fufanrui - * 启动类 * @version 1.0 - * @description: TODO + * @description: 启动类 * @date 2024/3/27 14:04 */ @EnableCustomConfig diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java index 51df9a0..a0e9b61 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -1,10 +1,12 @@ package com.couplet.server.service.impl; -import com.couplet.remote.DeptServiceFegin; +import com.couplet.common.core.domain.Result; +import com.couplet.common.security.utils.SecurityUtils; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.remote.RemoteDeptService; import com.couplet.server.service.ManageServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PostMapping; /** * @author fufanrui @@ -15,8 +17,15 @@ import org.springframework.web.bind.annotation.PostMapping; @Service public class ManageServiceImpl implements ManageServer { - - + @Autowired + private RemoteDeptService remoteDeptService; + { + Long enterpriseId = SecurityUtils.getEnterpriseId(); + Result sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId); + if (sysDeptByEnterpriseId.getCode() == 200){ + SysDept sysDept = sysDeptByEnterpriseId.getData(); + } + } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index b486bd4..3d47e40 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -107,4 +107,15 @@ public class SysDeptController extends BaseController { deptService.checkDeptDataScope(deptId); return toAjax(deptService.deleteDeptById(deptId)); } + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") + public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId){ + SysDept sysDept = deptService.getSysDeptByEnterpriseId(enterpriseId); + return Result.success(sysDept); + } } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java index 91aa779..493cb33 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java @@ -107,10 +107,13 @@ public class SysUserController extends BaseController { Set roles = permissionService.getRolePermission(sysUser); // 权限集合 Set permissions = permissionService.getMenuPermission(sysUser); + // 查询企业信息 + Long deptId = deptService.selectDeptIdByLeader(sysUser.getUserName()); LoginUser sysUserVo = new LoginUser(); sysUserVo.setSysUser(sysUser); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); + sysUserVo.setEnterpriseId(deptId); return Result.success(sysUserVo); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java index 2a5889e..dde112b 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java @@ -135,4 +135,18 @@ public interface SysDeptService extends IService { * @return 结果 */ public int deleteDeptById (Long deptId); + + /** + * 通过负责人查询企业ID + * @param leader 负责人 + * @return 企业ID + */ + Long selectDeptIdByLeader (String leader); + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + SysDept getSysDeptByEnterpriseId (Long enterpriseId); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java index 98059a3..05f5ec9 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.couplet.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.constant.UserConstants; import com.couplet.common.core.exception.ServiceException; @@ -17,6 +18,7 @@ import com.couplet.system.mapper.SysRoleMapper; import com.couplet.system.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.ArrayList; import java.util.Iterator; @@ -280,6 +282,34 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptMapper.deleteDeptById(deptId); } + /** + * 通过负责人查询企业ID + * + * @param leader 负责人 + * + * @return 企业ID + */ + @Override + public Long selectDeptIdByLeader (String leader) { + SysDept sysDept = getOne(new LambdaQueryWrapper<>() {{ + eq(SysDept::getLeader, leader); + }}); + + return sysDept == null ? null : sysDept.getDeptId(); + } + + /** + * 根据企业ID获取企业下部门 + * + * @param enterpriseId 企业ID + * + * @return 企业信息，内含有部门 + */ + @Override + public SysDept getSysDeptByEnterpriseId (Long enterpriseId) { + return null; + } + /** * 递归列表 */ From c00d4c890443b558ca39da337976c982c1cf9b79 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Thu, 28 Mar 2024 22:33:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet/common/system/domain/SysFirm.java | 25 ++++++++ .../system/controller/SysFirmController.java | 64 +++++++++++++++++++ .../couplet/system/mapper/SysFirmMapper.java | 22 +++++++ .../system/service/SysFirmService.java | 19 ++++++ .../service/impl/SysFirmServiceImpl.java | 35 ++++++++++ .../resources/mapper/system/SysFirmMapper.xml | 22 +++++++ 6 files changed, 187 insertions(+) create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java create mode 100644 couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml 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 new file mode 100644 index 0000000..8ade07b --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java @@ -0,0 +1,25 @@ +package com.couplet.common.system.domain; + +import lombok.Data; + +/** + * @ClassName SysFirm + * @Description 企业实体类 + * @Author YuanYongH + * @Date 2024/3/28 22:14 + */ +@Data +public class SysFirm { + /** + * 企业id + **/ + private Integer firmId; + /** + * 企业名称 + **/ + private String firmName; + /** + * 企业认证 + **/ + private Integer approveId; +} 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 new file mode 100644 index 0000000..404529b --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java @@ -0,0 +1,64 @@ +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 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 java.util.List; + +/** + * @ClassName SysFirmController + * @Description 企业信息 + * @Author YuanYongH + * @Date 2024/3/28 22:14 + */ +@RestController +@RequestMapping("firm") +public class SysFirmController { + + @Autowired + private SysFirmService sysFirmService; + /** + * @Description // 管理企业列表 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result> + **/ + @PostMapping("firmList") + public Result> firmList(@RequestBody SysFirm sysFirm){ + List list = sysFirmService.firmList(sysFirm); + Result> result = Result.success(list); + return result; + } + + /** + * @Description // 添加企业 默认未认证 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result + **/ + @PostMapping("addFirm") + public Result addFirm(@RequestBody SysFirm sysFirm){ + int i = sysFirmService.addFirm(sysFirm); + Result result = Result.success(i); + return result; + } + + /** + * @Description // 修改企业信息 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result + **/ + @PostMapping("updateFirm") + public Result updateFirm(@RequestBody SysFirm sysFirm){ + int i = sysFirmService.updateFirm(sysFirm); + Result result = Result.success(i); + return result; + } +} 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 new file mode 100644 index 0000000..f5f1429 --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java @@ -0,0 +1,22 @@ +package com.couplet.system.mapper; + +import com.couplet.common.system.domain.SysFirm; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName SysFirmMapper + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:18 + */ +@Mapper +public interface SysFirmMapper { + List firmList(SysFirm sysFirm); + + int addFirm(SysFirm sysFirm); + + int updateFirm(SysFirm sysFirm); + +} 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 new file mode 100644 index 0000000..ceeebad --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java @@ -0,0 +1,19 @@ +package com.couplet.system.service; + +import com.couplet.common.system.domain.SysFirm; + +import java.util.List; + +/** + * @ClassName SysFirmService + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:17 + */ +public interface SysFirmService { + List firmList(SysFirm sysFirm); + + int addFirm(SysFirm sysFirm); + + int updateFirm(SysFirm sysFirm); +} 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 new file mode 100644 index 0000000..903a67a --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java @@ -0,0 +1,35 @@ +package com.couplet.system.service.impl; + +import com.couplet.common.system.domain.SysFirm; +import com.couplet.system.mapper.SysFirmMapper; +import com.couplet.system.service.SysFirmService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName SysFirmServiceImpl + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:17 + */ +@Service +public class SysFirmServiceImpl implements SysFirmService { + @Autowired + private SysFirmMapper sysFirmMapper; + @Override + public List firmList(SysFirm sysFirm) { + return sysFirmMapper.firmList(sysFirm); + } + + @Override + public int addFirm(SysFirm sysFirm) { + return sysFirmMapper.addFirm(sysFirm); + } + + @Override + public int updateFirm(SysFirm sysFirm) { + return sysFirmMapper.updateFirm(sysFirm); + } +} 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 new file mode 100644 index 0000000..99ca2eb --- /dev/null +++ b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml @@ -0,0 +1,22 @@ + + + + + INSERT INTO `ry-cloud`.`yyh_firm` ( `firm_name`) + VALUES ( #{firmName}); + + + + + UPDATE `ry-cloud`.`yyh_firm` + SET `firm_name` = #{firmName}, `approve_id` = #{approveId} + WHERE `firm_id` = #{firmId}; + + + + +