marxjaw 3 місяців тому
батько
коміт
a996895530

+ 0 - 1
yt-agent/agent-service/src/main/java/com/ytpm/controller/YtAppUserController.java

@@ -1,6 +1,5 @@
 package com.ytpm.controller;
 
-import com.ytpm.agent.model.YtAppUser;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.AppUserStaticsView;

+ 2 - 2
yt-common/src/main/java/com/ytpm/app/param/YtAppUserListParam.java

@@ -13,9 +13,9 @@ import java.util.Date;
 @ApiModel("应用用户列表入参")
 public class YtAppUserListParam extends PageMeta {
     @ApiModelProperty("注册时间开始")
-    private Date registryTimeBegin;
+    private String registryTimeBegin;
     @ApiModelProperty("注册时间结束")
-    private Date registryTimeEnd;
+    private String registryTimeEnd;
     @ApiModelProperty("最新登录时间开始")
     private Date lastLoginTimeBegin;
     @ApiModelProperty("最新登录时间结束")

+ 3 - 0
yt-common/src/main/java/com/ytpm/app/view/YtAppUserListView.java

@@ -1,5 +1,6 @@
 package com.ytpm.app.view;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ytpm.app.model.YtDyzLoginRecord;
 import com.ytpm.custom.CustomField;
 import com.ytpm.general.PageMeta;
@@ -43,8 +44,10 @@ public class YtAppUserListView extends PageMeta {
     @ApiModelProperty("用户昵称")
     private String nickName ;
     @ApiModelProperty("注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date registryTime;
     @ApiModelProperty("最新登录时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastLoginTime;
     @ApiModelProperty("最新登录IP")
     private String lastLoginIp;

+ 2 - 2
yt-common/src/main/java/com/ytpm/risk/param/RiskBannedListParam.java

@@ -29,9 +29,9 @@ public class RiskBannedListParam extends PageMeta {
     @ApiModelProperty("渠道来源")
     private Integer channelOrigin;
     @ApiModelProperty("封禁开始时间")
-    private Date bannedTimeBegin;
+    private String bannedTimeBegin;
     @ApiModelProperty("封禁结束时间")
-    private Date bannedTimeEnd;
+    private String bannedTimeEnd;
     @ApiModelProperty("封禁原因")
     private String bannedReason;
 }

+ 2 - 2
yt-common/src/main/java/com/ytpm/risk/param/RiskDeblockingListParam.java

@@ -21,9 +21,9 @@ public class RiskDeblockingListParam extends PageMeta {
     @ApiModelProperty("登录时间截止")
     private Date loginTimeEnd;
     @ApiModelProperty("解封时间开始")
-    private Date deblockingTimeBegin;
+    private String deblockingTimeBegin;
     @ApiModelProperty("解封时间结束")
-    private Date deblockingTimeEnd;
+    private String deblockingTimeEnd;
     @ApiModelProperty("解封原因")
     private String deblockingReason;
     @ApiModelProperty("操作人")

+ 4 - 0
yt-common/src/main/java/com/ytpm/risk/view/RiskBannedListView.java

@@ -1,5 +1,6 @@
 package com.ytpm.risk.view;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ytpm.general.PageMeta;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,14 +28,17 @@ public class RiskBannedListView extends PageMeta {
     @ApiModelProperty("用户昵称")
     private String nickName;
     @ApiModelProperty("注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date registryTime;
     @ApiModelProperty("最新登录时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastLoginTime;
     @ApiModelProperty("最新登录IP")
     private String lastLoginIp;
     @ApiModelProperty("用户状态")
     private Integer userStatus;
     @ApiModelProperty("封禁时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date bannedTime;
     @ApiModelProperty("封禁原因")
     private String bannedReason;

+ 4 - 0
yt-common/src/main/java/com/ytpm/risk/view/RiskDeblockingListView.java

@@ -1,5 +1,6 @@
 package com.ytpm.risk.view;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ytpm.general.PageMeta;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,8 +29,10 @@ public class RiskDeblockingListView extends PageMeta {
     @ApiModelProperty("用户昵称")
     private String nickName;
     @ApiModelProperty("注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date registryTime;
     @ApiModelProperty("最新登录时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastLoginTime;
     @ApiModelProperty("用户状态")
     private Integer userStatus;
@@ -40,6 +43,7 @@ public class RiskDeblockingListView extends PageMeta {
     @ApiModelProperty("操作人")
     private String operatorName;
     @ApiModelProperty("解禁时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deblockingTime;
     @ApiModelProperty("解禁原因")
     private String deblockingReason;