Bladeren bron

Merge branch 'v1.0.0' of http://39.106.8.246:3003/apm/energy-alarm-service into v1.0.0

lixing 3 jaren geleden
bovenliggende
commit
6b931ccc83

+ 0 - 1
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/controller/GroupAlarmRuleController.java

@@ -75,7 +75,6 @@ public class GroupAlarmRuleController {
 
     @ApiOperation(value = "更新集团报警规则")
     @PostMapping("/update")
-    @ApiIgnore
     public CommonResult<ApmResponseUpsertVO> updateGroupAlarmRule(
             @Valid @RequestBody UpdateGroupAlarmRuleDTO updateGroupAlarmRuleDTO) {
         groupAlarmRuleService.updateGroupAlarmRule(updateGroupAlarmRuleDTO);

+ 4 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/GroupAlarmRule.java

@@ -24,6 +24,9 @@ public class GroupAlarmRule extends AuditableEntity<GroupAlarmRule> implements S
     
     @ApiModelProperty("报警条目编码")
     private String alarmItemCode;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmItemName;
     
     @ApiModelProperty("报警条件id")
     private String alarmConditionId;
@@ -31,6 +34,7 @@ public class GroupAlarmRule extends AuditableEntity<GroupAlarmRule> implements S
 
     public static String PROP_GROUP_ID = "group_id";
     public static String PROP_ALARM_ITEM_CODE = "alarm_item_code";
+    public static String PROP_ALARM_ITEM_NAME = "alarm_item_name";
     public static String PROP_ALARM_CONDITION_ID = "alarm_condition_id";
 
 }

+ 6 - 2
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/dto/AddGroupAlarmRuleDTO.java

@@ -20,10 +20,14 @@ public class AddGroupAlarmRuleDTO {
     @NotNull(message = "分组id不能为空") // todo 更新校验规则
     private String groupId;
     
-    @ApiModelProperty(value = "报警条目编码", required = true)
-    @NotNull(message = "报警条目编码不能为空") // todo 更新校验规则
+    @ApiModelProperty(value = "报警类型编码", required = true)
+    @NotNull(message = "报警类型编码不能为空") // todo 更新校验规则
     private String alarmItemCode;
 
+    @ApiModelProperty(value = "报警类型名称", required = true)
+    @NotNull(message = "报警类型名称不能为空") // todo 更新校验规则
+    private String alarmItemName;
+
     @ApiModelProperty(value = "报警规则", required = true)
     @NotNull(message = "报警规则不能为空") // todo 更新校验规则
     private AddAlarmConditionDTO alarmCondition;

+ 6 - 6
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/dto/PageQueryGroupAlarmRuleDTO.java

@@ -15,19 +15,19 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel(value = "分页查询集团报警规则入参")
 public class PageQueryGroupAlarmRuleDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
+//    @ApiModelProperty(value = "主键", required = true)
+//    private String id;
     
     @ApiModelProperty(value = "分组id", required = true)
     private String groupId;
     
-    @ApiModelProperty(value = "报警条目编码", required = true)
-    private String alarmItemCode;
+//    @ApiModelProperty(value = "报警条目编码", required = true)
+//    private String alarmItemCode;
 
     @ApiModelProperty(value = "报警类型名称", required = true)
     private String alarmItemName;
     
-    @ApiModelProperty(value = "报警条件id", required = true)
-    private String alarmConditionId;
+//    @ApiModelProperty(value = "报警条件id", required = true)
+//    private String alarmConditionId;
     
 }

+ 10 - 9
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/service/impl/GroupAlarmRuleServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -82,8 +83,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
             addAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
             AlarmCondition condition = new AlarmCondition();
             condition.setTrigger((String) conditionMap.get("backend"));
-            String infoCode = (String) conditionMap.get("infoCode");
-            List<String> infoCodeList = (List<String>) JSONArray.parse(infoCode);
+            List<String> infoCodeList = (List<String>) conditionMap.get("infoCode");
             condition.setInfoCode(infoCodeList);
             condition.setTriggerUphold(alarmCondition.getTriggerUphold());
             condition.setRules((List<String>) conditionMap.get("conditionMap"));
@@ -108,6 +108,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
      */
     private void setDefaultValue(GroupAlarmRule groupAlarmRule) {
         groupAlarmRule.setCreator(PoemsContext.getContext().getUserId());
+        groupAlarmRule.setTs(new Timestamp(System.currentTimeMillis()));
     }
 
     /**
@@ -237,18 +238,18 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
 
         // todo 需判断使用like还是eq
         if (StringUtils.isNotEmpty(pageQueryGroupAlarmRuleDTO.getGroupId())) {
-            queryWrapper.like(GroupAlarmRule.PROP_GROUP_ID, pageQueryGroupAlarmRuleDTO.getGroupId());
+            queryWrapper.eq(GroupAlarmRule.PROP_GROUP_ID, pageQueryGroupAlarmRuleDTO.getGroupId());
         }
 
         // todo 需判断使用like还是eq
-        if (StringUtils.isNotEmpty(pageQueryGroupAlarmRuleDTO.getAlarmItemCode())) {
-            queryWrapper.like(GroupAlarmRule.PROP_ALARM_ITEM_CODE, pageQueryGroupAlarmRuleDTO.getAlarmItemCode());
+        if (StringUtils.isNotEmpty(pageQueryGroupAlarmRuleDTO.getAlarmItemName())) {
+            queryWrapper.like(GroupAlarmRule.PROP_ALARM_ITEM_NAME, pageQueryGroupAlarmRuleDTO.getAlarmItemName());
         }
 
-        // todo 需判断使用like还是eq
-        if (StringUtils.isNotEmpty(pageQueryGroupAlarmRuleDTO.getAlarmConditionId())) {
-            queryWrapper.like(GroupAlarmRule.PROP_ALARM_CONDITION_ID, pageQueryGroupAlarmRuleDTO.getAlarmConditionId());
-        }
+//        // todo 需判断使用like还是eq
+//        if (StringUtils.isNotEmpty(pageQueryGroupAlarmRuleDTO.getAlarmConditionId())) {
+//            queryWrapper.like(GroupAlarmRule.PROP_ALARM_CONDITION_ID, pageQueryGroupAlarmRuleDTO.getAlarmConditionId());
+//        }
 
         return getBaseMapper().selectPage(pageParam, queryWrapper);
     }

+ 3 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/model/equip/dto/GroupManagementDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @author 易涛
@@ -31,10 +32,10 @@ public class GroupManagementDTO{
     private String condition;
 
     @ApiModelProperty(value = "当前页",required = true)
-    @NotBlank(message = "当前页必传")
+    @NotNull(message = "当前页必传")
     private Integer current;
 
     @ApiModelProperty(value = "每页条数",required = true)
-    @NotBlank(message = "每页条数必传")
+    @NotNull(message = "每页条数必传")
     private Integer size;
 }

+ 0 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/service/impl/AlarmConditionServiceImpl.java

@@ -50,7 +50,6 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
     public Map<String, Object> createAlarmCondition(AddAlarmConditionDTO addAlarmConditionDTO) {
         AlarmCondition alarmCondition = ConvertAlarmConditionTool.INSTANCE.convertAddDto2Entity(addAlarmConditionDTO);
         List<List<CalculateMethodDTO>> frontend = addAlarmConditionDTO.getFrontend();
-        Object json = JSON.toJSON(frontend);
         alarmCondition.setFrontend(frontend);
         //将前端公式转换成后台公式
         Map<String, Object> stringMap = frontend2Backend(frontend);

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -352,7 +352,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
 
     @Override
     public List<ProjectVO> getProject() {
-        InputStream inputStream = ProjectAlarmRuleServiceImpl.class.getClassLoader()
+        InputStream inputStream = ProjectAlarmRuleServiceImpl.class
                 .getResourceAsStream(File.separator + "json" + File.separator + "Project.json");
         if (inputStream == null) {
             return null;

+ 6 - 8
src/main/resources/mapper/GroupAlarmRuleMapper.xml

@@ -10,7 +10,7 @@
         <result column="creation_time" property="creationTime"/>
         <result column="modifier" property="modifier"/>
         <result column="modified_time" property="modifiedTime"/>
-        <result column="name" property="alarmItemName"/>
+        <result column="alarm_item_name" property="alarmItemName"/>
         <collection property="alarmCondition"
                     ofType="com.persagy.apm.alarmservice.project.alarmcondition.model.vo.AlarmConditionListItemVO">
             <result column="cid" property="id"/>
@@ -28,7 +28,7 @@
         select a.id,
         a.group_id,
         a.alarm_item_code,
-        c.name
+        a.alarm_item_name,
         a.creator,
         a.creation_time,
         a.modifier,
@@ -41,10 +41,9 @@
         b.alarm_level
         from group_alarm_rule a
         left join alarm_condition b on a.alarm_condition_id = b.id
-        left join monitor_indicator c on a.alarm_item_code = c.id
         where a.group_id = #{groupId}
-        <if test="alarmItemName != null">
-            and c.name = #{alarmItemName}
+        <if test="alarmItemName != null and alarmItemName != ''">
+            and a.alarm_item_name = #{alarmItemName}
         </if>
         order by a.creation_time
         limit #{startIndex},#{size}
@@ -53,10 +52,9 @@
         select count(*)
         from group_alarm_rule a
         left join alarm_condition b on a.alarm_condition_id = b.id
-        left join monitor_indicator c on a.alarm_item_code = c.id
         where a.group_id = #{groupId}
-        <if test="alarmItemName != null">
-            and c.name = #{alarmItemName}
+        <if test="alarmItemName != null and alarmItemName != ''">
+            and a.alarm_item_name = #{alarmItemName}
         </if>
     </select>
 </mapper>