From efa6861d2f15a4992e2088c20471a73c71dd033a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Tue, 8 Oct 2024 11:31:17 +0800 Subject: [PATCH] =?UTF-8?q?test:()=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/common/system/remote/RemoteUserService.java | 9 +++++++++ .../remote/factory/RemoteUserFallbackFactory.java | 6 ++++++ .../com/muyu/system/controller/SysUserController.java | 7 +++++++ .../java/com/muyu/system/mapper/SysUserMapper.java | 3 +++ .../java/com/muyu/system/service/SysUserService.java | 1 + .../muyu/system/service/impl/SysUserServiceImpl.java | 5 +++++ .../src/main/resources/mapper/system/SysUserMapper.xml | 8 ++++++++ .../muyu/server/controller/EnterpriseController.java | 10 ++++++++++ .../com/muyu/server/controller/TemplateController.java | 3 ++- 9 files changed, 51 insertions(+), 1 deletion(-) diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 1154a72..d3cd939 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -8,6 +8,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -52,4 +53,12 @@ public interface RemoteUserService { */ @PostMapping("/user/enterprise") ResultsettlementEnterpriseInfo(@RequestBody Business enterprise, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 用户添加 + * @param sysUser + * @return + */ + @PostMapping("/user/addUser") + public Result addUser(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE)String source); } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index f725a4c..c9045dd 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -45,6 +45,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory addUser(SysUser sysUser, String source) { + return Result.error("用户添加失败"); + } + + }; } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index f8ef4d5..13bce5c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -302,4 +302,11 @@ public class SysUserController extends BaseController { public Result deptTree (SysDept dept) { return success(deptService.selectDeptTreeList(dept)); } + + + @PostMapping("/addUser") + public Result addUser(@RequestBody SysUser sysUser){ + Integer i = userService.addUser(sysUser); + return Result.success(i); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index 3dc6b0b..4015eff 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -158,5 +158,8 @@ public interface SysUserMapper extends BaseMapper { List selectCompanyList(); + Integer addUser(SysUser sysUser); + + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index 7dc514c..6ac720a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -230,5 +230,6 @@ public interface SysUserService extends IService { List selectCompanyList(); + Integer addUser(SysUser sysUser); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index bc4162a..7c46437 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -518,4 +518,9 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.selectCompanyList(); } + @Override + public Integer addUser(SysUser sysUser) { + return userMapper.addUser(sysUser); + } + } diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml index 6023ef5..95edafd 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,6 +24,7 @@ + @@ -204,6 +205,7 @@ status, create_by, remark, + database_name, create_time )values( #{userId}, @@ -218,6 +220,7 @@ #{status}, #{createBy}, #{remark}, + #{databaseName} sysdate() ) @@ -228,6 +231,11 @@ INSERT INTO `saas`.`tb_enterprise` (`enterprise_id`, `enterprise_name`, `enterprise_car_count`, `enterprise_fence_count`, `enterprise_database_name`) VALUES (NULL, #{firmName}, 0, 0, #{databaseName}); + + INSERT INTO `four`.`sys_user` + (`dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `database_name`) + VALUES ( 105, #{userName}, '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '47.101.53.251', '2024-05-23 15:08:18', 'admin', #{createTime}, '', NULL, '测试员', #{databaseName}); + update sys_user diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java index fbe366d..8b315dc 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java @@ -6,6 +6,7 @@ import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.domain.Enterprise; import com.muyu.common.system.domain.Business; +import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.util.PageUtils; import com.muyu.server.controller.form.DeleteEnterpriseByIds; @@ -27,6 +28,7 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -95,8 +97,14 @@ public class EnterpriseController { business.setDatabaseName(form.getEnterpriseDatabaseName()); remoteUserService.settlementEnterpriseInfo(business, SecurityConstants.INNER); + SysUser sysUser = new SysUser(); + sysUser.setDatabaseName(form.getEnterpriseDatabaseName()); + sysUser.setUserName(form.getEnterpriseName()); + sysUser.setCreateTime(new Date()); + remoteUserService.addUser(sysUser, SecurityConstants.INNER); String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + form.getEnterpriseDatabaseName() + ";"; + try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD); Statement stmt = adminConn.createStatement()) { @@ -122,6 +130,8 @@ public class EnterpriseController { ClassPathResource rc = new ClassPathResource("static/saas.sql"); EncodedResource er = new EncodedResource(rc, "utf-8"); ScriptUtils.executeSqlScript(connection, er); + + } } catch (SQLException e) { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java index 4b4d6c9..30228b0 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java @@ -17,7 +17,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; /** - * @Author：liuxinyue + * 报文模版管理 + * @author liuxinyue * @Package：com.template.controller * @Project：cloud-server-c * @name：TemplateController