guoshuai 3 dienas atpakaļ
vecāks
revīzija
172757f8cb

+ 1 - 8
src/main/java/com/qmrb/system/pojo/entity/ParkingCard.java

@@ -69,12 +69,5 @@ public class ParkingCard extends BaseEntity {
     @Schema(description = "手机号")
     @TableField("phone")
     private String phone;
-
-    @Schema(description = "创建时间")
-    @TableField("created_at")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "更新时间")
-    @TableField("updated_at")
-    private LocalDateTime updatedAt;
+    
 } 

+ 0 - 6
src/main/java/com/qmrb/system/pojo/entity/ParkingCardType.java

@@ -41,11 +41,5 @@ public class ParkingCardType extends BaseEntity {
     @TableField("total_quota")
     private Integer totalQuota;
 
-    @Schema(description = "创建时间")
-    @TableField("created_at")
-    private LocalDateTime createdAt;
 
-    @Schema(description = "更新时间")
-    @TableField("updated_at")
-    private LocalDateTime updatedAt;
 } 

+ 1 - 4
src/main/java/com/qmrb/system/pojo/entity/QuotaUsage.java

@@ -31,8 +31,5 @@ public class QuotaUsage extends BaseEntity{
     @Schema(description = "已使用配额")
     @TableField("used_quota")
     private Integer usedQuota;
-
-    @Schema(description = "更新时间")
-    @TableField("updated_at")
-    private LocalDateTime updatedAt;
+    
 } 

+ 0 - 1
src/main/java/com/qmrb/system/pojo/form/ParkingCardForm.java

