搜索改为一个接口

src/main/java/com/yingxin/prms/api/ReliabilityApi.java

@@ -55,10 +55,6 @@ public class ReliabilityApi {
         return map;
     }
 
-    @PostMapping("getAlarmLog")
-    public Map<String, Object> getAlarmLog(@RequestBody String json) {
-        return manager.getAlarmLog(json);
-    }
     @PostMapping("getAlarmMsg")
     public Map<String, Object> getAlarmMsg() {
         return manager.getAlarmMsg();

src/main/java/com/yingxin/prms/service/business/Manager.java

@@ -625,13 +625,13 @@ public class Manager {
         JSONObject jsonObject  = JSONObject.fromObject(json);
         int pageNum = jsonObject.getInt("pageNum");
         int pageSize = jsonObject.getInt("pageSize");
-
-        List<AlarmLog> logList = cassandraDao.getAlarmLogList();
-        long flag = System.currentTimeMillis();
-        if(jsonObject.containsKey("start")&&jsonObject.containsKey("ip")){
         String ip = jsonObject.getString("ip");
         String start = jsonObject.getString("start");
         String end = jsonObject.getString("end");
+        List<AlarmLog> logList = cassandraDao.getAlarmLogList();
+        long flag = System.currentTimeMillis();
+        if((!start.isEmpty())&&(!ip.isEmpty())){
+
             Map total = cassandraDao.getAlarmLogSize(ip,start,end);
             List<AlarmLog> alarmList = null;
             int i = 0;
@@ -646,9 +646,7 @@ public class Manager {
             }while(i<pageNum);
             map.put("log",alarmList);
             map.put("logSize",total.get("count"));
-        }else if(jsonObject.containsKey("start")){
-            String start = jsonObject.getString("start");
-            String end = jsonObject.getString("end");
+        }else if(!start.isEmpty()){
             Map total = cassandraDao.getAlarmLogSize(start,end);
             List<AlarmLog> alarmList = null;
             int i = 0;
@@ -664,8 +662,7 @@ public class Manager {
             map.put("log",alarmList);
             map.put("logSize",total.get("count"));
 
-        }else if(jsonObject.containsKey("ip")){
-            String ip = jsonObject.getString("ip");
+        }else if(!ip.isEmpty()){
             List<AlarmLog> alarmList = null;
             Map total = cassandraDao.getAlarmLogSize(ip);
             int i = 0;