Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao

# Conflicts:
#	couplet-modules/pom.xml
#	pom.xml

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
         # 共享配置

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
      */

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<String> 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<String> getPermissions () {
-        return permissions;
-    }
-
-    public void setPermissions (Set<String> permissions) {
-        this.permissions = permissions;
-    }
-
-    public Set<String> getRoles () {
-        return roles;
-    }
-
-    public void setRoles (Set<String> roles) {
-        this.roles = roles;
-    }
-
-    public SysUser getSysUser () {
-        return sysUser;
-    }
-
-    public void setSysUser (SysUser sysUser) {
-        this.sysUser = sysUser;
-    }
 }

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;
+}

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<SysDept> getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId);
+}

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java

@@ -0,0 +1,43 @@
+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.common.system.remote.RemoteDeptService;
+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<RemoteDeptService> {
+    @Override
+    public RemoteDeptService create(Throwable cause) {
+        log.error("sys服务调用失败:{}", cause.getMessage());
+        return new RemoteDeptService() {
+            @Override
+            public Result list(SysDept dept) {
+                return Result.error("调用失败..."+cause.getMessage());
+            }
+
+            /**
+             * 根据企业ID获取企业下部门
+             *
+             * @param enterpriseId 企业ID
+             *
+             * @return 企业信息，内含有部门
+             */
+            @Override
+            public Result<SysDept> getSysDeptByEnterpriseId (Long enterpriseId) {
+                return Result.error("调用失败..."+cause.getMessage());
+            }
+
+        };
+    }
+}

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

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
         # 共享配置

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-enterprisemanagement</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-enterprisemanagement-common</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-system</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-enterprisemanagement</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-enterprisemanagement-remote</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-enterprisemanagement-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-security</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-enterprisemanagement</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-enterprisemanagement-server</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-enterprisemanagement-common</artifactId>
+        </dependency>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-datasource</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-log</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Swagger -->
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-swagger</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java

@@ -0,0 +1,27 @@
+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: 启动类
+ * @date 2024/3/27 14:04
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class CoupleManagementApp {
+
+    public static void main(String[] args) {
+
+        SpringApplication.run(CoupleManagementApp.class, args);
+
+
+    }
+}

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 {
+
+
+
+
+
+}

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 {
+
+
+}

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java

@@ -0,0 +1,32 @@
+package com.couplet.server.service.impl;
+
+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;
+
+/**
+ * @author fufanrui
+ * @version 1.0
+ * @description: TODO
+ * @date 2024/3/27 15:34
+ */
+@Service
+public class ManageServiceImpl implements ManageServer {
+
+    @Autowired
+    private RemoteDeptService remoteDeptService;
+    {
+        Long enterpriseId = SecurityUtils.getEnterpriseId();
+        Result<SysDept> sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId);
+        if (sysDeptByEnterpriseId.getCode() == 200){
+            SysDept sysDept = sysDeptByEnterpriseId.getData();
+        }
+    }
+
+
+
+}

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}

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

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/couplet-system"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.couplet" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

couplet-modules/couplet-enterprisemanagement/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-enterprisemanagement</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>couplet-enterprisemanagement-common</module>
+        <module>couplet-enterprisemanagement-server</module>
+        <module>couplet-enterprisemanagement-remote</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

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
         # 共享配置

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
         # 共享配置

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
         # 共享配置

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
@@ -110,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<SysDept> getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId){
+        SysDept sysDept = deptService.getSysDeptByEnterpriseId(enterpriseId);
+        return Result.success(sysDept);
+    }
 }

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<java.util.List<com.couplet.common.system.domain.SysFirm>>
+    **/
+    @PostMapping("firmList")
+    public Result<List<SysFirm>> firmList(@RequestBody SysFirm sysFirm){
+        List<SysFirm> list = sysFirmService.firmList(sysFirm);
+        Result<List<SysFirm>> 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<Integer> 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<Integer> result = Result.success(i);
+        return result;
+    }
+}

couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java

@@ -107,10 +107,13 @@ public class SysUserController extends BaseController {
         Set<String> roles = permissionService.getRolePermission(sysUser);
         // 权限集合
         Set<String> 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);
     }
 

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<SysFirm> firmList(SysFirm sysFirm);
+
+    int addFirm(SysFirm sysFirm);
+
+    int updateFirm(SysFirm sysFirm);
+
+}

couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java

@@ -135,4 +135,18 @@ public interface SysDeptService extends IService<SysDept> {
      * @return 结果
      */
     public int deleteDeptById (Long deptId);
+
+    /**
+     * 通过负责人查询企业ID
+     * @param leader 负责人
+     * @return 企业ID
+     */
+    Long selectDeptIdByLeader (String leader);
+
+    /**
+     * 根据企业ID获取企业下部门
+     * @param enterpriseId 企业ID
+     * @return 企业信息，内含有部门
+     */
+    SysDept getSysDeptByEnterpriseId (Long enterpriseId);
 }

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<SysFirm> firmList(SysFirm sysFirm);
+
+    int addFirm(SysFirm sysFirm);
+
+    int updateFirm(SysFirm sysFirm);
+}

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<SysDeptMapper, SysDept> 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;
+    }
+
     /**
      * 递归列表
      */

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<SysFirm> 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);
+    }
+}

couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java

@@ -61,6 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList (SysUser user) {
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        user.setDeptId(deptId);
         return userMapper.selectUserList(user);
     }
 

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
         # 共享配置

couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.couplet.system.mapper.SysFirmMapper">
+    <insert id="addFirm">
+        INSERT INTO `ry-cloud`.`yyh_firm` ( `firm_name`)
+        VALUES ( #{firmName});
+
+    </insert>
+    <update id="updateFirm">
+
+        UPDATE `ry-cloud`.`yyh_firm`
+        SET `firm_name` = #{firmName}, `approve_id` = #{approveId}
+        WHERE `firm_id` = #{firmId};
+
+    </update>
+
+    <select id="firmList" resultType="com.couplet.common.system.domain.SysFirm">
+        select * from yyh_firm;
+    </select>
+</mapper>

couplet-modules/pom.xml

@@ -17,6 +17,7 @@
         <module>couplet-electronic-fence</module>
         <module>couplet-modules-vehicle</module>
         <module>couplet-modules-mqtt</module>
+        <module>couplet-enterprisemanagement</module>
     </modules>
 
     <artifactId>couplet-modules</artifactId>

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
         # 共享配置

pom.xml

@@ -232,6 +232,20 @@
                 <version>${couplet.version}</version>
             </dependency>
 
+            <!-- 企业服务 模块 公共依赖 -->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-enterprisemanagement-common</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+
+            <!-- 企业服务 模块 远程调用依赖 -->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-enterprisemanagement-remote</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>