From 0dccef48a4863754bd6080511bdf9372c0004d78 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 四月 2024 11:05:55 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 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 53548bc..50b52cf 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -1,7 +1,11 @@
 package com.smartor.service.impl;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 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.IvrLibaTargetMapper;
 import com.smartor.mapper.IvrLibaTargetTagMapper;
@@ -37,12 +41,12 @@
     /**
      * 鏌ヨ鎸囨爣閫夐」搴�
      *
-     * @param targetID 鎸囨爣閫夐」搴撲富閿�
+     * @param id 鎸囨爣閫夐」搴撲富閿�
      * @return 鎸囨爣閫夐」搴�
      */
     @Override
-    public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID) {
-        return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(targetID);
+    public IvrLibaTarget selectIvrLibaTargetByTargetID(Long id) {
+        return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(id);
     }
 
     /**
@@ -62,14 +66,25 @@
         List<IvrLibaTargetVO> ivrLibaTargetVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargets, IvrLibaTargetVO.class);
         for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
             IvrLibaTargetoption ivrLibaTargetoption = new IvrLibaTargetoption();
-            ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getTargetID());
+            ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getId());
             //鑾峰彇璇ユ寚鏍囩殑閫夐」
             List<IvrLibaTargetoption> ivrLibaTargetoptions = ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
             if (CollectionUtils.isNotEmpty(ivrLibaTargetoptions)) {
+                for (IvrLibaTargetoption ivrLibaTargetoption1 : ivrLibaTargetoptions) {
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    try {
+                        if (StringUtils.isNotEmpty(ivrLibaTargetoption1.getDynamiccruxsJson()))
+                            ivrLibaTargetoption1.setDynamiccruxs(objectMapper.readValue(ivrLibaTargetoption1.getDynamiccruxsJson(), List.class));
+                        if (StringUtils.isNotEmpty(ivrLibaTargetoption1.getNodynamiccruxsJson()))
+                            ivrLibaTargetoption1.setNodynamiccruxs(objectMapper.readValue(ivrLibaTargetoption1.getNodynamiccruxsJson(), List.class));
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                    }
+                }
                 ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
             }
             //鑾峰彇璇ユ寚鏍囩殑鏍囩
-            List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getTargetID());
+            List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getId());
             ivrLibaTarget1.setBaseTagList(baseTags);
         }
         //涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
@@ -95,7 +110,7 @@
         for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
             IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
             ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
-            ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+            ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
             //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
             ivrLibaTargetTag.setTagid(baseTag.getTagid());
             ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
@@ -105,12 +120,12 @@
         for (IvrLibaTargetoption targetoption : ivrLibaTargetVO.getTargetoptionList()) {
             if (ObjectUtils.isEmpty(targetoption)) continue;
             log.info("targetoption鐨勬暟鎹负锛歿}", targetoption);
-            targetoption.setTargetid(ivrLibaTarget.getTargetID());
+            targetoption.setTargetid(ivrLibaTarget.getId());
             ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(targetoption);
         }
 
-        log.info("鎸囨爣id涓猴細{}", ivrLibaTarget.getTargetID().intValue());
-        return ivrLibaTarget.getTargetID().intValue();
+        log.info("鎸囨爣id涓猴細{}", ivrLibaTarget.getId().intValue());
+        return ivrLibaTarget.getId().intValue();
     }
 
     /**
@@ -138,7 +153,7 @@
                     //鏂板
                     IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
                     ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
-                    ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+                    ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
                     //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
                     ivrLibaTargetTag.setTagid(baseTag.getTagid());
                     ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
@@ -152,9 +167,16 @@
         }
         if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList())) {
             for (IvrLibaTargetoption ivrLibaTargetoption : ivrLibaTargetVO.getTargetoptionList()) {
+                if (CollectionUtils.isNotEmpty(ivrLibaTargetoption.getNodynamiccruxs())) {
+                    ivrLibaTargetoption.setNodynamiccruxsJson(new Gson().toJson(ivrLibaTargetoption.getNodynamiccruxs()));
+                }
+                if (CollectionUtils.isNotEmpty(ivrLibaTargetoption.getDynamiccruxs())) {
+                    ivrLibaTargetoption.setDynamiccruxsJson(new Gson().toJson(ivrLibaTargetoption.getDynamiccruxs()));
+                }
+
                 if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 1) {
                     //鏂板
-                    ivrLibaTargetoption.setTargetid(ivrLibaTarget.getTargetID());
+                    ivrLibaTargetoption.setTargetid(ivrLibaTarget.getId());
                     ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(ivrLibaTargetoption);
                 } else if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 2) {
                     //淇敼
@@ -167,29 +189,27 @@
             }
         }
 
-        return ivrLibaTarget.getTargetID().intValue();
+        return ivrLibaTarget.getId().intValue();
     }
 
 
     /**
      * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
      *
-     * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs) {
-        return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(targetIDs);
+    public int deleteIvrLibaTargetByTargetIDs(Long[] ids) {
+        return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(ids);
     }
 
     /**
      * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
      *
-     * @param targetID 鎸囨爣閫夐」搴撲富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deleteIvrLibaTargetByTargetID(Long targetID) {
-        return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(targetID);
+    public int deleteIvrLibaTargetByTargetID(Long id) {
+        return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(id);
     }
 }

--
Gitblit v1.9.3