Kaynağa Gözat

refactor(entity): 将创建人和更新人字段迁移至BaseEntity统一管理

- 移除多个实体类中冗余的createBy和updateBy字段
- 在BaseEntity中新增createBy和updateBy字段,支持自动填充
- 调整MyMetaObjectHandler,使插入时update字段同步填充
- 精简了实体定义,减少代码重复,提高维护性
- 确保逻辑删除等其他注解不受影响
wzq 2 hafta önce
ebeveyn
işleme
15a29b0986
21 değiştirilmiş dosya ile 17 ekleme ve 157 silme
  1. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/Advertising.java
  2. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/BannerInfo.java
  3. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/ChargeOrderInfo.java
  4. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/Coupon.java
  5. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/CouponTemplate.java
  6. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/DiscountsActivity.java
  7. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/FirmInfo.java
  8. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/RechargeLevel.java
  9. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/UserAccount.java
  10. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/UserExchangeIntegralRule.java
  11. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/UserFeedback.java
  12. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/UserFirm.java
  13. 0 8
      src/main/java/com/zsElectric/boot/business/model/entity/UserInfo.java
  14. 0 13
      src/main/java/com/zsElectric/boot/charging/entity/ThirdPartyEquipmentInfo.java
  15. 3 2
      src/main/java/com/zsElectric/boot/charging/service/impl/ChargingReceptionServiceImpl.java
  16. 12 0
      src/main/java/com/zsElectric/boot/common/base/BaseEntity.java
  17. 2 2
      src/main/java/com/zsElectric/boot/plugin/mybatis/MyMetaObjectHandler.java
  18. 0 9
      src/main/java/com/zsElectric/boot/system/model/entity/Config.java
  19. 0 9
      src/main/java/com/zsElectric/boot/system/model/entity/Dept.java
  20. 0 9
      src/main/java/com/zsElectric/boot/system/model/entity/Notice.java
  21. 0 9
      src/main/java/com/zsElectric/boot/system/model/entity/User.java

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/Advertising.java

