From e29ff6ff2de584854531e443ed4d8da0347e08bd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:40:59 +0800
Subject: [PATCH] 优化接口 小程序下的获得全部取水口接口与项目管理下的获得全部取水口接口同步
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 268 ++++++++++++++++++++++-------------------------------
1 files changed, 111 insertions(+), 157 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
index 3982c70..075c426 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -1,209 +1,163 @@
package com.dy.pipIrrGlobal.pojoSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
import java.util.Date;
/**
* @author ZhuBaoMin
* @date 2023/12/7 9:06
- * @LastEditTime 2023/12/7 9:06
- * @Description
+ * @LastEditTime 2023/12/18 10:14
+ * @Description 娣诲姞姘村崱缂栧彿锛坈ardnum锛夊瓧娈�
*/
+
/**
- * 鍐滄埛姘村崱琛�
- */
-public class SeClientCard {
- /**
- * 涓婚敭
- */
- private Long id;
+ * 鍐滄埛姘村崱琛�
+ */
+
+@TableName(value="se_client_card", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛姘村崱瀹炰綋")
+public class SeClientCard implements BaseEntity {
+ public static final long serialVersionUID = 202401151518004L;
/**
- * 姘村崱鍦板潃
- */
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long id;
+
+ @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
+ private String protocol;
+
+ /**
+ * 姘村崱鍦板潃
+ */
+ @Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
private String cardaddr;
/**
- * 鍐滄埛ID
- */
+ * 姘村崱缂栧彿
+ */
+ @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private String cardnum;
+
+ /**
+ * 鍐滄埛ID
+ */
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
private Long clientid;
/**
- * 浣欓
- */
- private Double money;
+ * 浣欓
+ */
+ @Schema(description = "浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float money;
/**
- * 鍗＄墖鐘舵��;1-姝ｅ父锛�2-宸叉敞閿�锛�3-宸叉寕澶�
- */
+ * 鍗＄墖鐘舵��;1-姝ｅ父锛�2-宸叉敞閿�锛�3-宸叉寕澶�
+ */
+ @Schema(description = "鍗＄墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鍗＄墖鐘舵�佸繀椤讳负1鎴�2鎴�3")
+ @Size(min = 1, max = 3)
private Byte state;
/**
- * 寮�鍗℃椂闂�
- */
+ * 鍘熸寕澶卞崱ID
+ */
+ @Schema(description = "鍗＄墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鍘熸寕澶卞崱ID蹇呴』涓烘鏁�")
+ private Long originalCardId;
+
+ /**
+ * 寮�鍗℃椂闂�
+ */
+ @Schema(description = "寮�鍗℃椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date createdt;
/**
- * 琛ュ崱鏃堕棿
- */
+ * 琛ュ崱鏃堕棿
+ */
+ @Schema(description = "琛ュ崱鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date replacedt;
/**
- * 鍏呭�兼椂闂�
- */
+ * 鍏呭�兼椂闂�
+ */
+ @Schema(description = "鍏呭�兼椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date rechargedt;
/**
- * 鎸傚け鏃堕棿
- */
+ * 鎸傚け鏃堕棿
+ */
+ @Schema(description = "鎸傚け鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date lossdtdt;
/**
- * 娉ㄩ攢鏃堕棿
- */
+ * 娉ㄩ攢鏃堕棿
+ */
+ @Schema(description = "娉ㄩ攢鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date canceldt;
/**
- * 瑙ｉ攣鏃堕棿
- */
+ * 瑙ｉ攣鏃堕棿
+ */
+ @Schema(description = "瑙ｉ攣鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date unlockdt;
/**
- * 鍐叉鏃堕棿
- */
+ * 鍐叉鏃堕棿
+ */
+ @Schema(description = "鍐叉鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date reversaldt;
/**
- * 娑堣垂鏃堕棿
- */
+ * 琛ユ墸鏃堕棿
+ */
+ @Schema(description = "琛ユ墸鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Date refunddt;
+
+ /**
+ * 娑堣垂鏃堕棿
+ */
+ @Schema(description = "娑堣垂鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date consumedt;
/**
- * 鏈�鍚庢搷浣滅被鍨�;1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙ｉ攣锛�7-鍐叉锛�8-娑堣垂
- */
+ * 鏈�鍚庢搷浣滅被鍨�;1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙ｉ攣锛�7-鍐叉锛�8-娑堣垂
+ */
+ @Schema(description = "鏈�鍚庢搷浣滅被鍨�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鍗＄墖鐘舵�佸繀椤讳负1鍒�8鐨勬鏁存暟")
+ @Size(min = 1, max = 8)
private Byte lastoper;
/**
- * 澶囨敞淇℃伅
- */
+ * 澶囨敞淇℃伅
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
private String remarks;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getCardaddr() {
- return cardaddr;
- }
-
- public void setCardaddr(String cardaddr) {
- this.cardaddr = cardaddr;
- }
-
- public Long getClientid() {
- return clientid;
- }
-
- public void setClientid(Long clientid) {
- this.clientid = clientid;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Byte getState() {
- return state;
- }
-
- public void setState(Byte state) {
- this.state = state;
- }
-
- public Date getCreatedt() {
- return createdt;
- }
-
- public void setCreatedt(Date createdt) {
- this.createdt = createdt;
- }
-
- public Date getReplacedt() {
- return replacedt;
- }
-
- public void setReplacedt(Date replacedt) {
- this.replacedt = replacedt;
- }
-
- public Date getRechargedt() {
- return rechargedt;
- }
-
- public void setRechargedt(Date rechargedt) {
- this.rechargedt = rechargedt;
- }
-
- public Date getLossdtdt() {
- return lossdtdt;
- }
-
- public void setLossdtdt(Date lossdtdt) {
- this.lossdtdt = lossdtdt;
- }
-
- public Date getCanceldt() {
- return canceldt;
- }
-
- public void setCanceldt(Date canceldt) {
- this.canceldt = canceldt;
- }
-
- public Date getUnlockdt() {
- return unlockdt;
- }
-
- public void setUnlockdt(Date unlockdt) {
- this.unlockdt = unlockdt;
- }
-
- public Date getReversaldt() {
- return reversaldt;
- }
-
- public void setReversaldt(Date reversaldt) {
- this.reversaldt = reversaldt;
- }
-
- public Date getConsumedt() {
- return consumedt;
- }
-
- public void setConsumedt(Date consumedt) {
- this.consumedt = consumedt;
- }
-
- public Byte getLastoper() {
- return lastoper;
- }
-
- public void setLastoper(Byte lastoper) {
- this.lastoper = lastoper;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0