From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java |   63 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
index f0e42de..0dce115 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
@@ -1,7 +1,12 @@
 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.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.IvrLibaScriptMapper;
 import com.smartor.mapper.IvrLibaScriptTagMapper;
@@ -86,13 +91,26 @@
         IvrLibaScriptTargetoption ivrLibaScriptTargetoption = new IvrLibaScriptTargetoption();
         ivrLibaScriptTargetoption.setScriptid(ivrLibaScripts.get(0).getId());
         List<IvrLibaScriptTargetoption> ivrLibaScriptTargetoptions = ivrLibaScriptTargetoptionMapper.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
+        for (IvrLibaScriptTargetoption ivrLibaScriptTargetoption1 : ivrLibaScriptTargetoptions) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            try {
+                if (StringUtils.isNotEmpty(ivrLibaScriptTargetoption1.getDynamiccruxsJson()))
+                    ivrLibaScriptTargetoption1.setDynamiccruxs(objectMapper.readValue(ivrLibaScriptTargetoption1.getDynamiccruxsJson(), List.class));
+                if (StringUtils.isNotEmpty(ivrLibaScriptTargetoption1.getNodynamiccruxsJson()))
+                    ivrLibaScriptTargetoption1.setNodynamiccruxs(objectMapper.readValue(ivrLibaScriptTargetoption1.getNodynamiccruxsJson(), List.class));
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+        }
+
+
         scriptVO.setIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoptions);
 
-        //鏌ヨ闂鎸囨爣鎺ュ彛
-        IvrLibaScriptTarget ivrLibaScriptTarget = new IvrLibaScriptTarget();
-        ivrLibaScriptTarget.setScriptid(ivrLibaScripts.get(0).getId());
-        List<IvrLibaScriptTarget> ivrLibaScriptTargets = ivrLibaScriptTargetMapper.selectIvrLibaScriptTargetList(ivrLibaScriptTarget);
-        scriptVO.setIvrLibaScriptTargetList(ivrLibaScriptTargets);
+//        //鏌ヨ闂鎸囨爣鎺ュ彛
+//        IvrLibaScriptTarget ivrLibaScriptTarget = new IvrLibaScriptTarget();
+//        ivrLibaScriptTarget.setScriptid(ivrLibaScripts.get(0).getId());
+//        List<IvrLibaScriptTarget> ivrLibaScriptTargets = ivrLibaScriptTargetMapper.selectIvrLibaScriptTargetList(ivrLibaScriptTarget);
+//        scriptVO.setIvrLibaScriptTargetList(ivrLibaScriptTargets);
 
         return scriptVO;
     }
@@ -115,32 +133,20 @@
             i = ivrLibaScriptMapper.updateIvrLibaScript(ivrLibaScript);
         }
         log.info("闂琛ㄥ搴旂殑id涓猴細{}", ivrLibaScript.getId());
-
-        //瀵归棶棰樻寚鏍囪繘琛屽鐞�
-        if (CollectionUtils.isNotEmpty(ivrLibaScriptVO.getIvrLibaScriptTargetList())) {
-            for (IvrLibaScriptTarget ivrLibaScriptTarget : ivrLibaScriptVO.getIvrLibaScriptTargetList()) {
-                if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 1) {
-                    //鏂板
-                    ivrLibaScriptTarget.setScriptid(ivrLibaScript.getId());
-                    ivrLibaScriptTargetMapper.insertIvrLibaScriptTarget(ivrLibaScriptTarget);
-                } else if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 2) {
-                    //淇敼
-                    ivrLibaScriptTarget.setScriptid(ivrLibaScript.getId());
-                    ivrLibaScriptTargetMapper.updateIvrLibaScriptTarget(ivrLibaScriptTarget);
-                } else if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 3) {
-                    //鍒犻櫎
-                    if (ivrLibaScriptTarget.getId() == null) {
-                        log.info("鍒犻櫎澶辫触,闂鎸囨爣id涓虹┖");
-                    } else {
-                        ivrLibaScriptTargetMapper.deleteIvrLibaScriptTargetByQuestionTargetID(ivrLibaScriptTarget.getId());
-                    }
-                }
-            }
+        if (ivrLibaScript.getId() == null) {
+            throw new BaseException("璇濇湳ID涓虹┖,璇锋鏌ヨ瘽鏈叆鍙備俊鎭槸鍚﹀畬鏁�");
         }
 
         //瀵归棶棰樻寚鏍囬�夐」杩涜澶勭悊
         if (CollectionUtils.isNotEmpty(ivrLibaScriptVO.getIvrLibaScriptTargetoptionList())) {
             for (IvrLibaScriptTargetoption ivrLibaScriptTargetoption : ivrLibaScriptVO.getIvrLibaScriptTargetoptionList()) {
+                if (CollectionUtils.isNotEmpty(ivrLibaScriptTargetoption.getNodynamiccruxs())) {
+                    ivrLibaScriptTargetoption.setNodynamiccruxsJson(new Gson().toJson(ivrLibaScriptTargetoption.getNodynamiccruxs()));
+                }
+                if (CollectionUtils.isNotEmpty(ivrLibaScriptTargetoption.getDynamiccruxs())) {
+                    ivrLibaScriptTargetoption.setDynamiccruxsJson(new Gson().toJson(ivrLibaScriptTargetoption.getDynamiccruxs()));
+                }
+
                 if (ivrLibaScriptTargetoption.getIsoperation() != null && ivrLibaScriptTargetoption.getIsoperation() == 1) {
                     //鏂板
                     ivrLibaScriptTargetoption.setScriptid(ivrLibaScript.getId());
@@ -156,7 +162,8 @@
                     if (ivrLibaScriptTargetoption.getId() == null) {
                         log.info("鍒犻櫎澶辫触,闂鎸囨爣閫夐」id涓虹┖");
                     } else {
-                        ivrLibaScriptTargetoptionMapper.deleteIvrLibaScriptTargetoptionByTargetoptionid(ivrLibaScriptTargetoption.getId());
+                        Boolean aBoolean = ivrLibaScriptTargetoptionMapper.deleteIvrLibaScriptTargetoptionByTargetoptionid(ivrLibaScriptTargetoption.getId());
+                        log.info("aBoolean鐨勫�间负:{}", aBoolean);
                     }
                 }
             }
@@ -185,8 +192,6 @@
                 }
             }
         }
-
-
         return i;
     }
 

--
Gitblit v1.9.3