From fd6dca0c559c08129b7e0abdf67093b1a728ffd3 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 29 十一月 2024 17:21:00 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 15 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java index ef56751..197a1aa 100644 --- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java @@ -11,6 +11,7 @@ import com.smartor.mapper.IvrTaskTemplateMapper; import com.smartor.mapper.IvrTaskTemplateScriptMapper; import com.smartor.mapper.IvrTaskTemplateTargetoptionMapper; +import com.smartor.mapper.TemplateDeptMapper; import com.smartor.service.IIvrTaskTemplateService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -39,6 +40,9 @@ @Autowired private IvrTaskTemplateTargetoptionMapper ivrTaskTemplateTargetoptionMapper; + + @Autowired + private TemplateDeptMapper templateDeptMapper; /** * 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴� @@ -78,18 +82,23 @@ public int saveOrUpdateTempScript(IvrTaskTemplateVO ivrTaskTemplateVO) { Integer i = null; IvrTaskTemplate ivrTaskTemplate = DtoConversionUtils.sourceToTarget(ivrTaskTemplateVO, IvrTaskTemplate.class); + if (ivrTaskTemplateVO.getIsoperation() != null && ivrTaskTemplateVO.getIsoperation() == 1) { + //浼犺繃鏉ョ殑闈欓粯鏃堕棿鏄锛岄渶瑕佹敼鎴愭绉� + if (ivrTaskTemplate.getSilencetime() != null) + ivrTaskTemplate.setSilencetime(ivrTaskTemplate.getSilencetime() * 1000); + //鏂板 ivrTaskTemplate.setCreateTime(new Date()); insertIvrTaskTemplate(ivrTaskTemplate); - i = ivrTaskTemplate.getID().intValue(); + i = ivrTaskTemplate.getId().intValue(); } else if (ivrTaskTemplateVO.getIsoperation() != null && ivrTaskTemplateVO.getIsoperation() == 2) { //淇敼 ivrTaskTemplate.setUpdateTime(new Date()); updateIvrTaskTemplate(ivrTaskTemplate); - i = ivrTaskTemplate.getID().intValue(); + i = ivrTaskTemplate.getId().intValue(); } - log.info("鏂板闅忚浠诲姟闅忚妯℃澘鐨刬d涓猴細{}", ivrTaskTemplate.getID()); + log.info("鏂板闅忚浠诲姟闅忚妯℃澘鐨刬d涓猴細{}", ivrTaskTemplate.getId()); //瀵规ā鏉胯瘽鏈拰閫夐」杩涜澶勭悊锛堣瘽鏈〃涓庢寚鏍囪〃杩涜鍚堝苟浜嗭紝锛� if (CollectionUtils.isNotEmpty(ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList())) { @@ -97,14 +106,14 @@ for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()) { if (ivrTaskTemplateScriptVO.getIsoperation() != null) { IvrTaskTemplateScript ivrTaskTemplateScript = scriptHandle(ivrTaskTemplate, ivrTaskTemplateScriptVO, ivrTaskTemplateScriptVO.getIsoperation()); - dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID(), ivrTaskTemplateScriptVO.getIsoperation()); + dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getId(), ivrTaskTemplateScriptVO.getIsoperation()); } else { IvrTaskTemplateScript ivrTaskTemplateScript = scriptHandle(ivrTaskTemplate, ivrTaskTemplateScriptVO, ivrTaskTemplateVO.getIsoperation()); - dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID(), ivrTaskTemplateVO.getIsoperation()); + dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getId(), ivrTaskTemplateVO.getIsoperation()); } } } - return ivrTaskTemplate.getID().intValue(); + return ivrTaskTemplate.getId().intValue(); } @@ -128,6 +137,16 @@ */ @Override public int deleteIvrTaskTemplateByIDs(Long[] IDs) { + if (IDs[0] != null) { + IvrTaskTemplate ivrTaskTemplate = selectIvrTaskTemplateByID(IDs[0]); + if (StringUtils.isNotEmpty(ivrTaskTemplate.getLongTemp()) && ivrTaskTemplate.getLongTemp().equals("1")) { + //濡傛灉杩欎釜妯℃澘鏄暱鏈熶换鍔★紝鍒欓渶瑕佸垹闄ゆā鏉夸笌閮ㄩ棬鐨勫叧鑱� + TemplateDept templateDept = new TemplateDept(); + templateDept.setType(21L); + templateDept.setTempid(IDs[0]); + templateDeptMapper.deleteTemplateDeptByTemplateId(templateDept); + } + } return ivrTaskTemplateMapper.deleteIvrTaskTemplateByIDs(IDs); } @@ -168,15 +187,15 @@ //鏌ヨ璇濇湳 IvrTaskTemplateScript ivrTaskTemplateScript = new IvrTaskTemplateScript(); - ivrTaskTemplateScript.setTemplateID(ivrTaskTemplates.get(0).getID()); + ivrTaskTemplateScript.setTemplateID(ivrTaskTemplates.get(0).getId()); List<IvrTaskTemplateScript> ivrTaskTemplateScripts = ivrTaskTemplateScriptMapper.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript); List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScripts, IvrTaskTemplateScriptVO.class); //閫氳繃璇濇湳ID鑾峰彇閫夐」 for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOS) { - log.info("ivrLibaTemplateScriptVO鐨勪富閿甶d涓猴細{}", ivrTaskTemplateScriptVO.getID()); + log.info("ivrLibaTemplateScriptVO鐨勪富閿甶d涓猴細{}", ivrTaskTemplateScriptVO.getId()); IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption = new IvrTaskTemplateTargetoption(); - ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScriptVO.getID()); + ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScriptVO.getId()); List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateTargetoptionMapper.selectIvrTaskTemplateTargetoptionList(ivrTaskTemplateTargetoption); for (IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption1 : ivrTaskTemplateTargetoptions) { ObjectMapper mapper = new ObjectMapper(); @@ -211,24 +230,24 @@ if (isoperation == 1) { //鏂板 - ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID()); + ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getId()); ivrTaskTemplateScript.setCreateTime(new Date()); ivrTaskTemplateScriptMapper.insertIvrTaskTemplateScript(ivrTaskTemplateScript); ivrTaskTemplateScript.setIsoperation(1); } else if (isoperation == 2) { //淇敼 - ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID()); + ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getId()); ivrTaskTemplateScript.setUpdateTime(new Date()); ivrTaskTemplateScriptMapper.updateIvrTaskTemplateScript(ivrTaskTemplateScript); ivrTaskTemplateScript.setIsoperation(2); } else if (isoperation == 3) { //鍒犻櫎 - if (ivrTaskTemplateScriptVO.getID() == null) { + if (ivrTaskTemplateScriptVO.getId() == null) { log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖"); } else { ivrTaskTemplateScriptVO.setUpdateTime(new Date()); - ivrTaskTemplateScriptMapper.deleteIvrTaskTemplateScriptByID(ivrTaskTemplateScriptVO.getID()); + ivrTaskTemplateScriptMapper.deleteIvrTaskTemplateScriptByID(ivrTaskTemplateScriptVO.getId()); } } return ivrTaskTemplateScript; @@ -248,7 +267,7 @@ if (isoperation == 1) { //鏂板 ivrTaskTemplateTargetoption.setTemplateID(tmpID); - ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getID()); + ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getId()); if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getDynamiccruxs())) ivrTaskTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrTaskTemplateTargetoption.getDynamiccruxs())); if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getNodynamiccruxs())) @@ -257,7 +276,7 @@ } else if (isoperation == 2) { //淇敼 ivrTaskTemplateTargetoption.setTemplateID(tmpID); - ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getID()); + ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getId()); if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getDynamiccruxs())) ivrTaskTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrTaskTemplateTargetoption.getDynamiccruxs())); if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getNodynamiccruxs())) -- Gitblit v1.9.3