diff --git a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialDayMapper.java b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialDayMapper.java index 8fd4a48..bea960d 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialDayMapper.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialDayMapper.java @@ -1,7 +1,7 @@ package com.cdzy.operations.mapper; import com.mybatisflex.core.BaseMapper; -import com.cdzy.operations.model.entity.EbiekSpecialDay; +import com.cdzy.operations.model.entity.EbikeSpecialDay; /** * 高峰日计费配置表 映射层。 @@ -9,6 +9,6 @@ import com.cdzy.operations.model.entity.EbiekSpecialDay; * @author attiya * @since 2025-10-24 */ -public interface EbiekSpecialDayMapper extends BaseMapper { +public interface EbiekSpecialDayMapper extends BaseMapper { } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialTimeMapper.java b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialTimeMapper.java index 5d57b0e..58353da 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialTimeMapper.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbiekSpecialTimeMapper.java @@ -1,7 +1,7 @@ package com.cdzy.operations.mapper; import com.mybatisflex.core.BaseMapper; -import com.cdzy.operations.model.entity.EbiekSpecialTime; +import com.cdzy.operations.model.entity.EbikeSpecialTime; /** * 映射层。 @@ -9,6 +9,6 @@ import com.cdzy.operations.model.entity.EbiekSpecialTime; * @author attiya * @since 2025-10-24 */ -public interface EbiekSpecialTimeMapper extends BaseMapper { +public interface EbiekSpecialTimeMapper extends BaseMapper { } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java index 242dd57..587037e 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java @@ -1,7 +1,7 @@ package com.cdzy.operations.model.dto; -import com.cdzy.operations.model.entity.EbiekSpecialDay; -import com.cdzy.operations.model.entity.EbiekSpecialTime; +import com.cdzy.operations.model.entity.EbikeSpecialDay; +import com.cdzy.operations.model.entity.EbikeSpecialTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -42,8 +42,8 @@ public class EbikeSpecialBillingConfigurationDto implements Serializable { private Long createdBy; - List dayConfigs; + List dayConfigs; - List timeConfigs; + List timeConfigs; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialDay.java similarity index 93% rename from ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java rename to ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialDay.java index 2ed600f..0f7e177 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialDay.java @@ -23,8 +23,8 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebiek_special_day") -public class EbiekSpecialDay implements Serializable { +@Table("ebike_special_day") +public class EbikeSpecialDay implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialTime.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialTime.java similarity index 93% rename from ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialTime.java rename to ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialTime.java index 774e2d1..09b9686 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialTime.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialTime.java @@ -24,8 +24,8 @@ import java.time.LocalTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebiek_special_time") -public class EbiekSpecialTime implements Serializable { +@Table("ebike_special_time") +public class EbikeSpecialTime implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSpecialBillingConfigurationServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSpecialBillingConfigurationServiceImpl.java index ac58748..9206838 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSpecialBillingConfigurationServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSpecialBillingConfigurationServiceImpl.java @@ -7,8 +7,8 @@ import com.cdzy.operations.mapper.EbiekSpecialDayMapper; import com.cdzy.operations.mapper.EbiekSpecialTimeMapper; import com.cdzy.operations.mapper.EbikeSpecialBillingConfigurationMapper; import com.cdzy.operations.model.dto.EbikeSpecialBillingConfigurationDto; -import com.cdzy.operations.model.entity.EbiekSpecialDay; -import com.cdzy.operations.model.entity.EbiekSpecialTime; +import com.cdzy.operations.model.entity.EbikeSpecialDay; +import com.cdzy.operations.model.entity.EbikeSpecialTime; import com.cdzy.operations.model.entity.EbikeSpecialBillingConfiguration; import com.cdzy.operations.model.vo.EbiekSpecialDayVo; import com.cdzy.operations.model.vo.EbiekSpecialTimeVo; @@ -67,9 +67,9 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl list = new ArrayList<>(); + List list = new ArrayList<>(); for (EbiekSpecialTimeVo timeConfig : timeConfigs) { - EbiekSpecialTime time = EbiekSpecialTime.builder() + EbikeSpecialTime time = EbikeSpecialTime.builder() .regionId(regionId) .startTime(timeConfig.getStartTime()) .endTime(timeConfig.getEndTime()) @@ -91,9 +91,9 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl list = new ArrayList<>(); + List list = new ArrayList<>(); for (EbiekSpecialDayVo dayConfig : dayConfigs) { - EbiekSpecialDay day = EbiekSpecialDay.builder() + EbikeSpecialDay day = EbikeSpecialDay.builder() .regionId(regionId) .specialDayNum(dayConfig.getSpecialDayNum()) .baseFee(dayConfig.getBaseFee()) @@ -118,11 +118,11 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl days = dayMapper.selectListByQuery(queryWrapper); + List days = dayMapper.selectListByQuery(queryWrapper); queryWrapper.clear(); queryWrapper.where(EBIEK_SPECIAL_TIME.REGION_ID.eq(regionId)); - List times = timeMapper.selectListByQuery(queryWrapper); + List times = timeMapper.selectListByQuery(queryWrapper); specialBillingConfiguration.setDayConfigs(days); specialBillingConfiguration.setTimeConfigs(times); return specialBillingConfiguration; diff --git a/ebike-staff/src/test/java/com/cdzy/staff/EbikeStaffApplicationTests.java b/ebike-staff/src/test/java/com/cdzy/staff/EbikeStaffApplicationTests.java index db54325..4c7321d 100644 --- a/ebike-staff/src/test/java/com/cdzy/staff/EbikeStaffApplicationTests.java +++ b/ebike-staff/src/test/java/com/cdzy/staff/EbikeStaffApplicationTests.java @@ -12,7 +12,7 @@ class EbikeStaffApplicationTests { private static final String mapperPath="D:/ebike_plus/ebike-operations/resources/mapper"; private static final String packageName ="com.cdzy.operations"; private static final String[] tables= new String[]{ - "ebiek_special_time","ebiek_special_day" + "ebike_operation_return_config" }; @Test