joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整

Browse Source
This commit is contained in:
tiger_zhou 2023-09-19 15:54:58 +08:00
parent fe7fa3da8a
commit 54753177dd
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/club/joylink/xiannccda/entity/AlertTipTimeConfig.java
View File

@ -23,33 +23,33 @@ import lombok.experimental.Accessors;
@Schema(name = "AlertTipTimeConfig", description = "$!{table.comment}") @Schema(name = "AlertTipTimeConfig", description = "$!{table.comment}")
public class AlertTipTimeConfig { public class AlertTipTimeConfig {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
@Schema(description = "名称") // @Schema(description = "名称")
private String timeName; // private String timeName;
@Schema(description = "开始小时数") @Schema(description = "开始小时数")
private Byte startHour; private Byte startHour;
@Schema(description = "结束小时数") @Schema(description = "结束小时数")
private Byte endHour; private Byte endHour;
@Schema(description = "时间配置类型") @Schema(description = "时间配置类型")
private String timeType; private String timeType;
@Schema(description = "公休日是否高峰0=否；1=是") @Schema(description = "公休日是否高峰0=否；1=是")
private Byte publicPeak; private Byte publicPeak;
public static final String ID = "id"; public static final String ID = "id";
public static final String TIME_NAME = "time_name"; // public static final String TIME_NAME = "time_name";
public static final String START_HOUR = "start_hour"; public static final String START_HOUR = "start_hour";
public static final String END_HOUR = "end_hour"; public static final String END_HOUR = "end_hour";
public static final String TIME_TYPE = "time_type"; public static final String TIME_TYPE = "time_type";
public static final String PUBLIC_PEAK = "public_peak"; public static final String PUBLIC_PEAK = "public_peak";
} }

2
src/main/java/club/joylink/xiannccda/service/AlertTipService.java
View File

@ -70,6 +70,8 @@ public class AlertTipService {
entity.setId(saveDTO.getId()); entity.setId(saveDTO.getId());
if (CollectionUtils.isNotEmpty(saveDTO.getTipTimeIds())) { if (CollectionUtils.isNotEmpty(saveDTO.getTipTimeIds())) {
entity.setTipTimeRef(Joiner.on(",").skipNulls().join(saveDTO.getTipTimeIds())); entity.setTipTimeRef(Joiner.on(",").skipNulls().join(saveDTO.getTipTimeIds()));
} else {
entity.setTipTimeRef(null);
} }
return entity; return entity;
} }