From cd46940e70c60b3ff62cb9a20e4bc831b1fad8ee Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 20:12:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 24 +++++++++---------- .../cloud-modules-enterprise-server/pom.xml | 8 ++++++- .../enterprise/service/FaultLogService.java | 3 +-- .../service/FaultMessageService.java | 2 +- .../enterprise/service/FaultTypeService.java | 2 +- .../enterprise/service/FaultrRuleService.java | 2 +- .../service/SysCarFaultService.java | 2 +- .../system/controller/SysEntController.java | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-) 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..9de01cc 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,15 @@ 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-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index 911a9a6..100e143 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 @@ -82,6 +82,12 @@ com.muyu cloud-modules-enterprise-common + + + com.github.yulichang + mybatis-plus-join + 1.4.13 + @@ -101,4 +107,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/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/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index 4851358..22b4898 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultrRule; import java.util.List; /** * 故障规则业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultrRuleService:故障规则业务层 */ 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..20b59ca 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,7 +21,7 @@ import java.util.List; /** * 企业管理控制层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/26 0:21 * @Description 企业管理控制层 */ From 2d0f55739862270fca7e5d1f2630c237e551d25f Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 22:14:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/enterprise/domain/SysCarFault.java | 5 + .../enterprise/domain/resp/FaultResp.java | 96 +++++++++++++++++++ .../controller/SysCarFaultController.java | 2 +- .../enterprise/mapper/SysCarFaultMapper.java | 3 +- .../system/controller/SysEntController.java | 2 + 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java 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..ed76427 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 @@ -42,6 +42,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..39577c9 --- /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 = "故障规则名称") + private String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + private String faultRuleParameter; + /** + * 故障规则描述 + */ + @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") + private String faultRuleDescription; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index d2bf065..700eb21 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -40,7 +40,7 @@ public class SysCarFaultController extends BaseController * 查询车辆故障列表 */ @RequestMapping(value = "/list", method = RequestMethod.GET) - public Result> list(SysCarFault sysCarFault) + public Result> list(@RequestBody SysCarFault sysCarFault) { List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); return success(list); 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..8d570a6 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 @@ -1,6 +1,7 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.enterprise.domain.SysCarFault; import org.apache.ibatis.annotations.Mapper; @@ -12,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper; * @Description SysCarFaultMapper:故障管理持久层 */ @Mapper -public interface SysCarFaultMapper extends BaseMapper{ +public interface SysCarFaultMapper extends MPJBaseMapper { } 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 20b59ca..276c3ca 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 @@ -113,4 +113,6 @@ public class SysEntController extends BaseController { sysEntService.removeById(entId); return Result.success(null,Constants.SUCCESS_MESSAGE); } + +// @RequestMapping(value = "findId",) } From 517c18f215147aec55160a91ce7a4b5f0bf7172c Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sun, 29 Sep 2024 15:07:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feax:()=E5=88=A0=E9=99=A4fault=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/enterprise/domain/SysCarFault.java | 8 ++++++++ .../java/com/muyu/enterprise/domain/resp/FaultResp.java | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) 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 ed76427..4697cbb 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; @@ -36,6 +37,7 @@ public class SysCarFault extends BaseEntity { * 车辆故障编码 */ @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") + @Excel private String faultCode; /** * 车辆故障类型ID @@ -51,26 +53,31 @@ public class SysCarFault extends BaseEntity { * 故障VIN编码 */ @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") + @Excel private String carVin; /** * 车辆故障标签 */ @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") + @Excel private String faultLabel; /** * 车辆故障位 */ @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") + @Excel private String faultBit; /** * 车辆故障值 */ @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") + @Excel private String faultValue; /** * 故障级别 */ @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") + @Excel private String faultWarn; /** * 报警状态（Y.是，N.否） @@ -81,6 +88,7 @@ public class SysCarFault extends BaseEntity { * 故障描述信息 */ @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") + @Excel private String faultDesc; /** * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) 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 index 39577c9..be667a1 100644 --- 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 @@ -82,15 +82,15 @@ public class FaultResp { * 故障规则名称 */ @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") - private String faultRuleName; + public String faultRuleName; /** * 故障规则参数 */ @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") - private String faultRuleParameter; + public String faultRuleParameter; /** * 故障规则描述 */ @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") - private String faultRuleDescription; + public String faultRuleDescription; } From 0c7795ea717ed7cbaea966ca0e676deb86334ca1 Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Mon, 30 Sep 2024 16:41:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feax:()=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E7=9A=84=E5=BA=93=E5=92=8C=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 1 + .../many/datasource/ManyDataSource.java | 16 ++--- .../constents/DatasourceContent.java | 5 +- .../domain/model/DataSourceInfo.java | 1 + .../factory/DruidDataSourceFactory.java | 1 + .../holder/DynamicDataSourceHolder.java | 1 + .../muyu/enterprise/domain/SysCarFault.java | 7 -- .../cloud-modules-enterprise-server/pom.xml | 8 +++ .../controller/SysCarFaultController.java | 2 +- .../system/controller/SysEntController.java | 12 ++-- .../system/controller/SysUserController.java | 72 ++++++++++++++++++- 11 files changed, 99 insertions(+), 27 deletions(-) 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 9de01cc..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 @@ -136,6 +136,7 @@ public class SysLoginService { if (Result.FAIL == registerResult.getCode()) { throw new ServiceException(registerResult.getMsg()); } + 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/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 4697cbb..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 @@ -37,7 +37,6 @@ public class SysCarFault extends BaseEntity { * 车辆故障编码 */ @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") - @Excel private String faultCode; /** * 车辆故障类型ID @@ -53,31 +52,26 @@ public class SysCarFault extends BaseEntity { * 故障VIN编码 */ @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") - @Excel private String carVin; /** * 车辆故障标签 */ @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") - @Excel private String faultLabel; /** * 车辆故障位 */ @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") - @Excel private String faultBit; /** * 车辆故障值 */ @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") - @Excel private String faultValue; /** * 故障级别 */ @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") - @Excel private String faultWarn; /** * 报警状态（Y.是，N.否） @@ -88,7 +82,6 @@ public class SysCarFault extends BaseEntity { * 故障描述信息 */ @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") - @Excel private String faultDesc; /** * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) 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 100e143..e49e01b 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 @@ -83,6 +83,14 @@ cloud-modules-enterprise-common + + + com.mysql + mysql-connector-j + runtime + + + com.github.yulichang mybatis-plus-join diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index 700eb21..d2bf065 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -40,7 +40,7 @@ public class SysCarFaultController extends BaseController * 查询车辆故障列表 */ @RequestMapping(value = "/list", method = RequestMethod.GET) - public Result> list(@RequestBody SysCarFault sysCarFault) + public Result> list(SysCarFault sysCarFault) { List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); return success(list); 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 276c3ca..75fb6a0 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 @@ -28,7 +28,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping(value = "/ent") -@Tag(name = "SysEntController",description = "企业管理") +@Tag(name = "企业信息",description = "企业管理") public class SysEntController extends BaseController { /** @@ -66,7 +66,7 @@ public class SysEntController extends BaseController { * @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,13 +106,11 @@ 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){ sysEntService.removeById(entId); return Result.success(null,Constants.SUCCESS_MESSAGE); } - -// @RequestMapping(value = "findId",) } 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..7b1f483 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,11 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -32,6 +38,7 @@ import java.util.stream.Collectors; * * @author muyu */ +@Slf4j @RestController @RequestMapping("/user") public class SysUserController extends BaseController { @@ -119,11 +126,17 @@ public class SysUserController extends BaseController { @InnerAuth @PostMapping("/register") public Result register (@RequestBody RegisterBody registerBody) { +// String username = registerBody.getUsername(); String username = registerBody.getUsername(); + 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("当前系统没有开启注册功能！"); } - SysUser sysUser = SysUser.builder().userName(username).build(); +// SysUser sysUser = SysUser.builder().userName(username).build(); if (!userService.checkUserNameUnique(sysUser)) { return Result.error("保存用户'" + username + "'失败，注册账号已存在"); } @@ -151,7 +164,64 @@ 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("创建表成功"); + return Result.success(); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } return Result.success(userService.registerUser(sysUser)); } From 46689d02e182aa033b79cbe208f21a20340298ea Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Fri, 4 Oct 2024 11:09:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feax:()=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=90=8C=E6=97=B6=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=9B=E5=8E=BB=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-modules-enterprise-server/pom.xml | 7 ----- .../controller/CarMessageController.java | 2 +- .../enterprise/mapper/SysCarFaultMapper.java | 3 +-- .../system/controller/SysEntController.java | 26 +++++++++---------- .../system/controller/SysUserController.java | 23 +++++++++++----- 5 files changed, 31 insertions(+), 30 deletions(-) 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 e49e01b..53cbecb 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 @@ -89,13 +89,6 @@ mysql-connector-j runtime - - - - com.github.yulichang - mybatis-plus-join - 1.4.13 - 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 d5bfaff..2b7daf4 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 @@ -33,7 +33,7 @@ public class CarMessageController { @GetMapping("/selectByTemplateId") private Result> selectByTemplateId(@RequestParam("templateId") Integer templateId) { return Result.success(carMessageService.list - (new LambdaQueryWrapper().eq(CarMessage::getTemplateId, templateId))); + (new LambdaQueryWrapper().eq(CarMessage::getTemplateId, templateId))); } } 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 8d570a6..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 @@ -1,7 +1,6 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.github.yulichang.base.MPJBaseMapper; import com.muyu.enterprise.domain.SysCarFault; import org.apache.ibatis.annotations.Mapper; @@ -13,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; * @Description SysCarFaultMapper:故障管理持久层 */ @Mapper -public interface SysCarFaultMapper extends MPJBaseMapper { +public interface SysCarFaultMapper extends BaseMapper { } 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 75fb6a0..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 @@ -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,18 +48,18 @@ 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获取企业信息 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 7b1f483..ed33147 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 @@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.Collection; import java.util.List; import java.util.Set; @@ -126,7 +123,6 @@ public class SysUserController extends BaseController { @InnerAuth @PostMapping("/register") public Result register (@RequestBody RegisterBody registerBody) { -// String username = registerBody.getUsername(); String username = registerBody.getUsername(); SysUser sysUser = new SysUser(); sysUser.setUserName(username); @@ -136,17 +132,16 @@ public class SysUserController extends BaseController { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return Result.error("当前系统没有开启注册功能！"); } -// SysUser sysUser = SysUser.builder().userName(username).build(); 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); @@ -215,6 +210,20 @@ public class SysUserController extends BaseController { //执行建表语句 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(); } } From 3fb0158cfa6b5dd41e3991d167cb55ae8297d2ea Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 5 Oct 2024 20:41:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feax:()=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=90=8C=E6=97=B6=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=9B=E5=8E=BB=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/enterprise/domain/FaultrRule.java | 36 +++++-- .../controller/FaultrRuleController.java | 14 +++ .../enterprise/service/FaultrRuleService.java | 2 + .../service/impl/FaultrRuleServiceImpl.java | 99 ++++++++++++++++++- .../src/main/resources/banner.txt | 2 - 5 files changed, 139 insertions(+), 14 deletions(-) delete mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java index 8d0cb89..a395adc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java @@ -29,18 +29,40 @@ public class FaultrRule 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-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java index 37df64c..c5896bc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java @@ -4,8 +4,10 @@ package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; import com.muyu.enterprise.domain.FaultrRule; import com.muyu.enterprise.service.FaultrRuleService; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -73,5 +75,17 @@ public class FaultrRuleController { return Result.success(); } + /** + * 故障参数匹配检查 + * @param faultrRule + * @return + */ + @PostMapping("/cheakfaults") + @Operation(summary = "故障参数匹配检查",description = "获取报文数据与故障参数进行比较") + public Result cheakfaults(@Validated @RequestBody FaultrRule faultrRule){ + List checkfault = faultrRuleService.checkfault(faultrRule); + return Result.success(checkfault); + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index 22b4898..2865e3e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -14,4 +14,6 @@ public interface FaultrRuleService extends IService { List faultRuleList(FaultrRule faultrRule); FaultrRule byidRuleId(Long faultRuleId); + + List checkfault(FaultrRule faultrRule); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java index 25a56b8..ff739c6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java @@ -3,12 +3,15 @@ package com.muyu.enterprise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.CarType; import com.muyu.enterprise.domain.FaultrRule; import com.muyu.enterprise.mapper.FaultrRuleMapper; import com.muyu.enterprise.service.FaultrRuleService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** * 故障规则业务实现层 @@ -22,11 +25,8 @@ public class FaultrRuleServiceImpl extends ServiceImpl faultRuleList(FaultrRule faultrRule) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) { - queryWrapper.eq(FaultrRule::getFaultRuleName,faultrRule.getFaultRuleName()); - } - if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) { - queryWrapper.eq(FaultrRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter()); + if (StringUtils.isNotEmpty(faultrRule.getRuleParameters())) { + queryWrapper.eq(FaultrRule::getRuleParameters,faultrRule.getRuleParameters()); } return this.list(queryWrapper); } @@ -38,4 +38,93 @@ public class FaultrRuleServiceImpl extends ServiceImpl checkfault(FaultrRule faultrRule) { +// List FaultrRules = new ArrayList<>(); +// //根据车辆VIN判断它属于什么类型的车辆 +// List carInformationList = carInformationMapper.selectList( +// new LambdaQueryWrapper() +// .eq(CarInformation::getCarInformationVIN, faultrRule.getVin())); +// //根据车辆类型，查询表获取对应的类型的故障规则 +// Integer carInformationType = null; +// for (CarInformation carInformation : carInformationList) { +// carInformationType= carInformation.getCarInformationType(); +// } +// +// +// List faultConditionResps = faultConditionMapper.selectJoinList(FaultConditionResp.class, new MPJLambdaWrapper() +// .selectAll(FaultCondition.class) +// .select(CarType::getCarTypeName) +// .select(FaultLabel::getMessageTypeName) +// .select(FaultLabel::getMessageTypeCode) +// .leftJoin(CarType.class, CarType::getCarTypeId, FaultCondition::getCarTypeId) +// .leftJoin(FaultLabel.class, FaultLabel::getMessageTypeId, FaultCondition::getMessageTypeId) +// .eq(FaultCondition::getCarTypeId,carInformationType)); +// //获取当前类的所有字段，不包括继承的 +// Class FaultrRuleClass = FaultrRule.getClass(); +// Field[] declaredFields = FaultrRuleClass.getDeclaredFields(); +// for (Field declaredField : declaredFields) { +// //确保可以访问私有字段 +// declaredField.setAccessible(true); +// try { +// //获取字段的值 +// Object value = declaredField.get(FaultrRule); +// if (value != null && declaredField.get(FaultrRule)!=null) { +// // 遍历faultConditionList，查找匹配的FaultCondition +// for (FaultConditionResp faultCondition : faultConditionResps) { +// if (faultCondition.getMessageTypeCode().equals(declaredField.getName())){ +// String faultconditionIdentification = faultCondition.getFaultconditionIdentification(); +// BigDecimal faultconditionParameter = faultCondition.getFaultconditionParameter(); +// // 尝试将值转换为BigDecimal +// BigDecimal bigDecimalValue = null; +// if (value instanceof Number) { +// Number numberValue = (Number) value; +// if (numberValue instanceof Long || numberValue instanceof Integer) { +// bigDecimalValue = BigDecimal.valueOf(numberValue.longValue()); +// } else if (numberValue instanceof Double || numberValue instanceof Float) { +// // 注意：Double转BigDecimal可能会引入精度问题，因为Double本身可能不精确 +// // 如果需要精确控制，可以考虑从源头使用BigDecimal +// bigDecimalValue = BigDecimal.valueOf(numberValue.doubleValue()); +// } +// } +// +// //判断条件选择 +// if (faultconditionIdentification.equals(">") || faultconditionIdentification.equals(">") ){ +// if (bigDecimalValue.compareTo(faultconditionParameter)>0){ +// FaultrRules.add(new FaultrRule(FaultrRule.getVin(),declaredField.getName()+"超出规定范围")); +// } +// }else if(faultconditionIdentification.equals("<") || faultconditionIdentification.equals("<")){ +// if (bigDecimalValue.compareTo(faultconditionParameter)<0){ +// FaultrRules.add(new FaultrRule(FaultrRule.getVin(),declaredField.getName()+"过低")); +// } +// }else if(faultconditionIdentification.equals(">=") || faultconditionIdentification.equals(">=")){ +// if (bigDecimalValue.compareTo(faultconditionParameter)>=0){ +// FaultrRules.add(new FaultrRule(FaultrRule.getVin(),declaredField.getName()+"超出规定范围")) ; +// } +// }else if(faultconditionIdentification.equals("<=") || faultconditionIdentification.equals("<=")){ +// if (bigDecimalValue.compareTo(faultconditionParameter)<=0){ +// FaultrRules.add(new FaultrRule(FaultrRule.getVin(),declaredField.getName()+"过低")); +// } +// }else { +// if (bigDecimalValue.compareTo(faultconditionParameter)==0){ +// FaultrRules.add(new FaultrRule(FaultrRule.getVin(),declaredField.getName()+"已达到故障点")); +// } +// } +// } +// } +// } +// +// } catch (IllegalAccessException e) { +// e.printStackTrace(); +// } + +// } + return null; + } } diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt b/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} From 94d04e3a3562d09ad6b421c622dff31000ef7481 Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Mon, 7 Oct 2024 20:00:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat():=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/system/controller/SysUserController.java | 1 + 1 file changed, 1 insertion(+) 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 ed33147..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 @@ -195,6 +195,7 @@ public class SysUserController extends BaseController { "remark varchar(32) comment '备注')"; //连接数据库 try { + Connection connection = DriverManager.getConnection(url, name, password); //用于执行编译sql语句的对象 Statement connStatement = connection.createStatement();