@@ -23,7 +23,6 @@ public class ParkingCardForm {
     private Long id;
 
     @Schema(description = "用户ID", required = true)
-    @NotNull(message = "用户ID不能为空")
     private Long userId;
 
     @Schema(description = "月卡类型ID", required = true)

+ 2 - 2
src/main/java/com/qmrb/system/pojo/vo/ParkingCardTypeVO.java

@@ -39,9 +39,9 @@ public class ParkingCardTypeVO {
 
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createdAt;
+    private LocalDateTime createTime;
 
     @Schema(description = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updatedAt;
+    private LocalDateTime updateTime;
 } 

+ 1 - 5
src/main/java/com/qmrb/system/pojo/vo/ParkingCardVO.java

@@ -63,9 +63,5 @@ public class ParkingCardVO {
 
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updatedAt;
+    private LocalDateTime createTime;
 } 

+ 9 - 7
src/main/java/com/qmrb/system/service/impl/ParkingCardServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmrb.system.converter.ParkingCardConverter;
+import com.qmrb.system.framework.security.util.SecurityUtils;
 import com.qmrb.system.mapper.ParkingCardMapper;
 import com.qmrb.system.pojo.entity.ParkingCard;
 import com.qmrb.system.pojo.entity.ParkingCardType;
@@ -92,14 +93,14 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
             queryWrapper.le(ParkingCard::getEndTime, queryParams.getEndTimeEnd());
         }
         if (StrUtil.isNotBlank(queryParams.getCreatedAtBegin())) {
-            queryWrapper.ge(ParkingCard::getCreatedAt, queryParams.getCreatedAtBegin());
+            queryWrapper.ge(ParkingCard::getCreateTime, queryParams.getCreatedAtBegin());
         }
         if (StrUtil.isNotBlank(queryParams.getCreatedAtEnd())) {
-            queryWrapper.le(ParkingCard::getCreatedAt, queryParams.getCreatedAtEnd());
+            queryWrapper.le(ParkingCard::getCreateTime, queryParams.getCreatedAtEnd());
         }
         
         // 默认按创建时间降序排序
-        queryWrapper.orderByDesc(ParkingCard::getCreatedAt);
+        queryWrapper.orderByDesc(ParkingCard::getCreateTime);
 
         // 查询数据
         Page<ParkingCard> entityPage = this.page(
@@ -126,6 +127,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ParkingCardForm saveForm(ParkingCardForm form) {
+        form.setUserId(SecurityUtils.getUserId());
         // 校验月卡类型是否存在
         ParkingCardType cardType = parkingCardTypeService.getById(form.getTypeId());
         Assert.notNull(cardType, "月卡类型不存在");
@@ -154,8 +156,8 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
         
         // 设置创建和更新时间
         LocalDateTime now = LocalDateTime.now();
-        entity.setCreatedAt(now);
-        entity.setUpdatedAt(now);
+        entity.setCreateTime(now);
+        entity.setUpdateTime(now);
         
         // 持久化
         this.save(entity);
@@ -201,7 +203,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
         
         // 更新实体
         converter.updateEntityFromForm(form, entity);
-        entity.setUpdatedAt(LocalDateTime.now());
+        entity.setUpdateTime(LocalDateTime.now());
         
         // 保存更新
         boolean result = this.updateById(entity);
@@ -255,7 +257,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
         
         // 更新状态
         entity.setStatus(status);
-        entity.setUpdatedAt(LocalDateTime.now());
+        entity.setUpdateTime(LocalDateTime.now());
         
         // 如果从有效变为过期,减少已使用配额
         if ("active".equals(entity.getStatus()) && "expired".equals(status)) {

+ 4 - 4
src/main/java/com/qmrb/system/service/impl/ParkingCardTypeServiceImpl.java

@@ -59,7 +59,7 @@ public class ParkingCardTypeServiceImpl extends ServiceImpl<ParkingCardTypeMappe
             queryWrapper.le(ParkingCardType::getPricePerMonth, queryParams.getMaxPrice());
         }
         // 按创建时间降序排序
-        queryWrapper.orderByDesc(ParkingCardType::getCreatedAt);
+        queryWrapper.orderByDesc(ParkingCardType::getCreateTime);
 
         // 查询数据
         Page<ParkingCardType> entityPage = this.page(
@@ -93,8 +93,8 @@ public class ParkingCardTypeServiceImpl extends ServiceImpl<ParkingCardTypeMappe
         
         // 设置创建和更新时间
         LocalDateTime now = LocalDateTime.now();
-        entity.setCreatedAt(now);
-        entity.setUpdatedAt(now);
+        entity.setCreateTime(now);
+        entity.setUpdateTime(now);
         
         // 持久化
         this.save(entity);
@@ -125,7 +125,7 @@ public class ParkingCardTypeServiceImpl extends ServiceImpl<ParkingCardTypeMappe
 
         // 更新实体
         converter.updateEntityFromForm(form, entity);
-        entity.setUpdatedAt(LocalDateTime.now());
+        entity.setUpdateTime(LocalDateTime.now());
         
         // 保存更新
         boolean result = this.updateById(entity);

+ 4 - 4
src/main/java/com/qmrb/system/service/impl/QuotaUsageServiceImpl.java

@@ -36,12 +36,12 @@ public class QuotaUsageServiceImpl extends ServiceImpl<QuotaUsageMapper, QuotaUs
             quotaUsage = new QuotaUsage();
             quotaUsage.setTypeId(typeId);
             quotaUsage.setUsedQuota(1);
-            quotaUsage.setUpdatedAt(LocalDateTime.now());
+            quotaUsage.setCreateTime(LocalDateTime.now());
             return this.save(quotaUsage);
         } else {
             // 如果已存在则增加
             quotaUsage.setUsedQuota(quotaUsage.getUsedQuota() + 1);
-            quotaUsage.setUpdatedAt(LocalDateTime.now());
+            quotaUsage.setUpdateTime(LocalDateTime.now());
             return this.updateById(quotaUsage);
         }
     }
@@ -54,7 +54,7 @@ public class QuotaUsageServiceImpl extends ServiceImpl<QuotaUsageMapper, QuotaUs
             return false;
         } else {
             quotaUsage.setUsedQuota(quotaUsage.getUsedQuota() - 1);
-            quotaUsage.setUpdatedAt(LocalDateTime.now());
+            quotaUsage.setUpdateTime(LocalDateTime.now());
             return this.updateById(quotaUsage);
         }
     }
@@ -86,7 +86,7 @@ public class QuotaUsageServiceImpl extends ServiceImpl<QuotaUsageMapper, QuotaUs
         QuotaUsage quotaUsage = new QuotaUsage();
         quotaUsage.setTypeId(typeId);
         quotaUsage.setUsedQuota(initialUsedQuota);
-        quotaUsage.setUpdatedAt(LocalDateTime.now());
+        quotaUsage.setUpdateTime(LocalDateTime.now());
         
         // 先删除已有记录
         this.remove(new LambdaQueryWrapper<QuotaUsage>().eq(QuotaUsage::getTypeId, typeId));