From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
index c66dae0..4f502ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -1,12 +1,18 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -19,6 +25,7 @@
public class ComActMicroWishVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发起人id")
@@ -30,19 +37,23 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发起人昵称")
+ private String userNickName;
+
@ApiModelProperty("发起人头像")
private String imageUrl;
@ApiModelProperty("微心愿名称")
+// @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
private String wishName;
- @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
+ @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中")
private Integer status;
@ApiModelProperty("集星数")
private Integer starNum;
- @ApiModelProperty("形式 1分配人员 2发起活动")
+ @ApiModelProperty("形式 1分配人员 2发起活动 3用户一键认领 ")
private Integer form;
@ApiModelProperty("责任人id")
@@ -71,20 +82,26 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date distributionAt;
+ @ApiModelProperty("完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date finishAt;
+
@ApiModelProperty("评分")
private Integer score;
@ApiModelProperty("详情")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
+ //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
private String photoPathList;
@ApiModelProperty("当前页数")
- private Long pageNum;
+ private Long pageNum = 1L;
@ApiModelProperty("每页记录数")
- private Long pageSize;
+ private Long pageSize = 10L;
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
@@ -93,9 +110,11 @@
private String evaluate;
@ApiModelProperty("用户评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateAt;
- @ApiModelProperty("反馈时间")
+ @ApiModelProperty("集心完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date feedbackAt;
@ApiModelProperty("完成情况图片列表，逗号分隔")
@@ -120,7 +139,42 @@
private Integer isApplets;
@ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
- private Integer haveGiveThumbsUp;
+ private Integer haveGiveThumbsUp = 0;
+ @ApiModelProperty(value = "登录用户",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
+ private Integer isPageMyWish;
+
+ @ApiModelProperty(value = "预约社区集心数")
+ private Integer aimNum;
+
+ @ApiModelProperty(value = "反馈列表")
+ private List<ComActMicroWishFeedbackVO> feedbackVOList;
+
+ @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取")
+ private List<ComActMicroWishOperationRecordVO> operationRecordVOList;
+
+ @ApiModelProperty(value = "下一个id数组")
+ private List<Long> idList;
+
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "微心愿分配人id集合")
+ private List<Long> handleIds;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
+ @ApiModelProperty(value = "微心愿处理人id，多个以逗号隔开")
+ private String handleId;
}
--
Gitblit v1.7.1