fix(actionConfig): json对象解析失败

admin/src/main/java/com/dcs/hnyz/cache/builder/ActionCacheBuilder.java

@@ -1,5 +1,6 @@
 package com.dcs.hnyz.cache.builder;
 
+import com.dcs.common.enums.GeneralStatus;
 import com.dcs.hnyz.cache.CacheCenter;
 import com.dcs.hnyz.domain.bo.CachedAction;
 import com.dcs.hnyz.domain.condition.Condition;
@@ -64,6 +65,15 @@ public class ActionCacheBuilder {
 
     //缓存更新方法
     public void updateCache(ActionConfig config) {
+        if(config.getTriggerCondition()==null){//仅修改动作配置的启用状态
+            if(GeneralStatus.DISABLE.getCode().equals(config.getStatus())){
+                cachedActionMap.remove(config.getActionId());
+                return;
+            }else {
+                config=actionConfigMapper.selectById(config.getActionId());
+            }
+        }
+
         Condition condition = null;
         try {
             condition = ConditionParser.fromJsonString(config.getTriggerCondition());

admin/src/main/java/com/dcs/hnyz/controller/ActionBindingController.java

@@ -84,7 +84,7 @@ public class ActionBindingController extends BaseController
     @Log(title = "动作关联管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增动作关联管理")
-    public AjaxResult add(@ApiParam(name = "动作关联对象",value = "动作关联对象") ActionBinding actionBinding)
+    public AjaxResult add(@RequestBody ActionBinding actionBinding)
     {
         return toAjax(actionBindingService.insertActionBinding(actionBinding));
     }
@@ -96,7 +96,7 @@ public class ActionBindingController extends BaseController
     @Log(title = "动作关联管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改动作关联管理")
-    public AjaxResult edit(@ApiParam(name = "动作关联对象",value = "动作关联对象") ActionBinding actionBinding)
+    public AjaxResult edit(@RequestBody ActionBinding actionBinding)
     {
         return toAjax(actionBindingService.updateActionBinding(actionBinding));
     }
@@ -119,7 +119,7 @@ public class ActionBindingController extends BaseController
     @PreAuthorize("@ss.hasPermi('hnyz:actionBinding:edit')")
     @Log(title = "动作关联管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(ActionBinding actionBinding){
+    public AjaxResult changeStatus(@RequestBody ActionBinding actionBinding){
         return toAjax(actionBindingService.changeStatus(actionBinding));
     }
 }

admin/src/main/java/com/dcs/hnyz/controller/ActionConfigController.java

@@ -83,7 +83,7 @@ public class ActionConfigController extends BaseController
     @Log(title = "动作配置管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增动作配置管理", notes = "新增动作配置管理")
-    public AjaxResult add(@ApiParam(name = "动作配置相关参数",value = "动作配置对象") ActionConfig actionConfig)
+    public AjaxResult add(@RequestBody ActionConfig actionConfig)
     {
         return toAjax(actionConfigService.insertActionConfig(actionConfig));
     }
@@ -95,7 +95,7 @@ public class ActionConfigController extends BaseController
     @Log(title = "动作配置管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改动作配置管理", notes = "修改动作配置管理")
-    public AjaxResult edit(@ApiParam(name = "动作配置相关参数",value = "动作配置对象") ActionConfig actionConfig)
+    public AjaxResult edit(@RequestBody ActionConfig actionConfig)
     {
         return toAjax(actionConfigService.updateActionConfig(actionConfig));
     }

ui/src/api/hnyz/actionBinding.js

@@ -22,7 +22,7 @@ export function addActionBinding(data) {
   return request({
     url: '/hnyz/actionBinding',
     method: 'post',
-    params: data
+    data: data
   })
 }
 
@@ -31,7 +31,7 @@ export function updateActionBinding(data) {
   return request({
     url: '/hnyz/actionBinding',
     method: 'put',
-    params: data
+    data: data
   })
 }
 
@@ -52,6 +52,6 @@ export function changeStatus(id, status) {
   return request({
     url: '/hnyz/actionBinding/changeStatus',
     method: 'put',
-    params: data
+    data: data
   })
 }

ui/src/api/hnyz/actionConfig.js

@@ -22,7 +22,7 @@ export function addActionConfig(data) {
   return request({
     url: '/hnyz/actionConfig',
     method: 'post',
-    params: data
+    data: data
   })
 }
 
@@ -31,7 +31,7 @@ export function updateActionConfig(data) {
   return request({
     url: '/hnyz/actionConfig',
     method: 'put',
-    params: data
+    data: data
   })
 }