xiu

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

@@ -126,17 +126,65 @@ 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 audioId = jsonObject.get("audioId")==null ? "0": jsonObject.get("audioId").toString() ;
-            String audioStatus = jsonObject.get("audioStatus") == null ? "0" : jsonObject.get("audioStatus").toString();
-            if( ( !StringUtil.equals(audioId,"0") ) && StringUtil.equals(audioStatus,"1") ){
-                res.add(jsonObject);
+            String webData = jsonObject.get("web_data")==null ? "" : jsonObject.get("web_data").toString() ;
+            if(StringUtil.isNotNull(webData)){
+                String[] vlues = webData.split(";");
+                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("audioStatus") && ( !"1".equals(vs[1]) ) ){
+                            extra.add(jsonObject);
+                        }
+                    }
+                    if (vs.length==1){
+                        if(vs[0].equals("audioId")  ){
+                            extra.add(jsonObject);
+                        }
+
+                        if(vs[0].equals("audioStatus")  ){
+                            extra.add(jsonObject);
+                        }
+                    }
+                }
+            }
+        }
+        list.removeAll(extra);
+        return builder.setData(list).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[] vlues = value.split(";");
+        for (String v: vlues) {
+            String[] vs = v.split("=" );
+            if(vs.length>1){
+                if(vs[0].equals("audioId") && ( "0".equals(vs[1]) || "".equals(vs[1])) ){
+                    //去掉
+                    System.out.println("2去掉audioId");
+                }
+                if(vs[0].equals("audioStatus") && ( !"1".equals(vs[1]) ) ){
+                    //去掉
+                    System.out.println("2去掉audioStatus");
+                }
+            }
+            if (vs.length==1){
+                if(vs[0].equals("audioId")  ){
+                    //去掉
+                    System.out.println("1去掉audioId ");
+                }
+                if(vs[0].equals("audioStatus")  ){
+                    //去掉
+                    System.out.println("1去掉audioStatus");
+                }
             }
         }
 
-        return builder.setData(res).build();
     }