From fdf1b9c1e4489a0c2615fa596268b2f71fad7b4c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 四月 2024 09:08:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
index 62649a3..e3957bc 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
@@ -1,8 +1,13 @@
package com.smartor.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import com.smartor.service.IIvrLibaTemplateService;
@@ -11,7 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import java.util.*;
/**
* 妯℃澘搴揝ervice涓氬姟灞傚鐞�
@@ -124,10 +129,14 @@
IvrLibaTemplate ivrLibaTemplate = DtoConversionUtils.sourceToTarget(ivrLibaTemplateVO, IvrLibaTemplate.class);
if (ivrLibaTemplateVO.getIsoperation() != null && ivrLibaTemplateVO.getIsoperation() == 1) {
//鏂板
- i = ivrLibaTemplateMapper.insertIvrLibaTemplate(ivrLibaTemplate);
+ ivrLibaTemplate.setCreateTime(new Date());
+ ivrLibaTemplateMapper.insertIvrLibaTemplate(ivrLibaTemplate);
+ i = ivrLibaTemplate.getID().intValue();
} else if (ivrLibaTemplateVO.getIsoperation() != null && ivrLibaTemplateVO.getIsoperation() == 2) {
//淇敼
- i = ivrLibaTemplateMapper.updateIvrLibaTemplate(ivrLibaTemplate);
+ ivrLibaTemplate.setUpdateTime(new Date());
+ ivrLibaTemplateMapper.updateIvrLibaTemplate(ivrLibaTemplate);
+ i = ivrLibaTemplate.getID().intValue();
}
log.info("鏂板鎴栦慨鏀规ā鏉胯鎯呯殑id涓猴細{}", ivrLibaTemplate.getID());
@@ -137,16 +146,19 @@
if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 1) {
//鏂板
ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getID());
+ ivrLibaTemplateTag.setCreateTime(new Date());
ivrLibaTemplateTagMapper.insertIvrLibaTemplateTag(ivrLibaTemplateTag);
} else if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 2) {
//淇敼
ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getID());
+ ivrLibaTemplateTag.setUploadTime(new Date());
ivrLibaTemplateTagMapper.updateIvrLibaTemplateTag(ivrLibaTemplateTag);
} else if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 3) {
//鍒犻櫎
if (ivrLibaTemplateTag.getId() == null) {
log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣id涓虹┖");
} else {
+ ivrLibaTemplateTag.setUploadTime(new Date());
ivrLibaTemplateTagMapper.deleteIvrLibaTemplateTagById(ivrLibaTemplateTag.getId());
}
}
@@ -160,24 +172,27 @@
//鏂板
IvrLibaTemplateScript ivrLibaTemplateScript = DtoConversionUtils.sourceToTarget(ivrLibaTemplateScriptVO, IvrLibaTemplateScript.class);
ivrLibaTemplateScript.setTemplateID(ivrLibaTemplate.getID());
+ ivrLibaTemplateScript.setCreateTime(new Date());
ivrLibaTemplateScriptMapper.insertIvrLibaTemplateScript(ivrLibaTemplateScript);
//瀵归�夐」鐩繘琛屽鐞�
- dealOption(ivrLibaTemplateScriptVO.getIvrLibaTemplateTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
+ dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
} else if (ivrLibaTemplateScriptVO.getIsoperation() != null && ivrLibaTemplateScriptVO.getIsoperation() == 2) {
//淇敼
IvrLibaTemplateScript ivrLibaTemplateScript = DtoConversionUtils.sourceToTarget(ivrLibaTemplateScriptVO, IvrLibaTemplateScript.class);
ivrLibaTemplateScript.setTemplateID(ivrLibaTemplate.getID());
+ ivrLibaTemplateScript.setUpdateTime(new Date());
ivrLibaTemplateScriptMapper.updateIvrLibaTemplateScript(ivrLibaTemplateScript);
//瀵归�夐」鐩繘琛屽鐞�
- dealOption(ivrLibaTemplateScriptVO.getIvrLibaTemplateTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
+ dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
} else if (ivrLibaTemplateScriptVO.getIsoperation() != null && ivrLibaTemplateScriptVO.getIsoperation() == 3) {
//鍒犻櫎
if (ivrLibaTemplateScriptVO.getID() == null) {
log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
} else {
- ivrLibaTemplateTagMapper.deleteIvrLibaTemplateTagById(ivrLibaTemplateScriptVO.getID());
+ ivrLibaTemplateScriptVO.setUpdateTime(new Date());
+ ivrLibaTemplateScriptMapper.deleteIvrLibaTemplateScriptByID(ivrLibaTemplateScriptVO.getID());
}
}
}
@@ -189,8 +204,10 @@
//鏂板
tempDetpRelevance.setTempid(ivrLibaTemplate.getID());
tempDetpRelevance.setType(2L);
+ tempDetpRelevance.setCreateTime(new Date());
tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
} else {
+ tempDetpRelevance.setUpdateTime(new Date());
tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
}
}
@@ -206,20 +223,27 @@
* @param tmpID
*/
private void dealOption(List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList, IvrLibaTemplateScript ivrLibaTemplateScript, Long tmpID) {
+ log.info("ivrLibaTemplateScript鐨勫�间负锛歿}", ivrLibaTemplateScript);
//瀵规ā鏉挎寚鏍囬�夐」杩涜澶勭悊
if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoptionList)) {
for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption : ivrLibaTemplateTargetoptionList) {
if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 1) {
//鏂板
ivrLibaTemplateTargetoption.setTemplateID(tmpID);
- ivrLibaTemplateTargetoption.setTargetid(ivrLibaTemplateScript.getTargetid());
- ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getScriptid());
+ ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
+ if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getDynamiccruxs()))
+ ivrLibaTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getDynamiccruxs()));
+ if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getNodynamiccruxs()))
+ ivrLibaTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getNodynamiccruxs()));
ivrLibaTemplateTargetOptionMapper.insertIvrLibaTemplateTargetoption(ivrLibaTemplateTargetoption);
} else if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 2) {
//淇敼
ivrLibaTemplateTargetoption.setTemplateID(tmpID);
- ivrLibaTemplateTargetoption.setTargetid(ivrLibaTemplateScript.getTargetid());
- ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getScriptid());
+ ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
+ if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getDynamiccruxs()))
+ ivrLibaTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getDynamiccruxs()));
+ if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getNodynamiccruxs()))
+ ivrLibaTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getNodynamiccruxs()));
ivrLibaTemplateTargetOptionMapper.updateIvrLibaTemplateTargetoption(ivrLibaTemplateTargetoption);
} else if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 3) {
//鍒犻櫎
@@ -268,9 +292,28 @@
IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getID());
List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptions = ivrLibaTemplateTargetOptionMapper.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
- ivrLibaTemplateScriptVO.setIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoptions);
- }
+ for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption1 : ivrLibaTemplateTargetoptions) {
+ ObjectMapper mapper = new ObjectMapper();
+ if (!StringUtils.isEmpty(ivrLibaTemplateTargetoption1.getDynamiccruxsJson())) {
+ try {
+ ivrLibaTemplateTargetoption1.setDynamiccruxs(mapper.readValue(ivrLibaTemplateTargetoption1.getDynamiccruxsJson(), List.class));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
+ if (!StringUtils.isEmpty(ivrLibaTemplateTargetoption1.getNodynamiccruxsJson())) {
+ try {
+ ivrLibaTemplateTargetoption1.setNodynamiccruxs(mapper.readValue(ivrLibaTemplateTargetoption1.getNodynamiccruxsJson(), List.class));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ ivrLibaTemplateScriptVO.setIvrLibaScriptTargetoptionList(ivrLibaTemplateTargetoptions);
+ }
+ Collections.sort(ivrLibaTemplateScriptVOS, Comparator.comparing(IvrLibaTemplateScriptVO::getTargetid));
//鏁版嵁缁勮
templateVO.setIvrLibaTemplateTagList(ivrLibaTemplateTags);
templateVO.setIvrLibaTemplateScriptVOList(ivrLibaTemplateScriptVOS);
--
Gitblit v1.9.3