Bladeren bron

修改集团报警

xujiaheng 3 jaren geleden
bovenliggende
commit
7383ea0241

+ 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);

+ 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;

+ 1 - 1
src/main/resources/mapper/GroupAlarmRuleMapper.xml

@@ -28,7 +28,7 @@
         select a.id,
         a.group_id,
         a.alarm_item_code,
-        c.name
+        c.name,
         a.creator,
         a.creation_time,
         a.modifier,