Prechádzať zdrojové kódy

只查询valid=1的设备

lixing 3 rokov pred
rodič
commit
f977bffbbd

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

@@ -123,6 +123,7 @@ public class DmpRwdServiceImpl {
     public List<EquipItem> queryObjList(UrlParamDTO urlParamDTO, QueryEquipDTO queryEquipDTO) {
         JSONObject queryObject = new JSONObject();
         JSONObject criteria = new JSONObject();
+        criteria.put("valid", 1);
         String condition = queryEquipDTO.getCondition();
         if (StringUtils.isNotBlank(condition)) {
             condition = "{" + condition + "}";

+ 13 - 12
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -387,18 +387,19 @@ public class AlarmRecordController {
 
     @PostMapping("/test")
     public void test() {
-        AddAlarmRecordDTO addAlarmRecordDTO = new AddAlarmRecordDTO();
-        addAlarmRecordDTO.setId("1234");
-        addAlarmRecordDTO.setTriggerTime(new Date());
-        addAlarmRecordDTO.setObjId("123");
-        addAlarmRecordDTO.setName("test");
-        addAlarmRecordDTO.setItemCode("123");
-        addAlarmRecordDTO.setLevel("1");
-        try {
-            alarmRecordService.create(addAlarmRecordDTO);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        groupManagementService.getEquipList(null, "ACCCOT");
+//        AddAlarmRecordDTO addAlarmRecordDTO = new AddAlarmRecordDTO();
+//        addAlarmRecordDTO.setId("1234");
+//        addAlarmRecordDTO.setTriggerTime(new Date());
+//        addAlarmRecordDTO.setObjId("123");
+//        addAlarmRecordDTO.setName("test");
+//        addAlarmRecordDTO.setItemCode("123");
+//        addAlarmRecordDTO.setLevel("1");
+//        try {
+//            alarmRecordService.create(addAlarmRecordDTO);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 }
 

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

@@ -31,6 +31,4 @@ public class QueryEquipDTO {
     @ApiModelProperty(value = "查询条件",required = true)
     @NotBlank(message = "查询条件必传")
     private String condition;
-
-    private int valid = 1;
 }