ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 10:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-10-31 11:05:27 +08:00
parent 441df5d936
commit 6ae89f7d59
1 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
modules/service/src/main/java/com/bytedesk/service/agent_settings/AgentSettingsRestService.java
View File

@@ -451,14 +451,21 @@ public class AgentSettingsRestService
if (entity.getDraftServiceSettings() != null) {
ServiceSettingsEntity published = entity.getServiceSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
ServiceSettingsEntity newPublished = new ServiceSettingsEntity();
modelMapper.map(entity.getDraftServiceSettings(), newPublished);
if (publishedUid != null) {
// 关键点：不要带入草稿的数据库主键 id，避免 Hibernate 认为同一 id 的两个不同实例同时被合并
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setServiceSettings(newPublished);
}
@@ -466,14 +473,20 @@ public class AgentSettingsRestService
if (entity.getDraftMessageLeaveSettings() != null) {
MessageLeaveSettingsEntity published = entity.getMessageLeaveSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
MessageLeaveSettingsEntity newPublished = new MessageLeaveSettingsEntity();
modelMapper.map(entity.getDraftMessageLeaveSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setMessageLeaveSettings(newPublished);
}
@@ -481,14 +494,20 @@ public class AgentSettingsRestService
if (entity.getDraftAutoReplySettings() != null) {
AutoReplySettingsEntity published = entity.getAutoReplySettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
AutoReplySettingsEntity newPublished = new AutoReplySettingsEntity();
modelMapper.map(entity.getDraftAutoReplySettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setAutoReplySettings(newPublished);
}
@@ -496,14 +515,20 @@ public class AgentSettingsRestService
if (entity.getDraftQueueSettings() != null) {
QueueSettingsEntity published = entity.getQueueSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
QueueSettingsEntity newPublished = new QueueSettingsEntity();
modelMapper.map(entity.getDraftQueueSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setQueueSettings(newPublished);
}
@@ -511,14 +536,20 @@ public class AgentSettingsRestService
if (entity.getDraftRateDownSettings() != null) {
RatedownSettingsEntity published = entity.getRateDownSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
RatedownSettingsEntity newPublished = new RatedownSettingsEntity();
modelMapper.map(entity.getDraftRateDownSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setRateDownSettings(newPublished);
}
@@ -526,14 +557,20 @@ public class AgentSettingsRestService
if (entity.getDraftInviteSettings() != null) {
InviteSettingsEntity published = entity.getInviteSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
InviteSettingsEntity newPublished = new InviteSettingsEntity();
modelMapper.map(entity.getDraftInviteSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setInviteSettings(newPublished);
}
@@ -541,14 +578,20 @@ public class AgentSettingsRestService
if (entity.getDraftIntentionSettings() != null) {
IntentionSettingsEntity published = entity.getIntentionSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
IntentionSettingsEntity newPublished = new IntentionSettingsEntity();
modelMapper.map(entity.getDraftIntentionSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setIntentionSettings(newPublished);
}
@@ -556,14 +599,20 @@ public class AgentSettingsRestService
if (entity.getDraftAgentStatusSettings() != null) {
AgentStatusSettingEntity published = entity.getAgentStatusSettings();
String publishedUid = (published != null) ? published.getUid() : null;
Long publishedId = (published != null) ? published.getId() : null;
int publishedVersion = (published != null) ? published.getVersion() : 0;
AgentStatusSettingEntity newPublished = new AgentStatusSettingEntity();
modelMapper.map(entity.getDraftAgentStatusSettings(), newPublished);
if (publishedUid != null) {
if (publishedId != null) {
newPublished.setId(publishedId);
newPublished.setUid(publishedUid);
newPublished.setVersion(publishedVersion);
} else {
newPublished.setId(null);
newPublished.setUid(uidUtils.getUid());
newPublished.setVersion(0);
}
entity.setAgentStatusSettings(newPublished);
}