From 0d2f8d8ca4299bb4244bbbf9a177146285bf5d06 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 28 Dec 2023 09:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java | 3 +++ .../com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java | 1 + .../java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java index e44486a..ef81a44 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java @@ -1,5 +1,6 @@ package com.hz.pm.api.meeting.entity.dto; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.time.LocalTime; @@ -15,8 +16,10 @@ import java.time.LocalTime; @Data public class InviteCallIgnoreTimeContentDTO { + @JSONField(format = "HH:mm") private LocalTime startTime; + @JSONField(format = "HH:mm") private LocalTime stopTime; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java index 2e879f0..d73b1d9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java @@ -29,6 +29,7 @@ public class MeetingSettingsSaveReq { @ApiModelProperty("仅做参数展示") private SettingsContentPackageDTO settingsContentPackage; + @Data public static class SettingsContentPackageDTO { @ApiModelProperty("专家邀请免打扰时段设置") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java index 5f6218f..adcd083 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java @@ -42,7 +42,7 @@ public class MeetingSettingsManage { MeetingSettingsSaveReq result = new MeetingSettingsSaveReq(); result.setEnable(settings.getEnable()); result.setSettingsType(settings.getSettingsType()); - result.setSettingsContent(settings.getSettingsContent()); + result.setSettingsContent(JSONUtil.parseObj(settings.getSettingsContent())); return result; } @@ -50,10 +50,10 @@ public class MeetingSettingsManage { MeetingSettings settings = getBySettingsType(req.getSettingsType()); if (settings == null) { settings = new MeetingSettings(); - settings.setSettingsContent(req.getSettingsType().name()); - settings.setEnable(req.getEnable()); - settings.setSettingsContent(JSONUtil.toJsonStr(req.getSettingsContent())); } + settings.setSettingsType(req.getSettingsType()); + settings.setEnable(req.getEnable()); + settings.setSettingsContent(JSONUtil.toJsonStr(req.getSettingsContent())); meetingSettingsService.saveOrUpdate(settings); }