From 0ff7a8f69570b3fc7418c35f3d6e273ef4f73f20 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 10:35:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index d851abe..ac7b3a5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -1,5 +1,7 @@
package com.smartor.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -18,9 +20,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
/**
* 鎸囨爣閫夐」搴揝ervice涓氬姟灞傚鐞�
@@ -67,6 +73,8 @@
List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetMapper.selectIvrLibaTargetList(ivrLibaTarget);
List<IvrLibaTargetVO> ivrLibaTargetVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargets, IvrLibaTargetVO.class);
for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
+ ivrLibaTarget1.setSuitWayList(JSONArray.parseArray(ivrLibaTarget1.getSuitWay(), String.class));
+
IvrLibaTargetoption ivrLibaTargetoption = new IvrLibaTargetoption();
ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getId());
//鑾峰彇璇ユ寚鏍囩殑閫夐」
@@ -86,8 +94,10 @@
ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
}
//鑾峰彇璇ユ寚鏍囩殑鏍囩
- List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getId());
- ivrLibaTarget1.setBaseTagList(baseTags);
+ IvrLibaTargetTag ivrLibaTargetTag =new IvrLibaTargetTag();
+ ivrLibaTargetTag.setTargetid(ivrLibaTarget1.getId());
+ List<IvrLibaTargetTag> ivrLibaTargetTags = ivrLibaTargetTagMapper.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+ ivrLibaTarget1.setIvrLibaTargetTagList(ivrLibaTargetTags);
}
//涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
// ivrLibaTargetMapper.targetInfo(ivrLibaTarget)
@@ -109,12 +119,8 @@
ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
//鏂板璇ユ寚鏍囧搴旂殑鏍囩淇℃伅
- for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
- IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
- ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
+ for (IvrLibaTargetTag ivrLibaTargetTag : ivrLibaTargetVO.getIvrLibaTargetTagList()) {
ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
- //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
- ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
}
@@ -140,6 +146,8 @@
@Transactional(rollbackFor = Exception.class)
public int saveOrupdateIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO) {
IvrLibaTarget ivrLibaTarget = DtoConversionUtils.sourceToTarget(ivrLibaTargetVO, IvrLibaTarget.class);
+ if (ObjectUtils.isNotEmpty(ivrLibaTargetVO.getSuitWayList()))
+ ivrLibaTarget.setSuitWay(JSON.toJSONString(ivrLibaTargetVO.getSuitWayList()));
ivrLibaTarget.setUpdateTime(DateUtils.getNowDate());
if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 1) {
//鏂板
@@ -149,21 +157,15 @@
ivrLibaTargetMapper.updateIvrLibaTarget(ivrLibaTarget);
}
- if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getBaseTagList())) {
- for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
- if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 1) {
+ if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getIvrLibaTargetTagList())) {
+ for (IvrLibaTargetTag ivrLibaTargetTag : ivrLibaTargetVO.getIvrLibaTargetTagList()) {
+ if (ivrLibaTargetTag.getId() == null) {
//鏂板
- IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
- ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
- //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
- ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
- } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 2) {
+ } else if (ivrLibaTargetTag.getId() != null) {
//鍓嶇椤甸潰搴旇娌℃湁淇敼
- } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 3) {
- //鍒犻櫎
- ivrLibaTargetTagMapper.deleteIvrLibaTargetTagById(baseTag.getTagid());
+ ivrLibaTargetTagMapper.updateIvrLibaTargetTag(ivrLibaTargetTag);
}
}
}
@@ -237,7 +239,7 @@
matcher2 = pattern2.matcher(ivrLibaTargetVO.getContent());
}
if (StringUtils.isNotEmpty(ivrLibaTargetoption.getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(ivrLibaTargetoption.getTargetregex()) && matcher.matches() || StringUtils.isEmpty(ivrLibaTargetoption.getTargetregex2()) && StringUtils.isNotEmpty(ivrLibaTargetoption.getTargetregex()) && matcher.matches()) {
- return ivrLibaTargetoption.getOptiondesc();
+ return ivrLibaTargetoption.getTargetvalue();
}
}
--
Gitblit v1.9.3