xiu

server/src/main/java/com/pica/cloud/clickhouse/clickhouse/server/controller/CrashController.java

@@ -126,40 +126,38 @@ public class CrashController extends BaseController {
         sql = sql + end ;
         sql = sql +   "' order by created desc ";
         List<com.alibaba.fastjson.JSONObject> list = clickHouseService.query(sql, TableEnum.traceappp);
+        List<com.alibaba.fastjson.JSONObject> res = new ArrayList<>();
         List<com.alibaba.fastjson.JSONObject> extra = new ArrayList<>();
         for (JSONObject jsonObject:
              list) {
             String webData = jsonObject.get("web_data")==null ? "" : jsonObject.get("web_data").toString() ;
             if(StringUtil.isNotNull(webData)){
                 String[] vlues = webData.split(";");
+                int cnt = 0 ;
                 for (String v: vlues) {
                     String[] vs = v.split("=" );
                     if(vs.length>1){
-                        if(vs[0].equals("audioId") && ( "0".equals(vs[1]) || "".equals(vs[1])) ){
-                            extra.add(jsonObject);
+                        if(vs[0].equals("audioId") && (  !("0".equals(vs[1]) || "".equals(vs[1] ) )  ) ){
+                            cnt = cnt + 1;
                         }
-                        if(vs[0].equals("audioStatus") && ( !"1".equals(vs[1]) ) ){
-                            extra.add(jsonObject);
+                        if(vs[0].equals("audioStatus") && ( "1".equals(vs[1]) ) ){
+                            cnt = cnt + 1;
                         }
                     }
-                    if (vs.length==1){
-                        if(vs[0].equals("audioId")  ){
-                            extra.add(jsonObject);
-                        }
+                }
 
-                        if(vs[0].equals("audioStatus")  ){
-                            extra.add(jsonObject);
-                        }
-                    }
+                if ( cnt == 2 ){
+                    res.add(jsonObject);
                 }
+
+
             }
         }
-        list.removeAll(extra);
-        return builder.setData(list).build();
+        return builder.setData(res).build();
     }
 
     public static void main(String[] args){
-        String value ="eduComId=1;doctorId=101322314;pathParam=doctorId=101322314&patientId=&smsId=710947&eduComId=1&batchNo=10-0dd80ebfd3ca41f5b1abba398b2348ff&templetType=healthNotice&type=3&audioId=10370&code=011w6XGe2WYT6I0yqgJe2vcfHe2w6XGV&state=;templetType=healthNotice;smsEntityId=710947;batchNo=10-0dd80ebfd3ca41f5b1abba398b2348ff;audioId=1;type=3;audioStatus=1;";
+        String value ="eduComId=1;doctorId=101322314;pathParam=doctorId=101322314&patientId=&smsId=710947&eduComId=1&batchNo=10-0dd80ebfd3ca41f5b1abba398b2348ff&templetType=healthNotice&type=3&audioId=10370&code=011w6XGe2WYT6I0yqgJe2vcfHe2w6XGV&state=;templetType=healthNotice;smsEntityId=710947;batchNo=10-0dd80ebfd3ca41f5b1abba398b2348ff;audioId=1;type=3;audioStatus=null;";
         String[] vlues = value.split(";");
         for (String v: vlues) {
             String[] vs = v.split("=" );