Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2023-12-07 2caea3a39884a60977ca1dc495306e3eda931d47

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 logs/pipIrrBase.log

File was deleted

 logs/pipIrrRemote.log

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java

@@ -5,6 +5,7 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
@@ -32,7 +33,7 @@
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "开卡/补卡实体")
public class SeActiveCard {
public class SeActiveCard implements BaseEntity {
    public static final long serialVersionUID = 20231191728001L;

    /**

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java

@@ -1,5 +1,18 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;

import java.util.Date;

/**
@@ -8,124 +21,82 @@
 * @LastEditTime 2023/12/7 9:06
 * @Description
 */

/**
    * å¼€å¡/补卡历史表
    */
public class SeActiveCardHistory {
 * å¼€å¡/补卡历史表
 */

@TableName(value="se_active_card_history", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "开卡/补卡历史实体")
public class SeActiveCardHistory implements BaseEntity {
    public static final long serialVersionUID = 1L;

    /**
    * ä¸»é”®
    */
     * ä¸»é”®
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @TableId(type = IdType.INPUT)
    @Schema(description = "实体id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Long id;

    /**
    * æ°´å¡ç¼–号
    */
     * æ°´å¡ç¼–号
     */
    @Schema(description = "水卡编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Length(message = "水卡编号不小于{min}", min = 1)
    private Long cardid;

    /**
    * å¡ç‰‡è´¹ç”¨
    */
     * å¡ç‰‡è´¹ç”¨
     */
    @Schema(description = "卡片费用", requiredMode = Schema.RequiredMode.REQUIRED)
    @Length(message = "卡片费用不小于{min}字", min = 1)
    private Integer cardcost;

    /**
    * ä»˜æ¬¾æ–¹å¼ç¼–号
    */
     * ä»˜æ¬¾æ–¹å¼ç¼–号
     */
    @Schema(description = "付款方式编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Length(message = "付款方式编号不大于{max}，不小于{min}", min = 1, max = 4)
    private Long paymentid;

    /**
    * è¡¥å¡é‡‘额
    */
     * è¡¥å¡é‡‘额
     */
    @Schema(description = "补卡金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Length(message = "补卡金额不小于{min}", min = 0)
    private Double reissueamount;

    /**
    * æ“ä½œç±»åž‹;1-开卡，2-补卡
    */
     * æ“ä½œç±»åž‹;1-开卡，2-补卡
     */
    @Schema(description = "操作类型", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Max(message = "操作类型只能1或2", value = 2)
    @Min(message = "操作类型只能1或2",value = 1)
    private Byte operatetype;

    /**
    * å¤‡æ³¨ä¿¡æ¯
    */
     * å¤‡æ³¨ä¿¡æ¯
     */
    @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Length(message = "备注长度小于{max}字", min = 1, max = 200)
    private String remarks;

    /**
    * æ“ä½œäººç¼–号
    */
     * æ“ä½œäººç¼–号
     */
    @Schema(description = "操作人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "操作人编号必须为大于0的整数")
    private Long operator;

    /**
    * æ“ä½œæ—¶é—´
    */
     * æ“ä½œæ—¶é—´
     */
    @Schema(description = "操作时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Date operatedt;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getCardid() {
        return cardid;
    }

    public void setCardid(Long cardid) {
        this.cardid = cardid;
    }

    public Integer getCardcost() {
        return cardcost;
    }

    public void setCardcost(Integer cardcost) {
        this.cardcost = cardcost;
    }

    public Long getPaymentid() {
        return paymentid;
    }

    public void setPaymentid(Long paymentid) {
        this.paymentid = paymentid;
    }

    public Double getReissueamount() {
        return reissueamount;
    }

    public void setReissueamount(Double reissueamount) {
        this.reissueamount = reissueamount;
    }

    public Byte getOperatetype() {
        return operatetype;
    }

    public void setOperatetype(Byte operatetype) {
        this.operatetype = operatetype;
    }

    public String getRemarks() {
        return remarks;
    }

    public void setRemarks(String remarks) {
        this.remarks = remarks;
    }

    public Long getOperator() {
        return operator;
    }

    public void setOperator(Long operator) {
        this.operator = operator;
    }

    public Date getOperatedt() {
        return operatedt;
    }

    public void setOperatedt(Date operatedt) {
        this.operatedt = operatedt;
    }
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java

@@ -1,5 +1,18 @@
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 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;

/**
@@ -8,202 +21,118 @@
 * @LastEditTime 2023/12/7 9:06
 * @Description
 */

/**
    * å†œæˆ·æ°´å¡è¡¨
    */
public class SeClientCard {
 * å†œæˆ·æ°´å¡è¡¨
 */

@TableName(value="se_client_card", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "农户水卡实体")
public class SeClientCard implements BaseEntity {
    public static final long serialVersionUID = 1L;

    /**
    * ä¸»é”®
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @TableId(type = IdType.INPUT)
    @Schema(description = "实体id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Long id;

    /**
    * æ°´å¡åœ°å€
    */
    @Schema(description = "水卡地址", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @NotBlank(message = "水卡地址不能为空")
    private String cardaddr;

    /**
    * å†œæˆ·ID
    */
    @Schema(description = "农户ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "农户ID必须为大于0的整数")
    private Long clientid;

    /**
    * ä½™é¢
    */
    @Schema(description = "余额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Double money;

    /**
    * å¡ç‰‡çŠ¶æ€;1-正常，2-已注销，3-已挂失
    */
    @Schema(description = "卡片状态", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @Positive(message = "卡片状态必须为1或2或3")
    @Size(min = 1, max = 3)
    private Byte state;

    /**
    * å¼€å¡æ—¶é—´
    */
    @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 consumedt;

    /**
    * æœ€åŽæ“ä½œç±»åž‹;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;
    }
}

 pipIrr-platform/Îĵµ/~$¼ÓÈëÁË .gitignore£¬µ«»¹ÊDZ» git ¸ú×Ù.docx

Binary files differ