diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 4e3d228..2a5cba4 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -76,19 +76,18 @@ public class SysLoginService { if (Result.FAIL == userResult.getCode()) { throw new ServiceException(userResult.getMsg()); } - LoginUser userInfo = userResult.getData(); SysUser user = userResult.getData().getSysUser(); - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { - recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起,您的账号已被删除"); - throw new ServiceException("对不起,您的账号:" + username + " 已被删除"); + if(UserStatus.DELETED.getCode().equals(user.getDelFlag())){ + recordLogService.recordLogininfor(username,Constants.LOGIN_FAIL,"对不起,您的账号已被删除"); + throw new ServiceException("对不起,您的账号:" + username + " 已被删除 "); } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用,请联系管理员"); - throw new ServiceException("对不起,您的账号:" + username + " 已停用"); + if(UserStatus.DISABLE.getCode().equals(user.getStatus())){ + recordLogService.recordLogininfor(username,Constants.LOGIN_FAIL,"用户已停用,请联系管理官"); + throw new ServiceException("对不起,您的账号:" + username + " 已停用"); } - passwordService.validate(user, password); - recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); + passwordService.validate(user,password); + recordLogService.recordLogininfor(username,Constants.LOGIN_SUCCESS,"登录成功"); return userInfo; } @@ -128,16 +127,16 @@ public class SysLoginService { throw new ServiceException("密码长度必须在5到20个字符之间"); } - // 注册用户信息 + //注册用户信息 SysUser sysUser = new SysUser(); sysUser.setUserName(username); sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); - Result registerResult = remoteUserService.registerUserInfo(registerBody, SecurityConstants.INNER); - + Result registerResult = remoteUserService.registerUserInfo(registerBody, SecurityConstants.INNER); if (Result.FAIL == registerResult.getCode()) { throw new ServiceException(registerResult.getMsg()); } - recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); + + recordLogService.recordLogininfor(username,Constants.REGISTER,"注册成功"); } } diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index bd0c111..2a1cd5d 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -91,21 +91,19 @@ public class ManyDataSource implements ApplicationRunner { @Bean public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { List entInfoList = dataSourceInfoList(); - if(StringUtils.isEmpty(entInfoList)){ - throw new SaaSException("数据源信息列表为空或为null"); + if (StringUtils.isNotEmpty(entInfoList)) { + throw new SaaSException("数据元信息列表为空或为null"); } - Map dataSourceMap = dataSourceInfoList().stream() + Map dataSourceMap = dataSourceInfoList().stream() .map(entInfo -> DataSourceInfo.hostAndPortBuild( - entInfo.getEntCode(), - entInfo.getIp(), - entInfo.getPort() - ) + entInfo.getEntCode(), + entInfo.getIp(), + entInfo.getPort() ) - .collect(Collectors.toMap( + ).collect(Collectors.toMap( dataSourceInfo -> dataSourceInfo.getKey(), dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo) )); - //设置动态数据源 DynamicDataSource dynamicDataSource = new DynamicDataSource(); dynamicDataSource.setTargetDataSources(dataSourceMap); diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java index 95f79bf..13ee87d 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java @@ -1,8 +1,9 @@ package com.muyu.cloud.common.many.datasource.constents; /** - * @Author: zi run - * @Date 2024/9/20 14:52 + * 数据源常量 + * @Author chenruijia + * @Date 2024/9/29 17:52 * @Description 数据源常量 */ public class DatasourceContent { diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java index c1af5f2..798fa72 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 数据源实体类 * @Author: zi run * @Date 2024/9/20 14:52 * @Description 数据源实体类 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java index 3edd2b2..55ef746 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Component; import java.sql.SQLException; /** + * Druid工厂 * @Author: zi run * @Date 2024/9/20 14:52 * @Description Druid工厂 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java index 9e5eb96..58c20af 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; /** + * 数据源切换处理 * @Author: zi run * @Date 2024/9/20 14:52 * @Description 数据源切换处理 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java index 6b12fdd..4721153 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java @@ -29,18 +29,40 @@ public class FaultRule extends BaseEntity { @Schema(defaultValue = "故障规则ID",type = "Long",description = "故障规则ID") private Long faultRuleId; /** - * 故障规则名称 + * 车辆类型ID */ - @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") - private String faultRuleName; + @Schema(defaultValue = "车辆类型ID",type = "Integer",description = "车辆类型ID") + private Integer carTypeId; + /** + * 故障名称ID + */ + @Schema(defaultValue = "故障名称ID",type = "Integer",description = "故障名称ID") + private Integer faultId; + /** + * 故障条件 + */ + @Schema(defaultValue = "故障条件",type = "String",description = "故障条件") + private String faultConditions; /** * 故障规则参数 */ @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") - private String faultRuleParameter; + private String ruleParameters; /** - * 故障规则描述 + * 车辆类型名称 */ - @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") - private String faultRuleDescription; + @Schema(defaultValue = "车辆类型名称",type = "String",description = "车辆类型名称") + private String carTypeName; + /** + * 故障名称 + */ + @Schema(defaultValue = "故障名称",type = "String",description = "故障名称") + private String faultName; + /** + * 车辆VIN + */ + @Schema(defaultValue = "车辆VIN",type = "String",description = "车辆VIN") + private String carVin; + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 25a3957..01320b3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -3,6 +3,7 @@ package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,6 +43,11 @@ public class SysCarFault extends BaseEntity { */ @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") private Integer faultTypeId; + /** + * 车辆故障规则ID + */ + @Schema(defaultValue = "车辆故障规则ID",type = "Integer",description = "车辆故障规则ID") + public Integer faultRuleId; /** * 故障VIN编码 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java new file mode 100644 index 0000000..be667a1 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java @@ -0,0 +1,96 @@ +package com.muyu.enterprise.domain.resp; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.enterprise.domain.SysCarFault; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.function.Supplier; + +/** + * 故障返回 + * @author chenruijia + * @Date 2024/9/28 21:11 + * @Description FaultResp:故障返回 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "故障返回") +public class FaultResp { + /** + * 车辆故障码 + */ + @Schema(defaultValue = "车辆故障码",type = "String",description = "车辆故障码") + private String faultCode; + /** + * 车辆故障那类型ID + */ + @Schema(defaultValue = "车辆故障那类型ID",type = "Integer",description = "车辆故障类型ID") + private Integer faultTypeId; + /** + * 车辆故障规则ID + */ + @Schema(defaultValue = "车辆故障规则ID",type = "Integer",description = "车辆故障规则ID") + public Integer faultRuleId; + /** + * 故障VIN编码 + */ + @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") + public String carVin; + /** + * 车辆故障标签 + */ + @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") + public String faultLabel; + /** + * 车辆故障位 + */ + @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") + public String faultBit; + /** + * 车辆故障值 + */ + @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") + public String faultValue; + /** + * v + */ + @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") + public String faultWarn; + /** + * 报警状态 + */ + @Schema(defaultValue = "报警状态",type = "String",description = "报警状态") + public String warnStatus; + /** + * 故障描述信息 + */ + @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") + public String faultDesc; + /** + * 启用状态 + */ + @Schema(defaultValue = "启用状态",type = "Integer",description = "启用状态") + public Integer state; + /** + * 故障规则名称 + */ + @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") + public String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + public String faultRuleParameter; + /** + * 故障规则描述 + */ + @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") + public String faultRuleDescription; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index d74f114..f7e5bd3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java index ed37436..f75f471 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java @@ -9,6 +9,7 @@ import com.muyu.enterprise.domain.CarMessage; import com.muyu.enterprise.service.CarMessageService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -29,6 +30,8 @@ public class CarMessageController extends BaseController { private final CarMessageCacheService carMessageCacheService; private final CarMessageService sysCarMessageService; + @Autowired + private CarMessageService carMessageService; /** * 查询所有报文信息 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java index c1cc3ea..04fb1a6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; * @Description SysCarFaultMapper:故障管理持久层 */ @Mapper -public interface SysCarFaultMapper extends BaseMapper{ +public interface SysCarFaultMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java index 2ba7cf8..8f6c7e2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -7,14 +7,13 @@ import java.util.List; /** * 故障日志业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultLogService:故障日志业务层 */ public interface FaultLogService extends IService { List faultLogList(FaultLog faultLog); - FaultLog byidId(Long faultLogId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java index f012de9..f871dbc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultMessage; import java.util.List; /** * 站内信业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultMessageService:站内信业务层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index c5f88fd..730a7e9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultType; import java.util.List; /** * 故障类型业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultTypeService:故障类型业务层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java index 295082f..0fb6895 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.SysCarFault; import java.util.List; /** * 故障管理业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description SysCarFaultService:故障管理业务层 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index 0b7ad98..1a88929 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -21,14 +21,14 @@ import java.util.List; /** * 企业管理控制层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/26 0:21 * @Description 企业管理控制层 */ @RestController @RequiredArgsConstructor @RequestMapping(value = "/ent") -@Tag(name = "SysEntController",description = "企业管理") +@Tag(name = "企业信息",description = "企业管理") public class SysEntController extends BaseController { /** @@ -40,7 +40,7 @@ public class SysEntController extends BaseController { * 获取企业信息 * @return 响应结果 */ - @GetMapping(value = "/getInfo") + @RequestMapping(value = "/selectList",method = RequestMethod.GET) @Operation(summary = "获取企业信息", description = "现有的基础企业信息") public Result> getInfo() { return Result.success( @@ -48,25 +48,25 @@ public class SysEntController extends BaseController { ); } - /** - * 查询企业信息列表 - * @param entListReq 企业列表请求对象 - * @return 响应结果 - */ - @PostMapping(value = "/selectList") - @Operation(summary = "查询企业信息列表", description = "分页展示企业信息") - public Result> selectList(@RequestBody EntListReq entListReq) { - startPage(); - List entRespList = sysEntService.selectList(entListReq); - return getDataTable(entRespList); - } +// /** +// * 查询企业信息列表 +// * @param entListReq 企业列表请求对象 +// * @return 响应结果 +// */ +// @PostMapping(value = "/selectList") +// @Operation(summary = "查询企业信息列表", description = "分页展示企业信息") +// public Result> selectList(@RequestBody EntListReq entListReq) { +// startPage(); +// List entRespList = sysEntService.selectList(entListReq); +// return getDataTable(entRespList); +// } /** * 根据ID获取企业信息 * @param entId 企业ID * @return 响应结果 */ - @GetMapping(value = "/{entId}") + @GetMapping(value = "/getById/{entId}") @Operation(summary = "根据ID获取企业信息", description = "根据企业唯一标识获取单体企业信息") public Result getById( @Schema(title = "企业ID", type = "Long", defaultValue = "1", description = "企业唯一标识") @@ -79,7 +79,7 @@ public class SysEntController extends BaseController { * @param entAddReq 企业添加请求对象 * @return 响应结果 */ - @PostMapping + @PostMapping(value = "/save") @Operation(summary = "添加企业信息", description = "将企业信息添加到系统中") public Result save(@Validated @RequestBody EntAddReq entAddReq) { sysEntService.save(EntAddReq.addBuild(entAddReq)); @@ -92,7 +92,7 @@ public class SysEntController extends BaseController { * @param entUpdateReq 企业修改请求对象 * @return 响应结果 */ - @PutMapping(value = "/{entId}") + @PutMapping(value = "/update/{entId}") @Operation(summary = "修改企业信息",description = "根据企业唯一标识修改企业信息") public Result update(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识") @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId") Long entId, @@ -106,7 +106,7 @@ public class SysEntController extends BaseController { * @param entId 企业ID * @return */ - @RequestMapping(value = "/entId",method = RequestMethod.DELETE) + @RequestMapping(value = "/remove/{entId}",method = RequestMethod.DELETE) @Operation(summary = "删除企业信息",description = "根据企业唯一标识删除企业记录") public Result remove(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识") @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId")Long entId){ 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 2a8c084..4e8313d 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 @@ -16,6 +16,7 @@ import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; import com.muyu.system.service.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; +import java.sql.*; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -32,6 +35,7 @@ import java.util.stream.Collectors; * * @author muyu */ +@Slf4j @RestController @RequestMapping("/user") public class SysUserController extends BaseController { @@ -120,20 +124,24 @@ public class SysUserController extends BaseController { @PostMapping("/register") public Result register (@RequestBody RegisterBody registerBody) { String username = registerBody.getUsername(); - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { - return Result.error("当前系统没有开启注册功能!"); - } - SysUser sysUser = SysUser.builder().userName(username).build(); + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + if (!userService.checkUserNameUnique(sysUser)) { + return Result.error("保存用户'" + username + "'失败,注册账号已存在"); + } + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { + return Result.error("当前系统没有开启注册功能!"); + } if (!userService.checkUserNameUnique(sysUser)) { return Result.error("保存用户'" + username + "'失败,注册账号已存在"); } - //添加企业 SysEnt sysEnt = SysEnt.builder() .name(registerBody.getEntName()) .leader(registerBody.getLeader()) .phone(registerBody.getPhone()) .email(registerBody.getEmail()) + .entCode(registerBody.getUsername()) .build(); entService.save(sysEnt); @@ -151,7 +159,79 @@ public class SysUserController extends BaseController { sysUser.setDeptId(sysDept.getDeptId()); sysUser.setNickName(registerBody.getUsername()); sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword())); + sysUser.setNickName("注册"); + boolean b = userService.registerUser(sysUser); + if (b == true) { + //数据库驱动 + String mysqlDriver = "com.mysql.jdbc.Driver"; + //数据库地址 + String url = "jdbc:mysql://106.15.136.7:3306/"; + //数据库用户名 + String name = "root"; + //数据库密码 + String password = "Six@211206"; + Collection collection = null; + Collection stmt = null; + //创建数据库SQL + try { + Class.forName(mysqlDriver); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + String databaseSQL = "create database "+username ; + //添加企业信息 + String tableSQL = "create table sys_ent (id int auto_increment primary key comment '主键id'," + + "name varchar(16) comment '企业名称'," + + "leader varchar(16) comment '负责人'," + + "phone varchar(11) comment '联系电话'," + + "email varchar(32) comment '邮箱'," + + "ent_code varchar(64) comment '企业编码'," + + "ent_status varchar(64) comment '企业状态'," + + "create_by varchar(32) comment '创建人'," + + "update_by varchar(32) comment '创建时间'," + + "create_time datetime comment '修改人'," + + "update_time datetime comment '修改时间'," + + "remark varchar(32) comment '备注')"; + //连接数据库 + try { + + Connection connection = DriverManager.getConnection(url, name, password); + //用于执行编译sql语句的对象 + Statement connStatement = connection.createStatement(); + if (connection != null) { + //执行建库语句 + connStatement.executeUpdate(databaseSQL); + log.info("创建数据库成功"); + //连接新建数据库 + Connection connection1 = DriverManager.getConnection(url + username, name, password); + if (connection1 != null) { + log.info("连接数据库成功"+username); + Statement statement = connection1.createStatement(); + //执行建表语句 + statement.executeUpdate(tableSQL); + log.info("创建表成功"); + String insertSQL="INSERT INTO sys_ent (name, leader, phone, email, ent_code, ent_status, create_by, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?)"; + try(PreparedStatement preparedStatement = connection1.prepareStatement(insertSQL)) { + //设置插入的值 + preparedStatement.setString(1,registerBody.getEntName()); + preparedStatement.setString(2,registerBody.getLeader()); + preparedStatement.setString(3,registerBody.getPhone()); + preparedStatement.setString(4,registerBody.getEmail()); + preparedStatement.setString(5,username); + preparedStatement.setInt(6,0); + preparedStatement.setString(7, sysUser.getCreateBy()); + preparedStatement.setTimestamp(8, new Timestamp(System.currentTimeMillis())); // 当前时间 + preparedStatement.executeUpdate(); + log.info("插入企业信息成功"); + } + return Result.success(); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } return Result.success(userService.registerUser(sysUser)); }