Merge remote-tracking branch 'origin/master'

jetlinks · Nov 28, 2023 · eb2dabe · eb2dabe
2 parents acf38bc + 6203f48
commit eb2dabe
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/...ntication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java b/...ntication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java
@@ -12,11 +12,14 @@
 import org.hswebframework.web.authorization.annotation.SaveAction;
 import org.hswebframework.web.authorization.exception.UnAuthorizedException;
 import org.jetlinks.community.auth.entity.UserDetail;
+import org.jetlinks.community.auth.enums.UserEntityType;
+import org.jetlinks.community.auth.enums.UserEntityTypes;
 import org.jetlinks.community.auth.service.UserDetailService;
 import org.jetlinks.community.auth.service.request.SaveUserDetailRequest;
 import org.jetlinks.community.auth.service.request.SaveUserRequest;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @RestController
@@ -99,4 +102,11 @@ public Mono<Void> saveUserDetail(@RequestBody Mono<SaveUserDetailRequest> reques
             .flatMap(tp2 -> userDetailService.saveUserDetail(tp2.getT1().getUser().getId(), tp2.getT2()));
     }
 
+    @GetMapping("/types")
+    @Operation(summary = "获取所有用户类型")
+    @Authorize(merge = false)
+    public Flux<UserEntityType> getUserEntityTypes() {
+        return Flux.fromIterable(UserEntityTypes.getAllType());
+    }
+
 }
diff --git a/...engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java b/...engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java
@@ -9,6 +9,7 @@ interface ConfigKey {
         String alarmName = "alarmName";
         String level = "level";
         String ownerId = "ownerId";
+        String description = "description";
         String state = "state";
         String alarmTime = "alarmTime";
         String lastAlarmTime = "lastAlarmTime";

diff --git a/...gine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java b/...gine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java
@@ -55,6 +55,9 @@ class Result {
         @Schema(description = "告警名称")
         private String alarmName;
 
+        @Schema(description = "告警说明")
+        private String description;
+
         @Schema(description = "是否重复告警")
         private boolean alarming;
 

diff --git a/...nager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java b/...nager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java
@@ -64,7 +64,8 @@ public class DefaultAlarmRuleHandler implements AlarmRuleHandler, CommandLineRun
             AlarmConstants.ConfigKey.level,
             AlarmConstants.ConfigKey.targetType,
             AlarmConstants.ConfigKey.state,
-            AlarmConstants.ConfigKey.ownerId
+            AlarmConstants.ConfigKey.ownerId,
+            AlarmConstants.ConfigKey.description
         ));
 
     private final Map<Tuple2<String, Integer>, Set<String>> ruleAlarmBinds = new ConcurrentHashMap<>();
@@ -159,6 +160,7 @@ private AlarmRecordEntity ofRecord(Result result) {
         entity.setSourceId(result.getSourceId());
 
         entity.setAlarmName(result.getAlarmName());
+        entity.setDescription(result.getDescription());
         entity.generateId();
         return entity;
     }
@@ -280,6 +282,7 @@ private AlarmHistoryInfo createHistory(AlarmRecordEntity record, AlarmInfo alarm
         info.setId(IDGenerator.RANDOM.generate());
         info.setAlarmConfigId(record.getAlarmConfigId());
         info.setAlarmConfigName(record.getAlarmName());
+        info.setDescription(record.getDescription());
         info.setAlarmRecordId(record.getId());
         info.setLevel(record.getLevel());
         info.setAlarmTime(record.getAlarmTime());

diff --git a/...gine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java b/...gine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java
@@ -21,7 +21,7 @@ public String getName() {
     @Override
     public Flux<AlarmTargetInfo> convert(AlarmData data) {
         return Flux.just(AlarmTargetInfo
-                             .of(data.getAlarmConfigId(),
+                             .of(data.getRuleId(),
                                  data.getRuleName(),
                                  getType()));
     }

diff --git a/...ne-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java b/...ne-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java
@@ -105,7 +105,7 @@ public Map<String, Object> toConfigMap() {
         configs.put(AlarmConstants.ConfigKey.ownerId, getModifierId() == null ? getCreatorId() : getModifierId());
         configs.put(AlarmConstants.ConfigKey.targetType, getTargetType());
         configs.put(AlarmConstants.ConfigKey.state, getState().name());
-
+        configs.put(AlarmConstants.ConfigKey.description, getDescription());
         return configs;
     }
 }
diff --git a/jetlinks-standalone/src/main/resources/hsweb-starter.js b/jetlinks-standalone/src/main/resources/hsweb-starter.js
@@ -13,7 +13,8 @@ var users = [{
     "password": "104ffe90cd840e08f7a79c7fddbe1699",
     "salt": "LmKOhcoB",
     "status":1,
-    "name": "超级管理员"
+    "name": "超级管理员",
+    "type":"admin"
 }];
 //版本更新信息
 var versions = [
@@ -49,4 +50,4 @@ dependency.setup(info)
     })
     .onUninstall(function (context) { //卸载时执行
 
-    }).onInitialize(initialize);
+    }).onInitialize(initialize);
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <r2dbc.version>Borca-SR2</r2dbc.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>
         <netty.version>4.1.97.Final</netty.version>
-        <elasticsearch.version>7.17.13</elasticsearch.version>
+        <elasticsearch.version>7.17.14</elasticsearch.version>
         <californium.version>3.7.0</californium.version>
         <fastjson.version>1.2.83</fastjson.version>
         <reactor.version>2020.0.31</reactor.version>