feat:() 优化

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<LoginUser> userResult = null;
 
-        if (firmId == 1){
+        if (firmId == LOGIN_SUCCESS){
             userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
         }else {
             userResult = remoteUserService.getFirmUserInfo(username, firmId,SecurityConstants.INNER);

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())
+                .userId(firmUser.getUserId())
-                .deptId(sysUser.getDeptId())
+                .deptId(firmUser.getDeptId())
-                .userName(sysUser.getUserName())
+                .userName(firmUser.getUserName())
-                .userType(sysUser.getUserType())
+                .userType(firmUser.getUserType())
-                .nickName(sysUser.getNickName())
+                .nickName(firmUser.getNickName())
-                .email(sysUser.getEmail())
+                .email(firmUser.getEmail())
-                .phonenumber(sysUser.getPhonenumber())
+                .phonenumber(firmUser.getPhonenumber())
-                .sex(sysUser.getSex())
+                .sex(firmUser.getSex())
-                .avatar(sysUser.getAvatar())
+                .avatar(firmUser.getAvatar())
-                .password(sysUser.getPassword())
+                .password(firmUser.getPassword())
-                .status(sysUser.getStatus())
+                .status(firmUser.getStatus())
-                .delFlag(sysUser.getDelFlag())
+                .delFlag(firmUser.getDelFlag())
-                .loginIp(sysUser.getLoginIp())
+                .loginIp(firmUser.getLoginIp())
-                .loginDate(sysUser.getLoginDate())
+                .loginDate(firmUser.getLoginDate())
-                .createBy(sysUser.getCreateBy())
+                .createBy(firmUser.getCreateBy())
-                .createTime(sysUser.getCreateTime())
+                .createTime(firmUser.getCreateTime())
-                .updateBy(sysUser.getUpdateBy())
+                .updateBy(firmUser.getUpdateBy())
-                .updateTime(sysUser.getUpdateTime())
+                .updateTime(firmUser.getUpdateTime())
-                .remark(sysUser.getRemark())
+                .remark(firmUser.getRemark())
                 .build();
     }
 }

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<String, Object> map = (Map<String, Object>) cacheUtil.get(vin);
         if (map != null){
             log.info("本地缓存数据为: {}",map);
+            // 获得警告规矩集合
             WarnRuleResp warnRuleResp = (WarnRuleResp) map.get("warnRuleResp");
+            // 获得预警规则
+            List<WarnRule> 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){
+
+                }
+            }
         }
     }