数据源日志接口完成

.idea/workspace.xml

@@ -4,18 +4,23 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="日志接口基本完成">
+    <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="数据源测试接口完成">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataClassControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataSourceControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataTaskControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDataTaskControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/CommonUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/QuartzJobUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/QuartzJobUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataSourceLogController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataClass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataClass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataTaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataTaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataSourceLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataSourceLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataClassService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataClassService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataSourceLogService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDataTaskService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -468,6 +473,7 @@
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
     &quot;spring.configuration.checksum&quot;: &quot;64bf9ba214eb006c40cb35e0f61a7d20&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
@@ -560,7 +566,9 @@
       <workItem from="1702254015850" duration="11814000" />
       <workItem from="1702279037484" duration="433000" />
       <workItem from="1702302748830" duration="227000" />
-      <workItem from="1702457243216" duration="4411000" />
+      <workItem from="1702457243216" duration="4859000" />
+      <workItem from="1702541098268" duration="6870000" />
+      <workItem from="1702611279930" duration="13344000" />
     </task>
     <task id="LOCAL-00001" summary="Default Changelist">
       <option name="closed" value="true" />
@@ -594,7 +602,39 @@
       <option name="project" value="LOCAL" />
       <updated>1702266412248</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="日志接口基本完成">
+      <option name="closed" value="true" />
+      <created>1702461954874</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1702461954874</updated>
+    </task>
+    <task id="LOCAL-00006" summary="日志接口基本完成">
+      <option name="closed" value="true" />
+      <created>1702461986919</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1702461986919</updated>
+    </task>
+    <task id="LOCAL-00007" summary="日志接口基本完成">
+      <option name="closed" value="true" />
+      <created>1702462016969</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1702462016969</updated>
+    </task>
+    <task id="LOCAL-00008" summary="数据源测试接口完成">
+      <option name="closed" value="true" />
+      <created>1702462088589</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1702462088589</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -708,8 +748,10 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Default Changelist" />
     <MESSAGE value="任务通过接口操作" />
+    <MESSAGE value="测试数据源连接接口完成" />
     <MESSAGE value="日志接口基本完成" />
-    <option name="LAST_COMMIT_MESSAGE" value="日志接口基本完成" />
+    <MESSAGE value="数据源测试接口完成" />
+    <option name="LAST_COMMIT_MESSAGE" value="数据源测试接口完成" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -724,16 +766,6 @@
           <line>10</line>
           <option name="timeStamp" value="21" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDataClassController.java</url>
-          <line>64</line>
-          <option name="timeStamp" value="22" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java</url>
-          <line>201</line>
-          <option name="timeStamp" value="24" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <pin-to-top-manager>

src/main/java/com/template/api/SmartDataClassControllerAPI.java

@@ -8,6 +8,8 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Author: binguo
  * @Date: 2023/3/30 星期四 17:28
