记录时按；分号隔开，显示日期

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -111,6 +111,16 @@ public class UserQueryLogController {
         }else if(pageSize>200){
           pageSize=200;
         }
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try{
+          for(UserQueryLog ll:userQueryLogs){
+            ll.setCreateDate(sdf.format(ll.getCreatedAt()));
+          }
+        }catch (Exception e){
+
+        }
+
         uqp.setPageSize(pageSize);
         uqp.setPageId(pageId);
         uqp.setPageList(userQueryLogs);
@@ -147,6 +157,9 @@ public class UserQueryLogController {
       return JsonResult.buildErrorStateResult("未授权查询",null);
     }
     //输入enter换行\n
+    if(org.apache.commons.lang3.StringUtils.isEmpty(keyValues)){
+      return JsonResult.buildSuccessResult("请输入查询条件",null);
+    }
     String[] values=keyValues.split("\\n");
     List<String> queryV= Arrays.asList(values);
 
@@ -269,7 +282,7 @@ public class UserQueryLogController {
     log.setResultAmount(Long.valueOf(userDetailPage.getTotalPages()));
     //转换存储
     log.setQueryCondition(key.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号"));
-    log.setQueryDetail(keyValues);
+    log.setQueryDetail(keyValues.replace("\n",";"));
     log.setLoginUserName(userName);
     userQueryLogService.save(log);
 
@@ -348,10 +361,27 @@ public class UserQueryLogController {
       return JsonResult.buildErrorStateResult("未授权查询",null);
     }
 
+    //输入enter换行\n
+    if(org.apache.commons.lang3.StringUtils.isEmpty(keyValues)){
+      return JsonResult.buildSuccessResult("请输入查询条件",null);
+    }
+
     List<UserQueryInfo> uqls=new ArrayList<UserQueryInfo>();
 
     String[] values=keyValues.split(";");
+
     List<String> queryV= Arrays.asList(values);
+
+    if(queryV!=null&&queryV.size()>1000){
+      return JsonResult.buildSuccessResult("查询记录数是"+queryV.size()+",超过1000条限制",null);
+    }
+
+
+    //如果维度里面没有保护查询条件则加入条件
+    if(!columns.contains(key)){
+      columns=columns+","+key;
+    }
+
     List<UserQueryInfo> userQueryInfos=new ArrayList<UserQueryInfo>();
     List<UserDetail> userDetails=new ArrayList<UserDetail>();
     List<Address> addresslist=new ArrayList<Address>();
@@ -446,7 +476,7 @@ public class UserQueryLogController {
     log.setResultAmount(Long.valueOf(userDetails.size()));
     //转换存储
     log.setQueryCondition(key.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号"));
-    log.setQueryDetail(keyValues);
+    log.setQueryDetail(keyValues.replace("\n",";"));
     log.setLoginUserName(userName);
     userQueryLogService.save(log);
 

src/main/java/cn/quantgroup/xyqb/entity/UserQueryLog.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.Date;
 
 /**
  * Created by 11 on 2016/12/30.
@@ -32,6 +33,9 @@ public class UserQueryLog implements Serializable {
   @Column(name = "query_detail")
   private String queryDetail;
   @Column(name = "created_at")
-  private Timestamp createdAt;
+  private Date createdAt;
+
+  @Transient
+  private String createDate;
 
 }