xiu

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

@@ -41,12 +41,30 @@ public class CrashController extends BaseController {
 
     @ApiOperation(value = "init data", response = PicaResponse.class)
     @RequestMapping(value = "/init",method = RequestMethod.GET)
-    public PicaResponse init(){
+    public PicaResponse init(@RequestParam(name = "begin", required = true) String begin,@RequestParam(name = "end", required = true) String end){
         PicaResponse.Builder builder =  new PicaResponse.Builder();
-        String sql ="select distinct pseudo_id,doctor_id,web_data,view_path,class_name,pseudo_session,action,created from trace_app where action='ACTION_WEB_ENTER' and class_name like '%healthNotice%' and web_data like '%eduComId%' order by created desc ";
+        if(StringUtil.isEmpty(begin) || StringUtil.isEmpty(end)){
+            return builder.setData(null).setCode(PicaResultCode.PARAM_IS_BLANK.code()).setMessage(PicaResultCode.PARAM_IS_BLANK.message()).build();
+        }
+        if(  StringUtil.isNotNull(begin) &&  StringUtil.isNotNull(end) ){
+            if( begin.length()!=10 || ( !begin.contains("-")) || end.length()!=10 || ( !end.contains("-")) ){
+                return builder.setData(null).setCode(PicaResultCode.PARAM_IS_INVALID.code()).setMessage(PicaResultCode.PARAM_IS_INVALID.message()+",please use like '2019-05-03' ").build();
+            }
+        }
+        String sql ="select distinct pseudo_id,doctor_id,web_data,view_path,class_name,pseudo_session,action,created from trace_app where action='ACTION_WEB_ENTER' and class_name like '%healthNotice%' and web_data like '%eduComId%' " ;
+        sql = sql + " and  created_day >= '";
+        sql = sql + begin ;
+        sql = sql + "' and  created_day <= '";
+        sql = sql + end ;
+        sql = sql +   " order by created desc ";
         List<com.alibaba.fastjson.JSONObject> res = clickHouseService.query(sql, TableEnum.traceappp);
 
-        String sql2 ="select distinct pseudo_id,doctor_id,web_data,view_path,class_name,pseudo_session,action,created from trace_app where action='ACTION_WEB_ENTER' and class_name like '%messageTemp%'  order by created desc ";
+        String sql2 ="select distinct pseudo_id,doctor_id,web_data,view_path,class_name,pseudo_session,action,created from trace_app where action='ACTION_WEB_ENTER' and class_name like '%messageTemp%'  " ;
+        sql2 = sql2 + " and  created_day >= '";
+        sql2 = sql2 + begin ;
+        sql2 = sql2 + "' and  created_day <= '";
+        sql2 = sql2 + end ;
+        sql2 = sql2 + " order by created desc ";
         List<com.alibaba.fastjson.JSONObject> res2 = clickHouseService.query(sql2, TableEnum.traceappp);
 
         Map<String,List> map = new HashMap<String,List>();