@@ -43,14 +43,6 @@ public class Advertising extends BaseEntity {
      * 跳转路径
      */
     private String skipUrl;
-    /**
-     * 创建人ID
-     */
-    private Long createBy;
-    /**
-     * 更新人ID
-     */
-    private Long updateBy;
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/BannerInfo.java

@@ -47,14 +47,6 @@ public class BannerInfo extends BaseEntity {
      * 状态 0-禁用 1-启用
      */
     private Integer status;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 更新人
-     */
-    private String updateBy;
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/ChargeOrderInfo.java

@@ -186,14 +186,6 @@ public class ChargeOrderInfo extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 乐观锁
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/Coupon.java

@@ -70,14 +70,6 @@ public class Coupon extends BaseEntity {
      * 使用时间
      */
     private LocalDateTime useTime;
-    /**
-     * 创建者
-     */
-    private Long createBy;
-    /**
-     * 更新者
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/CouponTemplate.java

@@ -73,14 +73,6 @@ public class CouponTemplate extends BaseEntity {
      * 失效的数量
      */
     private Integer failureCount;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 乐观锁
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/DiscountsActivity.java

@@ -41,14 +41,6 @@ public class DiscountsActivity extends BaseEntity {
      * 状态 0-未启用 1-启用
      */
     private Integer status;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/FirmInfo.java

@@ -58,14 +58,6 @@ public class FirmInfo extends BaseEntity {
      * 渠道方地址
      */
     private String channelUrl;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删 1-已删)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/RechargeLevel.java

@@ -37,14 +37,6 @@ public class RechargeLevel extends BaseEntity {
      * 充值提示
      */
     private String tips;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/UserAccount.java

@@ -37,14 +37,6 @@ public class UserAccount extends BaseEntity {
      * 积分
      */
     private BigDecimal integral;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/UserExchangeIntegralRule.java

@@ -37,14 +37,6 @@ public class UserExchangeIntegralRule extends BaseEntity {
      * 乐观锁
      */
     private Integer version;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/UserFeedback.java

@@ -55,14 +55,6 @@ public class UserFeedback extends BaseEntity {
      * 0未回复,1已回复
      */
     private Integer replyStatus;
-    /**
-     * 创建人ID
-     */
-    private Long createBy;
-    /**
-     * 更新人ID
-     */
-    private Long updateBy;
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/UserFirm.java

@@ -35,14 +35,6 @@ public class UserFirm extends BaseEntity {
      * 身份 1 管理员 2普通员工
      */
     private Integer type;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 8
src/main/java/com/zsElectric/boot/business/model/entity/UserInfo.java

@@ -33,14 +33,6 @@ public class UserInfo extends BaseEntity {
      * 微信openid
      */
     private String openid;
-    /**
-     * 创建人
-     */
-    private Long createBy;
-    /**
-     * 更新人
-     */
-    private Long updateBy;
     /**
      * 逻辑删除(0-未删除 1-已删除)
      */

+ 0 - 13
src/main/java/com/zsElectric/boot/charging/entity/ThirdPartyEquipmentInfo.java

@@ -1,9 +1,7 @@
 package com.zsElectric.boot.charging.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.zsElectric.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -76,17 +74,6 @@ public class ThirdPartyEquipmentInfo extends BaseEntity {
      */
     private String equipmentName;
 
-    /**
-     * 创建人ID
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createBy;
-
-    /**
-     * 更新人ID
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateBy;
 
     /**
      * 逻辑删除标识

+ 3 - 2
src/main/java/com/zsElectric/boot/charging/service/impl/ChargingReceptionServiceImpl.java

@@ -593,15 +593,16 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
                     // 充电中
                     log.info("充电中 - StartChargeSeq: {}", startChargeSeq);
                     chargeOrderInfo.setStatus(SystemConstants.STATUS_ONE);
+                    chargeOrderInfoService.updateById(chargeOrderInfo);
                 }
                 if (Objects.equals(connectorStatus, SystemConstants.STATUS_FOUR) && Objects.equals(chargeOrderInfo.getStatus(),
                         SystemConstants.STATUS_ONE)) {
                     // 结算中
                     log.info("结算中 - StartChargeSeq: {}", startChargeSeq);
                     chargeOrderInfo.setStatus(SystemConstants.STATUS_TWO);
+                    chargeOrderInfoService.updateById(chargeOrderInfo);
                 }
-                
-                chargeOrderInfoService.updateById(chargeOrderInfo);
+
                 log.info("实时更新订单消费 - startChargeSeq: {}, totalPower: {}, realCost: {}",
                         startChargeSeq, totalPower, realCost);
             }

+ 12 - 0
src/main/java/com/zsElectric/boot/common/base/BaseEntity.java

@@ -45,4 +45,16 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
 }

+ 2 - 2
src/main/java/com/zsElectric/boot/plugin/mybatis/MyMetaObjectHandler.java

@@ -25,8 +25,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class);
         this.strictInsertFill(metaObject, "createBy", SecurityUtils::getUserId, Long.class);
-        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
-        this.strictUpdateFill(metaObject, "updateBy", SecurityUtils::getUserId, Long.class);
+        this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
+        this.strictInsertFill(metaObject, "updateBy", SecurityUtils::getUserId, Long.class);
     }
 
     /**

+ 0 - 9
src/main/java/com/zsElectric/boot/system/model/entity/Config.java

@@ -38,15 +38,6 @@ public class Config extends BaseEntity {
      */
     private String remark;
 
-    /**
-     * 创建人ID
-     */
-    private Long createBy;
-
-    /**
-     * 更新人ID
-     */
-    private Long updateBy;
 
     /**
      * 逻辑删除标识(0-未删除 1-已删除)

+ 0 - 9
src/main/java/com/zsElectric/boot/system/model/entity/Dept.java

@@ -47,15 +47,6 @@ public class Dept extends BaseEntity {
      */
     private Integer status;
 
-    /**
-     * 创建人 ID
-     */
-    private Long createBy;
-
-    /**
-     * 更新人 ID
-     */
-    private Long updateBy;
 
     /**
      * 是否删除(0-否 1-是)

+ 0 - 9
src/main/java/com/zsElectric/boot/system/model/entity/Notice.java

@@ -71,15 +71,6 @@ public class Notice extends BaseEntity {
      */
     private LocalDateTime revokeTime;
 
-    /**
-     * 创建人ID
-     */
-    private Long createBy;
-
-    /**
-     * 更新人ID
-     */
-    private Long updateBy;
 
     /**
      * 逻辑删除标识(0-未删除 1-已删除)

+ 0 - 9
src/main/java/com/zsElectric/boot/system/model/entity/User.java

@@ -59,15 +59,6 @@ public class User extends BaseEntity {
      */
     private String email;
 
-    /**
-     * 创建人 ID
-     */
-    private Long createBy;
-
-    /**
-     * 更新人 ID
-     */
-    private Long updateBy;
 
     /**
      * 是否删除(0-否 1-是)