@@ -19,11 +21,11 @@ import org.springframework.web.bind.annotation.*;
 public interface SmartDataClassControllerAPI {
     @PostMapping(value = "/insertSmartDataClass")
     @ApiOperation(value = "添加数据源类别", notes = "添加数据源类别数据", httpMethod = "POST")
-    CommonResult insertSmartDataClass(@Validated @RequestBody SmartDataClass smartDataClass, BindingResult bindingResult);
+    CommonResult insertSmartDataClass(@Validated @RequestBody SmartDataClass smartDataClass, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/updateSmartDataClassById")
     @ApiOperation(value = "编辑数据源类别数据", notes = "编辑数据源类别数据", httpMethod = "POST")
-    CommonResult updateSmartDataClassById(@Validated @RequestBody SmartDataClass smartDataClass, BindingResult bindingResult);
+    CommonResult updateSmartDataClassById(@Validated @RequestBody SmartDataClass smartDataClass, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageSmartDataClass")
     @ApiOperation(value = "数据源类别分页数据", notes = "数据源类别分页数据", httpMethod = "GET")
@@ -31,5 +33,5 @@ public interface SmartDataClassControllerAPI {
 
     @GetMapping(value = "/deleteSmartDataClassById")
     @ApiOperation(value = "根据ID删除指定数据源类别", notes = "根据ID删除指定数据源类别", httpMethod = "GET")
-    CommonResult deleteSmartDataClassById(@RequestParam int id);
+    CommonResult deleteSmartDataClassById(@RequestParam int id, HttpServletRequest httpServletRequest);
 }

src/main/java/com/template/api/SmartDataSourceControllerAPI.java

@@ -9,6 +9,8 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Author: binguo
  * @Date: 2023/3/30 星期四 17:28
@@ -20,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 public interface SmartDataSourceControllerAPI {
     @PostMapping(value = "/insertSmartDataSource")
     @ApiOperation(value = "添加数据源", notes = "添加数据源数据", httpMethod = "POST")
-    CommonResult insertSmartDataSource(@Validated @RequestBody SmartDataSource smartDataSource, BindingResult bindingResult);
+    CommonResult insertSmartDataSource(@Validated @RequestBody SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/vcoSmartDataSource")
     @ApiOperation(value = "测试数据源连接有效性", notes = "测试数据源连接有效性", httpMethod = "POST")
@@ -28,7 +30,7 @@ public interface SmartDataSourceControllerAPI {
 
     @PostMapping(value = "/updateSmartDataSourceById")
     @ApiOperation(value = "编辑数据源数据", notes = "编辑数据源数据", httpMethod = "POST")
-    CommonResult updateSmartDataSourceById(@Validated @RequestBody SmartDataSource smartDataSource, BindingResult bindingResult);
+    CommonResult updateSmartDataSourceById(@Validated @RequestBody SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageSmartDataSource")
     @ApiOperation(value = "数据源分页数据", notes = "数据源分页数据", httpMethod = "GET")
@@ -36,5 +38,5 @@ public interface SmartDataSourceControllerAPI {
 
     @GetMapping(value = "/deleteSmartDataSourceById")
     @ApiOperation(value = "根据ID删除指定数据源", notes = "根据ID删除指定数据源", httpMethod = "GET")
-    CommonResult deleteSmartDataSourceById(@RequestParam int id);
+    CommonResult deleteSmartDataSourceById(@RequestParam int id, HttpServletRequest httpServletRequest);
 }

src/main/java/com/template/api/SmartDataTaskControllerAPI.java

@@ -8,6 +8,8 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Author: binguo
  * @Date: 2023/3/30 星期四 17:28
@@ -19,35 +21,35 @@ import org.springframework.web.bind.annotation.*;
 public interface SmartDataTaskControllerAPI {
     @PostMapping(value = "/createJob")
     @ApiOperation(value = "创建定时任务", notes = "创建定时任务", httpMethod = "POST")
-    CommonResult createJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult createJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/pauseJob")
     @ApiOperation(value = "暂定定时任务", notes = "暂停定时任务", httpMethod = "POST")
-    CommonResult pauseJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult pauseJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/resumeJob")
     @ApiOperation(value = "恢复定时任务", notes = "恢复定时任务", httpMethod = "POST")
-    CommonResult resumeJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult resumeJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/updateJob")
     @ApiOperation(value = "修改定时任务", notes = "修改定时任务", httpMethod = "POST")
-    CommonResult updateJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult updateJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/deleteJob")
     @ApiOperation(value = "修改定时任务", notes = "修改定时任务", httpMethod = "POST")
-    CommonResult deleteJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult deleteJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/runOnceJob")
     @ApiOperation(value = "运行一次定时任务", notes = "运行一次定时任务", httpMethod = "POST")
-    CommonResult runOnceJob(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult runOnceJob(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/insertSmartDataTask")
     @ApiOperation(value = "添加数据源任务管理数据", notes = "添加数据源任务管理数据", httpMethod = "POST")
-    CommonResult insertSmartDataTask(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult insertSmartDataTask(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/updateSmartDataTaskById")
     @ApiOperation(value = "编辑数据源任务管理数据", notes = "编辑数据源任务管理数据", httpMethod = "POST")
-    CommonResult updateSmartDataTaskById(@Validated @RequestBody SmartDataTask smartDataTask, BindingResult bindingResult);
+    CommonResult updateSmartDataTaskById(@Validated @RequestBody SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageSmartDataTask")
     @ApiOperation(value = "数据源任务管理分页数据", notes = "数据源任务管理分页数据", httpMethod = "GET")
@@ -55,5 +57,5 @@ public interface SmartDataTaskControllerAPI {
 
     @GetMapping(value = "/deleteSmartDataTaskById")
     @ApiOperation(value = "根据ID删除数据源任务数据", notes = "根据ID删除数据源任务数据", httpMethod = "GET")
-    CommonResult deleteSmartDataTaskById(@RequestParam int id);
+    CommonResult deleteSmartDataTaskById(@RequestParam int id, HttpServletRequest httpServletRequest);
 }

src/main/java/com/template/common/utils/CommonUtil.java

@@ -1,5 +1,11 @@
 package com.template.common.utils;
 
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.interfaces.Claim;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.template.model.pojo.RepairAdmin;
+import com.template.model.pojo.SmartDataSourceLog;
+import com.template.model.result.CommonResult;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +24,8 @@ import java.util.*;
 public class CommonUtil {
     /**
      * 检测客户端参数
-     * @param code 状态码
+     *
+     * @param code   状态码
      * @param object 对象
      * @return 返回类型
      */
@@ -29,6 +36,36 @@ public class CommonUtil {
         return returnMap;
     }
 
+    public static SmartDataSourceLog generateLog(String str, HttpServletRequest httpServletRequest) {
+        String serverIp = null;
+        try {
+            serverIp = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+        String clientIp = httpServletRequest.getRemoteAddr();
+        String token = httpServletRequest.getHeader("Authorization");
+        String account;
+        if (token != null) {
+            Map<String, Claim> map = JWT.decode(token).getClaims();
+            account = map.get("account").asString();
+        } else {
+            account = "";
+        }
+
+        String[] splitArr = str.split("\\|");
+
+        SmartDataSourceLog smartDataSourceLog = new SmartDataSourceLog();
+        smartDataSourceLog.setLogActionName(splitArr[0]);
+        smartDataSourceLog.setLogActionHost(serverIp);
+        smartDataSourceLog.setLogActionModule(splitArr[1]);
+        smartDataSourceLog.setLogActionBusiness(splitArr[2]);
+        smartDataSourceLog.setLogActionPeople(account);
+        smartDataSourceLog.setLogActionRemote(clientIp);
+        smartDataSourceLog.setLogActionClass(splitArr[3]);
+        return smartDataSourceLog;
+    }
+
     /**
      * 获取ip
      *

src/main/java/com/template/common/utils/QuartzJobUtils.java

@@ -52,18 +52,18 @@ public class QuartzJobUtils {
      * @param scheduler 调度器
      * @param jobName   任务名称
      */
-    public static CommonResult pauseScheduleJob(Scheduler scheduler, String jobName) {
+    public static Map<String, Object> pauseScheduleJob(Scheduler scheduler, String jobName) {
         Map<String, Object> exists = exists(scheduler, jobName);
         if ("1".equals(exists.get("code"))) {
-            return CommonResult.fail((String) exists.get("msg"));
+            return exists;
         }
 
         JobKey jobKey = JobKey.jobKey(jobName);
         try {
             scheduler.pauseJob(jobKey);
-            return CommonResult.ok("定时任务【" + jobName + "】暂停成功！");
+            return CommonUtil.getReturnMap("0", "定时任务【" + jobName + "】暂停成功！");
         } catch (SchedulerException e) {
-            return CommonResult.ok("定时任务【" + jobName + "】暂停出错：" + e.getMessage());
+            return CommonUtil.getReturnMap("0", "定时任务【" + jobName + "】暂停出错：" + e.getMessage());
         }
     }
 
@@ -86,18 +86,18 @@ public class QuartzJobUtils {
      * @param scheduler 调度器
      * @param jobName   任务名称
      */
-    public static CommonResult resumeScheduleJob(Scheduler scheduler, String jobName) {
+    public static Map<String, Object> resumeScheduleJob(Scheduler scheduler, String jobName) {
         Map<String, Object> exists = exists(scheduler, jobName);
         if ("1".equals(exists.get("code"))) {
-            return CommonResult.fail((String) exists.get("msg"));
+            return exists;
         }
 
         JobKey jobKey = JobKey.jobKey(jobName);
         try {
             scheduler.resumeJob(jobKey);
-            return CommonResult.ok("定时任务【" + jobName + "】已恢复成功！");
+            return CommonUtil.getReturnMap("0", "定时任务【" + jobName + "】已恢复成功！");
         } catch (SchedulerException e) {
-            return CommonResult.ok("定时任务【" + jobName + "】恢复出错：" + e.getMessage());
+            return CommonUtil.getReturnMap("1", "定时任务【" + jobName + "】恢复出错：" + e.getMessage());
         }
     }
 
@@ -107,18 +107,18 @@ public class QuartzJobUtils {
      * @param scheduler 调度器
      * @param jobName   任务名称
      */
-    public static CommonResult runOnce(Scheduler scheduler, String jobName) {
+    public static Map<String, Object> runOnce(Scheduler scheduler, String jobName) {
         Map<String, Object> exists = exists(scheduler, jobName);
         if ("1".equals(exists.get("code"))) {
-            return CommonResult.fail((String) exists.get("msg"));
+            return exists;
         }
 
         JobKey jobKey = JobKey.jobKey(jobName);
         try {
             scheduler.triggerJob(jobKey);
-            return CommonResult.ok("定时任务【" + jobName + "】立即运行1次成功！");
+            return CommonUtil.getReturnMap("0","定时任务【" + jobName + "】立即运行1次成功！");
         } catch (SchedulerException e) {
-            return CommonResult.ok("定时任务【" + jobName + "】立即运行1次出错：" + e.getMessage());
+            return CommonUtil.getReturnMap("1","定时任务【" + jobName + "】立即运行1次出错：" + e.getMessage());
         }
     }
 
@@ -128,10 +128,10 @@ public class QuartzJobUtils {
      * @param scheduler     调度器
      * @param smartDataTask 定时任务信息类
      */
-    public static CommonResult updateScheduleJob(Scheduler scheduler, SmartDataTask smartDataTask) {
+    public static Map<String, Object> updateScheduleJob(Scheduler scheduler, SmartDataTask smartDataTask) {
         Map<String, Object> exists = exists(scheduler, smartDataTask.getTkName());
         if ("1".equals(exists.get("code"))) {
-            return CommonResult.fail((String) exists.get("msg"));
+            return exists;
         }
 
         try {
@@ -147,9 +147,9 @@ public class QuartzJobUtils {
                     .build();
             //重置对应的Job
             scheduler.rescheduleJob(triggerKey, trigger);
-            return CommonResult.ok("定时任务【" + smartDataTask.getTkName() + "】刷新成功！");
+            return CommonUtil.getReturnMap("0", "定时任务【" + smartDataTask.getTkName() + "】刷新成功！");
         } catch (SchedulerException e) {
-            return CommonResult.ok("定时任务【" + smartDataTask.getTkName() + "】刷新出错：" + e.getMessage());
+            return CommonUtil.getReturnMap("1", "定时任务【" + smartDataTask.getTkName() + "】刷新出错：" + e.getMessage());
         }
     }
 

src/main/java/com/template/controller/SmartDataClassController.java

@@ -3,19 +3,27 @@ package com.template.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.template.api.SmartDataClassControllerAPI;
+import com.template.common.utils.CommonUtil;
 import com.template.common.utils.paramUtils;
 import com.template.model.pojo.SmartDataClass;
 import com.template.model.pojo.SmartDataSource;
+import com.template.model.pojo.SmartDataSourceLog;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.SmartDataClassService;
+import com.template.services.SmartDataSourceLogService;
 import com.template.services.SmartDataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 /**
  * <p>
  * 数据源类别 前端控制器
@@ -32,6 +40,9 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
     @Autowired
     private SmartDataSourceService smartDataSourceService;
 
+    @Autowired
+    private SmartDataSourceLogService smartDataSourceLogService;
+
     /**
      * 新增 数据源分类
      *
@@ -40,7 +51,7 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
      * @return
      */
     @Override
-    public CommonResult insertSmartDataClass(SmartDataClass smartDataClass, BindingResult bindingResult) {
+    public CommonResult insertSmartDataClass(SmartDataClass smartDataClass, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -62,9 +73,18 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
             return CommonResult.fail("数据源分类名称和驱动有重复，新增失败！");
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("新增数据源分类|【数据交换中心】→【数据源分类管理】|新增【数据源分类】|create", httpServletRequest);
         int result = smartDataClassService.insertSmartDataClass(smartDataClass);
-
-        return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
+        if (result > 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok("添加成功");
+        } else {
+            smartDataSourceLog.setLogActionStatus(0);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.fail("添加失败");
+        }
     }
 
     /**
@@ -75,7 +95,7 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
      * @return
      */
     @Override
-    public CommonResult updateSmartDataClassById(SmartDataClass smartDataClass, BindingResult bindingResult) {
+    public CommonResult updateSmartDataClassById(SmartDataClass smartDataClass, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -97,8 +117,18 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
             return CommonResult.fail("数据源分类名称和驱动有重复，更新失败！");
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("修改数据源分类|【数据交换中心】→【数据源分类管理】|修改【数据源分类】|update", httpServletRequest);
         int result = smartDataClassService.updateSmartDataClass(smartDataClass);
-        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+        if (result > 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok("修改成功");
+        } else {
+            smartDataSourceLog.setLogActionStatus(0);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.fail("修改失败");
+        }
     }
 
     /**
@@ -118,7 +148,7 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
 
 
     @Override
-    public CommonResult deleteSmartDataClassById(int id) {
+    public CommonResult deleteSmartDataClassById(int id, HttpServletRequest httpServletRequest) {
 
         SmartDataClass data = smartDataClassService.getSmartById(id);
 
@@ -134,9 +164,18 @@ public class SmartDataClassController implements SmartDataClassControllerAPI {
             return CommonResult.fail("当前类别下有数据，不能删除，删除失败！");
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("删除数据源分类|【数据交换中心】→【数据源分类管理】|删除【数据源分类】|delete", httpServletRequest);
         int result = smartDataClassService.deleteSmartDataClassById(id);
-
-        return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+        if (result > 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok("删除成功");
+        } else {
+            smartDataSourceLog.setLogActionStatus(0);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.fail("删除失败");
+        }
     }
 }
 

src/main/java/com/template/controller/SmartDataSourceController.java

@@ -2,10 +2,13 @@ package com.template.controller;
 
 
 import com.template.api.SmartDataSourceControllerAPI;
+import com.template.common.utils.CommonUtil;
 import com.template.common.utils.paramUtils;
 import com.template.model.pojo.SmartDataSource;
+import com.template.model.pojo.SmartDataSourceLog;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.services.SmartDataSourceLogService;
 import com.template.services.SmartDataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -29,6 +33,9 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
     @Autowired
     private SmartDataSourceService smartDataSourceService;
 
+    @Autowired
+    private SmartDataSourceLogService smartDataSourceLogService;
+
     /**
      * 新增数据源
      * @param smartDataSource 数据源
@@ -36,17 +43,30 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
-    public CommonResult insertSmartDataSource(SmartDataSource smartDataSource, BindingResult bindingResult) {
+    public CommonResult insertSmartDataSource(SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("新增数据源|【数据交换中心】→【数据源管理】|新增【数据源】|create", httpServletRequest);
         Map<String, Object> result = smartDataSourceService.insertSmartDataSource(smartDataSource);
-
-        return Integer.parseInt((String) result.get("code")) == 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail((String) result.get("msg"));
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
+    /**
+     * 测试 数据源连接状态
+     * @param smartDataSource
+     * @param bindingResult
+     * @return
+     */
     @Override
     public CommonResult vcoSmartDataSource(SmartDataSource smartDataSource, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -66,15 +86,23 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
-    public CommonResult updateSmartDataSourceById(SmartDataSource smartDataSource, BindingResult bindingResult) {
+    public CommonResult updateSmartDataSourceById(SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        Map<String, Object> result = smartDataSourceService.updateSmartDataSource(smartDataSource);
 
-        return Integer.parseInt((String) result.get("code")) > 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail((String) result.get("msg"));
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("更新数据源|【数据交换中心】→【数据源管理】|更新【数据源】|update", httpServletRequest);
+        Map<String, Object> result = smartDataSourceService.updateSmartDataSource(smartDataSource);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     /**
@@ -93,7 +121,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
 
 
     @Override
-    public CommonResult deleteSmartDataSourceById(int id) {
+    public CommonResult deleteSmartDataSourceById(int id, HttpServletRequest httpServletRequest) {
 
         SmartDataSource data = smartDataSourceService.getSmartById(id);
 
@@ -101,9 +129,17 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
-        int result = smartDataSourceService.deleteSmartDataSourceById(id);
 
-        return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("删除数据源|【数据交换中心】→【数据源管理】|删除【数据源】|delete", httpServletRequest);
+        int result = smartDataSourceService.deleteSmartDataSourceById(id);
+        if (result > 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok("删除成功");
+        } else {
+            return CommonResult.fail("删除失败");
+        }
     }
 }
 

src/main/java/com/template/controller/SmartDataSourceLogController.java

@@ -60,6 +60,9 @@ public class SmartDataSourceLogController implements SmartDataSourceLogControlle
         if (smartDataSourceLog.getLogActionName() == null) {
             return CommonResult.fail("【操作名称】不能为空！");
         }
+        if (smartDataSourceLog.getLogActionStatus() == null) {
+            return CommonResult.fail("【操作状态】不能为空！");
+        }
 
         int result = smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
 
@@ -67,23 +70,6 @@ public class SmartDataSourceLogController implements SmartDataSourceLogControlle
     }
 
     /**
-     * 更新日志
-     * @param smartDataSourceLog 日志数据
-     * @param bindingResult
-     * @return
-     */
-//    @Override
-//    public CommonResult updateSmartDataSourceLogById(SmartDataSourceLog smartDataSourceLog, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            String st = paramUtils.getParamError(bindingResult);
-//            return CommonResult.fail(st);
-//        }
-//
-//        int result = smartDataSourceLogService.updateSmartDataSourceLog(smartDataSourceLog);
-//        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
-//    }
-
-    /**
      * 日志分页数据查询
      *
      * @param currentPage        当前页数
@@ -105,6 +91,24 @@ public class SmartDataSourceLogController implements SmartDataSourceLogControlle
     }
 
 
+    /**
+     * 更新日志
+     * @param smartDataSourceLog 日志数据
+     * @param bindingResult
+     * @return
+     */
+//    @Override
+//    public CommonResult updateSmartDataSourceLogById(SmartDataSourceLog smartDataSourceLog, BindingResult bindingResult) {
+//        if (bindingResult.hasErrors()) {
+//            String st = paramUtils.getParamError(bindingResult);
+//            return CommonResult.fail(st);
+//        }
+//
+//        int result = smartDataSourceLogService.updateSmartDataSourceLog(smartDataSourceLog);
+//        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+//    }
+
+
 //    @Override
 //    public CommonResult deleteSmartDataSourceLogById(int id) {
 //

src/main/java/com/template/controller/SmartDataTaskController.java

@@ -2,15 +2,19 @@ package com.template.controller;
 
 
 import com.template.api.SmartDataTaskControllerAPI;
+import com.template.common.utils.CommonUtil;
 import com.template.common.utils.paramUtils;
+import com.template.model.pojo.SmartDataSourceLog;
 import com.template.model.pojo.SmartDataTask;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.services.SmartDataSourceLogService;
 import com.template.services.SmartDataTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -27,65 +31,120 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     @Autowired
     private SmartDataTaskService smartDataTaskService;
 
+    @Autowired
+    private SmartDataSourceLogService smartDataSourceLogService;
 
     @Override
-    public CommonResult createJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult createJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        return smartDataTaskService.createJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("创建定时任务|【数据交换中心】→【数据源数据交换任务】|创建【定时任务】|create", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.createJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     @Override
-    public CommonResult pauseJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult pauseJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        return smartDataTaskService.pauseJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("暂停定时任务|【数据交换中心】→【数据源数据交换任务】|暂停【定时任务】|pause", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.pauseJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     @Override
-    public CommonResult resumeJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult resumeJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        return smartDataTaskService.resumeJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("恢复定时任务|【数据交换中心】→【数据源数据交换任务】|恢复【定时任务】|resume", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.resumeJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     @Override
-    public CommonResult updateJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult updateJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
-
-        return smartDataTaskService.updateJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("更新定时任务|【数据交换中心】→【数据源数据交换任务】|更新【定时任务】|update", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.updateJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     @Override
-    public CommonResult deleteJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult deleteJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        return smartDataTaskService.deleteJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("删除定时任务|【数据交换中心】→【数据源数据交换任务】|删除【定时任务】|delete", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.deleteJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     @Override
-    public CommonResult runOnceJob(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult runOnceJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        return smartDataTaskService.runOnceJob(smartDataTask);
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("执行1次定时任务|【数据交换中心】→【数据源数据交换任务】|执行1次【定时任务】|runOnce", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.runOnceJob(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     /**
@@ -96,15 +155,22 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
-    public CommonResult insertSmartDataTask(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult insertSmartDataTask(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("新增数据源数据交换任务|【数据交换中心】→【数据源数据交换任务】|新增【数据源数据交换任务】|create", httpServletRequest);
         Map<String, Object> result = smartDataTaskService.insertSmartDataTask(smartDataTask);
-
-        return Integer.parseInt((String) result.get("code")) > 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail((String) result.get("msg"));
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     /**
@@ -115,15 +181,23 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
-    public CommonResult updateSmartDataTaskById(SmartDataTask smartDataTask, BindingResult bindingResult) {
+    public CommonResult updateSmartDataTaskById(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        Map<String, Object> result = smartDataTaskService.updateSmartDataTaskById(smartDataTask);
 
-        return Integer.parseInt((String) result.get("code")) > 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail((String) result.get("msg"));
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("更新数据源数据交换任务|【数据交换中心】→【数据源数据交换任务】|更新【数据源数据交换任务】|update", httpServletRequest);
+        Map<String, Object> result = smartDataTaskService.updateSmartDataTaskById(smartDataTask);
+        if (Integer.parseInt((String) result.get("code")) == 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok(result.get("msg"));
+        } else {
+            return CommonResult.fail((String) result.get("msg"));
+        }
     }
 
     /**
@@ -148,7 +222,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
-    public CommonResult deleteSmartDataTaskById(int id) {
+    public CommonResult deleteSmartDataTaskById(int id, HttpServletRequest httpServletRequest) {
 
         SmartDataTask data = smartDataTaskService.getSmartById(id);
 
@@ -156,9 +230,16 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
+        SmartDataSourceLog smartDataSourceLog =
+                CommonUtil.generateLog("删除数据源数据交换任务|【数据交换中心】→【数据源数据交换任务】|删除【数据源数据交换任务】|delete", httpServletRequest);
         int result = smartDataTaskService.deleteSmartDataTaskById(id);
-
-        return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+        if (result > 0) {
+            smartDataSourceLog.setLogActionStatus(1);
+            smartDataSourceLogService.insertSmartDataSourceLog(smartDataSourceLog);
+            return CommonResult.ok("删除成功");
+        } else {
+            return CommonResult.fail("删除失败");
+        }
     }
 }
 

src/main/java/com/template/model/pojo/SmartDataSourceLog.java

@@ -54,6 +54,9 @@ public class SmartDataSourceLog implements Serializable {
     @ApiModelProperty(value = "操作类型：select login update delete create等")
     private String logActionClass;
 
+    @ApiModelProperty(value = "操作状态：1成功，0失败")
+    private Integer logActionStatus;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "操作日志创建时间")
     private Date logActionCreateTime;

src/main/java/com/template/services/SmartDataClassService.java

@@ -14,9 +14,9 @@ import com.template.model.result.PageUtils;
  * @since 2023-12-05
  */
 public interface SmartDataClassService extends IService<SmartDataClass> {
-    int insertSmartDataClass(SmartDataClass rns);
+    int insertSmartDataClass(SmartDataClass smartDataClass);
 
-    int updateSmartDataClass(SmartDataClass rns);
+    int updateSmartDataClass(SmartDataClass smartDataClass);
 
     PageUtils<SmartDataClass> queryPageSmartDataClasss(int currentPage, int pageCount, String name);
 

src/main/java/com/template/services/SmartDataSourceLogService.java

@@ -15,14 +15,14 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @since 2023-12-05
  */
 public interface SmartDataSourceLogService extends IService<SmartDataSourceLog> {
-    int insertSmartDataSourceLog(SmartDataSourceLog rns);
-
-//    int updateSmartDataSourceLog(SmartDataSourceLog rns);
+    int insertSmartDataSourceLog(SmartDataSourceLog smartDataSourceLog);
 
     PageUtils<SmartDataSourceLog> queryPageSmartDataSourceLogs(int currentPage, int pageCount,
                                                                String startTime,
                                                                String endTime, SmartDataSourceLog smartDataSourceLog);
 
+//    int updateSmartDataSourceLog(SmartDataSourceLog rns);
+
 //    int deleteSmartDataSourceLogById(int id);
 
     SmartDataSourceLog getSmartById(int id);

src/main/java/com/template/services/SmartDataTaskService.java

@@ -5,6 +5,7 @@ import com.template.model.pojo.SmartDataTask;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -26,15 +27,15 @@ public interface SmartDataTaskService extends IService<SmartDataTask> {
 
     SmartDataTask getSmartById(int id);
 
-    CommonResult createJob(SmartDataTask smartDataTask);
+    Map<String, Object> createJob(SmartDataTask smartDataTask);
 
-    CommonResult pauseJob(SmartDataTask smartDataTask);
+    Map<String, Object> pauseJob(SmartDataTask smartDataTask);
 
-    CommonResult resumeJob(SmartDataTask smartDataTask);
+    Map<String, Object> resumeJob(SmartDataTask smartDataTask);
 
-    CommonResult updateJob(SmartDataTask smartDataTask);
+    Map<String, Object> updateJob(SmartDataTask smartDataTask);
 
-    CommonResult deleteJob(SmartDataTask smartDataTask);
+    Map<String, Object> deleteJob(SmartDataTask smartDataTask);
 
-    CommonResult runOnceJob(SmartDataTask smartDataTask);
+    Map<String, Object> runOnceJob(SmartDataTask smartDataTask);
 }

src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java

@@ -92,9 +92,9 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
         // 必填的参数不为null，则进行新增操作
         int result = smartDataSourceMapper.insert(smartDataSource);
         if (result > 0) {
-            return CommonUtil.getReturnMap(String.valueOf(result), "数据源添加成功！");
+            return CommonUtil.getReturnMap("0", "数据源添加成功！");
         } else {
-            return CommonUtil.getReturnMap(String.valueOf(result), "数据源添加失败！");
+            return CommonUtil.getReturnMap("1", "数据源添加失败！");
         }
     }
 
@@ -102,35 +102,35 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
     public Map<String, Object> updateSmartDataSource(SmartDataSource smartDataSource) {
         // 检测参数，还有是否存在重复记录
         if (smartDataSource.getDsId() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源id】不能为空！");
         }
         SmartDataSource sdc = smartDataSourceMapper.selectById(smartDataSource.getDsId());
         if (sdc == null) {
-            return CommonUtil.getReturnMap("0", "要修改的【数据源】不存在！");
+            return CommonUtil.getReturnMap("1", "要修改的【数据源】不存在！");
         }
         // 检测必要参数是否为null
         if (smartDataSource.getDsClsId() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源类型id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源类型id】不能为空！");
         }
         SmartDataClass smartDataClass = smartDataClassMapper.selectById(smartDataSource.getDsClsId());
         if (smartDataClass == null) {
-            return CommonUtil.getReturnMap("0", "选择的【数据源类型】不存在！");
+            return CommonUtil.getReturnMap("1", "选择的【数据源类型】不存在！");
         }
 
         if (smartDataSource.getDsName() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源名称】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源名称】不能为空！");
         }
         if (smartDataSource.getDsUrl() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源连接地址】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源连接地址】不能为空！");
         }
         if (smartDataSource.getDsUser() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源用户】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源用户】不能为空！");
         }
         if (smartDataSource.getDsPassword() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源密码】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源密码】不能为空！");
         }
         if (smartDataSource.getDsDescrition() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源描述】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源描述】不能为空！");
         }
         QueryWrapper<SmartDataSource> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(smartDataSource.getDsId() != null, "ds_id", smartDataSource.getDsId());
@@ -143,14 +143,14 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
         queryWrapper.eq(StringUtils.hasText(smartDataSource.getDsDescrition()), "ds_descrition", smartDataSource.getDsDescrition());
         List<SmartDataSource> smartDataSources = smartDataSourceMapper.selectList(queryWrapper);
         if (smartDataSources.size() > 0) {
-            return CommonUtil.getReturnMap("0", "数据未修改，请修改后再提交！");
+            return CommonUtil.getReturnMap("1", "数据未修改，请修改后再提交！");
         }
 
         int result = smartDataSourceMapper.updateById(smartDataSource);
         if (result > 0) {
-            return CommonUtil.getReturnMap(String.valueOf(result), "数据源修改成功！");
+            return CommonUtil.getReturnMap("0", "数据源修改成功！");
         } else {
-            return CommonUtil.getReturnMap(String.valueOf(result), "数据源修改失败！");
+            return CommonUtil.getReturnMap("1", "数据源修改失败！");
         }
     }
 

src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java

@@ -9,6 +9,7 @@ import com.template.common.utils.QuartzJobUtils;
 import com.template.mapper.SmartDataSourceMapper;
 import com.template.mapper.SmartDataTaskMapper;
 import com.template.model.pojo.SmartDataSource;
+import com.template.model.pojo.SmartDataSourceLog;
 import com.template.model.pojo.SmartDataTask;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
@@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -47,36 +49,36 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
     public Map<String, Object> insertSmartDataTask(SmartDataTask smartDataTask) {
         // 检测参数，还有是否存在重复记录
         if (smartDataTask.getTkName() == null) {
-            return CommonUtil.getReturnMap("0", "【任务名称】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务名称】不能为空！");
         }
         QueryWrapper<SmartDataTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(smartDataTask.getTkName() != null, "tk_name", smartDataTask.getTkName());
         SmartDataTask sdt = smartDataTaskMapper.selectOne(queryWrapper);
         if (sdt != null) {
-            return CommonUtil.getReturnMap("0", "任务名有重名！");
+            return CommonUtil.getReturnMap("1", "任务名有重名！");
         }
         // 检测必要参数是否为null
         if (smartDataTask.getTkDsId() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源id】不能为空！");
         }
         SmartDataSource smartDataSource = smartDataSourceMapper.selectById(smartDataTask.getTkDsId());
         if (smartDataSource == null) {
-            return CommonUtil.getReturnMap("0", "选择的【数据源】不存在！");
+            return CommonUtil.getReturnMap("1", "选择的【数据源】不存在！");
         }
         if (smartDataTask.getTkCron() == null) {
-            return CommonUtil.getReturnMap("0", "【定时表达式】不能为空！");
+            return CommonUtil.getReturnMap("1", "【定时表达式】不能为空！");
         }
         if (CronExpression.isValidExpression(smartDataTask.getTkCron())) {
-            return CommonUtil.getReturnMap("0", "【定时表达式】不正确！");
+            return CommonUtil.getReturnMap("1", "【定时表达式】不正确！");
         }
         if (smartDataTask.getTkSql() == null) {
-            return CommonUtil.getReturnMap("0", "【任务sql】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务sql】不能为空！");
         }
         if (smartDataTask.getTkDescrition() == null) {
-            return CommonUtil.getReturnMap("0", "【任务描述】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务描述】不能为空！");
         }
         if (smartDataTask.getTkActivation() == null) {
-            return CommonUtil.getReturnMap("0", "【是否启用】不能为空！");
+            return CommonUtil.getReturnMap("1", "【是否启用】不能为空！");
         }
         queryWrapper.eq(smartDataTask.getTkDsId() != null, "tk_ds_id", smartDataTask.getTkDsId());
         queryWrapper.eq(StringUtils.hasText(smartDataTask.getTkCron()), "tk_cron", smartDataTask.getTkCron());
@@ -85,55 +87,55 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
         queryWrapper.eq(smartDataTask.getTkActivation() != null, "tk_activation", smartDataTask.getTkActivation());
         sdt = smartDataTaskMapper.selectOne(queryWrapper);
         if (sdt != null) {
-            return CommonUtil.getReturnMap("0", "有重复记录！");
+            return CommonUtil.getReturnMap("1", "有重复记录！");
         }
 
         int result = smartDataTaskMapper.insert(smartDataTask);
         if (result > 0) {
-            return CommonUtil.getReturnMap(String.valueOf(result), "任务添加成功！");
+            return CommonUtil.getReturnMap("0", "任务添加成功！");
         } else {
-            return CommonUtil.getReturnMap(String.valueOf(result), "任务添加失败！");
+            return CommonUtil.getReturnMap("1", "任务添加失败！");
         }
     }
 
     @Override
     public Map<String, Object> updateSmartDataTaskById(SmartDataTask smartDataTask) {
         if (smartDataTask.getTkId() == null) {
-            return CommonUtil.getReturnMap("0", "【任务id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务id】不能为空！");
         }
         if (smartDataTask.getTkName() == null) {
-            return CommonUtil.getReturnMap("0", "【任务名称】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务名称】不能为空！");
         }
         // 检测参数，还有是否存在重复记录
         List<SmartDataTask> smartDataSources = smartDataTaskMapper.isRepeatTaskName(smartDataTask);
         if (smartDataSources.size() > 0) {
-            return CommonUtil.getReturnMap("0", "任务名有重名！");
+            return CommonUtil.getReturnMap("1", "任务名有重名！");
         }
         SmartDataTask sdc = smartDataTaskMapper.selectById(smartDataTask.getTkId());
         if (sdc == null) {
-            return CommonUtil.getReturnMap("0", "要修改的【任务】不存在！");
+            return CommonUtil.getReturnMap("1", "要修改的【任务】不存在！");
         }
         if (smartDataTask.getTkDsId() == null) {
-            return CommonUtil.getReturnMap("0", "【数据源id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【数据源id】不能为空！");
         }
         SmartDataSource smartDataSource = smartDataSourceMapper.selectById(smartDataTask.getTkDsId());
         if (smartDataSource == null) {
-            return CommonUtil.getReturnMap("0", "选择的【数据源】不存在！");
+            return CommonUtil.getReturnMap("1", "选择的【数据源】不存在！");
         }
         if (smartDataTask.getTkCron() == null) {
-            return CommonUtil.getReturnMap("0", "【定时表达式】不能为空！");
+            return CommonUtil.getReturnMap("1", "【定时表达式】不能为空！");
         }
         if (CronExpression.isValidExpression(smartDataTask.getTkCron())) {
-            return CommonUtil.getReturnMap("0", "【定时表达式】不正确！");
+            return CommonUtil.getReturnMap("1", "【定时表达式】不正确！");
         }
         if (smartDataTask.getTkSql() == null) {
-            return CommonUtil.getReturnMap("0", "【任务sql】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务sql】不能为空！");
         }
         if (smartDataTask.getTkDescrition() == null) {
-            return CommonUtil.getReturnMap("0", "【任务描述】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务描述】不能为空！");
         }
         if (smartDataTask.getTkActivation() == null) {
-            return CommonUtil.getReturnMap("0", "【是否启动】不能为空！");
+            return CommonUtil.getReturnMap("1", "【是否启动】不能为空！");
         }
         QueryWrapper<SmartDataTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(smartDataTask.getTkId() != null, "tk_id", smartDataTask.getTkId());
@@ -145,28 +147,29 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
         queryWrapper.eq(smartDataTask.getTkActivation() != null, "tk_activation", smartDataTask.getTkActivation());
         SmartDataTask sdt = smartDataTaskMapper.selectOne(queryWrapper);
         if (sdt != null) {
-            return CommonUtil.getReturnMap("0", "数据未修改，请修改后再提交！");
+            return CommonUtil.getReturnMap("1", "数据未修改，请修改后再提交！");
         }
 
         int result = smartDataTaskMapper.updateById(smartDataTask);
         if (result > 0) {
-            return CommonUtil.getReturnMap(String.valueOf(result), "任务修改成功！");
+            return CommonUtil.getReturnMap("0", "任务修改成功！");
         } else {
-            return CommonUtil.getReturnMap(String.valueOf(result), "任务修改失败！");
+            return CommonUtil.getReturnMap("1", "任务修改失败！");
         }
     }
 
+    // 判断之前状态是否启用
     private Map<String, Object> updateSmartDataTaskActivation(SmartDataTask smartDataTask) {
         // 检测参数，还有是否存在重复记录
         if (smartDataTask.getTkId() == null) {
-            return CommonUtil.getReturnMap("0", "【任务id】不能为空！");
+            return CommonUtil.getReturnMap("1", "【任务id】不能为空！");
         }
         SmartDataTask sdc = smartDataTaskMapper.selectById(smartDataTask.getTkId());
         if (sdc == null) {
-            return CommonUtil.getReturnMap("0", "要修改的【任务】不存在！");
+            return CommonUtil.getReturnMap("1", "要修改的【任务】不存在！");
         }
         if (smartDataTask.getTkActivation() == null) {
-            return CommonUtil.getReturnMap("0", "【是否启用】不能为空！");
+            return CommonUtil.getReturnMap("1", "【是否启用】不能为空！");
         }
 
         int result = smartDataTaskMapper.updateById(smartDataTask);
@@ -174,9 +177,9 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
             return CommonUtil.getReturnMap(String.valueOf(result), "标注成功！");
         } else {
             if (smartDataTask.getTkActivation() == 1) {
-                return CommonUtil.getReturnMap(String.valueOf(result), "标注失败，之前已是启用状态！");
+                return CommonUtil.getReturnMap("0", "标注失败，之前已是启用状态！");
             } else {
-                return CommonUtil.getReturnMap(String.valueOf(result), "标注失败，之前已是启用状态！");
+                return CommonUtil.getReturnMap("1", "标注失败，之前已是启用状态！");
             }
         }
     }
@@ -221,10 +224,10 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
     }
 
     @Override
-    public CommonResult createJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> createJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");
@@ -239,17 +242,17 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
             } else {
                 msg = (String) returnMap.get("msg") + stringStringMap.get("msg");
             }
-            return CommonResult.ok(msg);
+            return CommonUtil.getReturnMap("0", msg);
         } else {
-            return CommonResult.fail((String) returnMap.get("msg"));
+            return returnMap;
         }
     }
 
     @Override
-    public CommonResult pauseJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> pauseJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");
@@ -258,10 +261,10 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
     }
 
     @Override
-    public CommonResult resumeJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> resumeJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");
@@ -270,10 +273,10 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
     }
 
     @Override
-    public CommonResult updateJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> updateJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");
@@ -282,10 +285,10 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
     }
 
     @Override
-    public CommonResult deleteJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> deleteJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");
@@ -301,17 +304,17 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
             } else {
                 msg = (String) returnMap.get("msg") + stringStringMap.get("msg");
             }
-            return CommonResult.ok(msg);
+            return CommonUtil.getReturnMap("0", msg);
         } else {
-            return CommonResult.fail((String) returnMap.get("msg"));
+            return CommonUtil.getReturnMap("1", returnMap.get("msg"));
         }
     }
 
     @Override
-    public CommonResult runOnceJob(SmartDataTask smartDataTask) {
+    public Map<String, Object> runOnceJob(SmartDataTask smartDataTask) {
         Map<String, Object> tmp_map = TaskNameValidator(smartDataTask);
         if ("1".equals(tmp_map.get("code"))) {
-            return CommonResult.fail((String) tmp_map.get("msg"));
+            return tmp_map;
         }
 
         SmartDataTask smartDataTask_return = (SmartDataTask) tmp_map.get("msg");