From cdd18d947d010e16d30460597dd0611ec023488e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=A8=E5=93=80?= <2076029107@qq.com> Date: Wed, 9 Oct 2024 19:46:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:()=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 8 ++- .../main/java/com/muyu/domain/FirmUser.java | 50 +++++++++++-------- .../listener/WarnRuleRespListener.java | 24 +++++++++ 3 files changed, 61 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 771c2c0..c6aff5b 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 @@ -25,6 +25,12 @@ import org.springframework.stereotype.Component; */ @Component public class SysLoginService { + + /** + * 登录验证 + */ + private static final Long LOGIN_SUCCESS = 1L; + @Autowired private RemoteUserService remoteUserService; @@ -69,7 +75,7 @@ public class SysLoginService { Result userResult = null; - if (firmId == 1){ + if (firmId == LOGIN_SUCCESS){ userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); }else { userResult = remoteUserService.getFirmUserInfo(username, firmId,SecurityConstants.INNER); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmUser.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmUser.java index 711a751..1bb59db 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmUser.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmUser.java @@ -16,6 +16,7 @@ import lombok.experimental.SuperBuilder; import java.util.Date; /** + * 企业用户 * @Author：杨鹏 * @Package：com.muyu.domain * @Project：cloud-vehicle @@ -103,6 +104,10 @@ public class FirmUser extends BaseEntity { @Schema(name = "最后登录时间") private Date loginDate; + /** + * 构建FirmUser + * @param sysUser sysUser + */ public static FirmUser builderFirmUser(SysUser sysUser) { return FirmUser.builder() .userId(sysUser.getUserId()) @@ -126,27 +131,32 @@ public class FirmUser extends BaseEntity { .remark(sysUser.getRemark()) .build(); } - public static SysUser builderSysUser(FirmUser sysUser) { + + /** + * 转换为SysUser + * @param firmUser sysUser + */ + public static SysUser builderSysUser(FirmUser firmUser) { return SysUser.builder() - .userId(sysUser.getUserId()) - .deptId(sysUser.getDeptId()) - .userName(sysUser.getUserName()) - .userType(sysUser.getUserType()) - .nickName(sysUser.getNickName()) - .email(sysUser.getEmail()) - .phonenumber(sysUser.getPhonenumber()) - .sex(sysUser.getSex()) - .avatar(sysUser.getAvatar()) - .password(sysUser.getPassword()) - .status(sysUser.getStatus()) - .delFlag(sysUser.getDelFlag()) - .loginIp(sysUser.getLoginIp()) - .loginDate(sysUser.getLoginDate()) - .createBy(sysUser.getCreateBy()) - .createTime(sysUser.getCreateTime()) - .updateBy(sysUser.getUpdateBy()) - .updateTime(sysUser.getUpdateTime()) - .remark(sysUser.getRemark()) + .userId(firmUser.getUserId()) + .deptId(firmUser.getDeptId()) + .userName(firmUser.getUserName()) + .userType(firmUser.getUserType()) + .nickName(firmUser.getNickName()) + .email(firmUser.getEmail()) + .phonenumber(firmUser.getPhonenumber()) + .sex(firmUser.getSex()) + .avatar(firmUser.getAvatar()) + .password(firmUser.getPassword()) + .status(firmUser.getStatus()) + .delFlag(firmUser.getDelFlag()) + .loginIp(firmUser.getLoginIp()) + .loginDate(firmUser.getLoginDate()) + .createBy(firmUser.getCreateBy()) + .createTime(firmUser.getCreateTime()) + .updateBy(firmUser.getUpdateBy()) + .updateTime(firmUser.getUpdateTime()) + .remark(firmUser.getRemark()) .build(); } } diff --git a/cloud-modules/cloud-modules-processing/src/main/java/com/muyu/processing/listener/WarnRuleRespListener.java b/cloud-modules/cloud-modules-processing/src/main/java/com/muyu/processing/listener/WarnRuleRespListener.java index 2e0dbef..fe76c43 100644 --- a/cloud-modules/cloud-modules-processing/src/main/java/com/muyu/processing/listener/WarnRuleRespListener.java +++ b/cloud-modules/cloud-modules-processing/src/main/java/com/muyu/processing/listener/WarnRuleRespListener.java @@ -1,6 +1,7 @@ package com.muyu.processing.listener; import com.alibaba.fastjson.JSONObject; +import com.muyu.domain.WarnRule; import com.muyu.domain.resp.WarnRuleResp; import com.muyu.processing.basic.EventCustom; import com.muyu.processing.basic.EventListener; @@ -9,6 +10,7 @@ import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -23,6 +25,16 @@ import java.util.Map; @Component public class WarnRuleRespListener implements EventListener { + /** + * 最大值 + */ + private static final Integer MAX_VALUE = 100; + + /** + * 最小值 + */ + private static final Integer MIN_VALUE = 20; + @Resource private CacheUtil cacheUtil; @@ -39,7 +51,19 @@ public class WarnRuleRespListener implements EventListener { Map map = (Map) cacheUtil.get(vin); if (map != null){ log.info("本地缓存数据为: {}",map); + // 获得警告规矩集合 WarnRuleResp warnRuleResp = (WarnRuleResp) map.get("warnRuleResp"); + // 获得预警规则 + List warnRuleList = warnRuleResp.getWarnRuleList(); + // 遍历预警规则 + for (WarnRule warnRule : warnRuleList) { + String ruleName = warnRule.getRuleName(); + Integer maxValue = warnRule.getMaxValue(); + Integer minValue = warnRule.getMinValue(); + if (maxValue >= MAX_VALUE || minValue <= MIN_VALUE){ + + } + } } }