修复 userQueryLog no updated 问题、修复 modifyPhoneNo 序列化问题

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/ModifyPhoneNoController.java

@@ -10,13 +10,24 @@ import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 
 /**
  * 用户手机号修改相关api
@@ -81,8 +92,18 @@ public class ModifyPhoneNoController implements IBaseController {
      */
     @ApiOperation("后台客服处理功能 - 查询列表")
     @GetMapping
-    public JsonResult<Page<ModifyPhoneNo>> list(@Valid ModifyPhoneNoQueryReq modifyPhoneNoQueryReq) {
-        return JsonResult.buildSuccessResultGeneric(modifyPhoneNoService.list(modifyPhoneNoQueryReq));
+    public JsonResult<?> list(@Valid ModifyPhoneNoQueryReq modifyPhoneNoQueryReq) {
+        Page<ModifyPhoneNo> list = modifyPhoneNoService.list(modifyPhoneNoQueryReq);
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        String s;
+        try {
+            s = objectMapper.writeValueAsString(list);
+            Object o = objectMapper.readValue(s, Object.class);
+            return JsonResult.buildSuccessResultGeneric(o);
+        } catch (Exception ignored) {
+        }
+        return JsonResult.buildErrorStateResult("数据错误",null);
     }
 
     /**

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

 package cn.quantgroup.xyqb.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -16,6 +17,7 @@ import java.io.Serializable;
 @Data
 @Entity
 @Table(name = "user_modify_phone_no")
+@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
 public class ModifyPhoneNo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -7797532159380593454L;

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

@@ -2,11 +2,18 @@ package cn.quantgroup.xyqb.entity;
 
 import lombok.Data;
 
+import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
  * Created by 11 on 2016/12/30.
@@ -14,9 +21,13 @@ import java.io.Serializable;
 @Data
 @Entity
 @Table(name = "user_query_log")
-public class UserQueryLog extends BaseEntity implements Serializable {
+public class UserQueryLog implements Serializable {
 
     private static final long serialVersionUID = -1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    private Long id;
 
     @Column(name = "login_user_name")
     private String loginUserName;
@@ -32,4 +43,12 @@ public class UserQueryLog extends BaseEntity implements Serializable {
     @Transient
     private String createDate;
 
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @PrePersist
+    public void prePersist() {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        this.createdAt = now;
+    }
 }