Browse Source

修复根据设备名称查询设备的bug

lixing 3 years ago
parent
commit
502255812c

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/dependency/rwd/service/DmpRwdServiceImpl.java

@@ -135,7 +135,7 @@ public class DmpRwdServiceImpl {
         /* 设备名称模糊查询 */
         if (StringUtils.isNotBlank(queryEquipDTO.getLocalName())) {
             JSONObject localNameObj = new JSONObject();
-            localNameObj.put("$like", queryEquipDTO.getLocalName());
+            localNameObj.put("$like", "%"+queryEquipDTO.getLocalName()+"%");
             criteria.put("localName", localNameObj);
         }
 

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

@@ -308,6 +308,7 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
             Map<String, Object> stringMap = frontend2Backend(frontend);
             alarmCondition.setTriggerBackend((String) stringMap.get("backend"));
             alarmCondition.setInfoCodes((List<String>) stringMap.get("infoCode"));
+            alarmCondition.setTriggerRules((List<String>) stringMap.get("displayFormula"));
         }
         updateAndSendMsg2MQ(alarmCondition);
     }

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

@@ -14,6 +14,7 @@ import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleServi
 import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
 import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
 import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
+import com.persagy.apm.alarmservice.project.alarmcondition.model.AlarmCondition;
 import com.persagy.apm.alarmservice.project.alarmcondition.model.ConvertAlarmConditionTool;
 import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.AddAlarmConditionDTO;
 import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.UpdateAlarmConditionDTO;
@@ -21,7 +22,10 @@ import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditi
 import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
 import com.persagy.apm.alarmservice.project.alarmrule.model.ConvertProjectAlarmRuleTool;
 import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
-import com.persagy.apm.alarmservice.project.alarmrule.model.dto.*;
+import com.persagy.apm.alarmservice.project.alarmrule.model.dto.AddProjectAlarmRuleDTO;
+import com.persagy.apm.alarmservice.project.alarmrule.model.dto.PageQueryProjectAlarmRuleDTO;
+import com.persagy.apm.alarmservice.project.alarmrule.model.dto.QueryProjectAlarmRuleDTO;
+import com.persagy.apm.alarmservice.project.alarmrule.model.dto.UpdateProjectAlarmRuleDTO;
 import com.persagy.apm.alarmservice.project.alarmrule.model.vo.ProjectAlarmRuleListItemVO;
 import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
 import com.persagy.apm.alarmservice.project.alarmruleobjrel.dao.ProjectAlarmRuleObjRelMapper;
@@ -197,8 +201,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         int belongNew = updateProjectAlarmRuleDTO.getBelong();
         if (belongOld > belongNew) {//集团规则->项目自定义规则
             //新增规则
-            com.persagy.apm.alarmservice.project.alarmcondition.model.AlarmCondition condition =
-                    (com.persagy.apm.alarmservice.project.alarmcondition.model.AlarmCondition) conditionMap.get("alarmCondition");
+            AlarmCondition condition = (AlarmCondition) conditionMap.get("alarmCondition");
             String uuid = DataUtils.getUUID();
             condition.setId(uuid);
             alarmConditionService.saveCondition(condition);
@@ -562,7 +565,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
     //    }
 
     @Override
-    public void deleteBatchByGroupRule(GroupAlarmRule groupAlarmRule) throws Exception{
+    public void deleteBatchByGroupRule(GroupAlarmRule groupAlarmRule) throws Exception {
         QueryWrapper<ProjectAlarmRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectAlarmRule.PROP_GROUP_ID, groupAlarmRule.getGroupId());
         queryWrapper.eq(ProjectAlarmRule.PROP_ALARM_ITEM_CODE, groupAlarmRule.getAlarmItemCode());