开源版新增规则脚本

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/SceneController.java

@@ -0,0 +1,126 @@
+package com.fastbee.data.controller;
+
+import com.fastbee.common.annotation.Log;
+import com.fastbee.common.core.controller.BaseController;
+import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.common.core.domain.model.LoginUser;
+import com.fastbee.common.core.page.TableDataInfo;
+import com.fastbee.common.enums.BusinessType;
+import com.fastbee.common.utils.poi.ExcelUtil;
+import com.fastbee.iot.domain.Scene;
+import com.fastbee.iot.service.ISceneService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 场景联动Controller
+ *
+ * @author kerwincui
+ * @date 2022-01-13
+ */
+@Api(tags = "场景联动")
+@RestController
+@RequestMapping("/iot/scene")
+public class SceneController extends BaseController
+{
+    @Autowired
+    private ISceneService sceneService;
+
+    /**
+     * 查询场景联动列表
+     */
+    @ApiOperation("查询场景联动列表")
+    @PreAuthorize("@ss.hasPermi('iot:scene:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Scene scene)
+    {
+        startPage();
+        List<Scene> list = sceneService.selectSceneList(scene);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出场景联动列表
+     */
+    @ApiOperation("导出场景联动列表")
+    @PreAuthorize("@ss.hasPermi('iot:scene:export')")
+    @Log(title = "场景联动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Scene scene)
+    {
+        List<Scene> list = sceneService.selectSceneList(scene);
+        ExcelUtil<Scene> util = new ExcelUtil<Scene>(Scene.class);
+        util.exportExcel(response, list, "场景联动数据");
+    }
+
+    /**
+     * 获取场景联动详细信息
+     */
+    @ApiOperation("获取场景联动详细信息")
+    @PreAuthorize("@ss.hasPermi('iot:scene:query')")
+    @GetMapping(value = "/{sceneId}")
+    public AjaxResult getInfo(@PathVariable("sceneId") Long sceneId)
+    {
+        return AjaxResult.success(sceneService.selectSceneBySceneId(sceneId));
+    }
+
+    /**
+     * 新增场景联动
+     */
+    @ApiOperation("新增场景联动")
+    @PreAuthorize("@ss.hasPermi('iot:scene:add')")
+    @Log(title = "场景联动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Scene scene)
+    {
+        LoginUser loginUser = getLoginUser();
+        if (loginUser == null || loginUser.getUser() == null) {
+            return error("请登录后重试！");
+        }
+        scene.setUserId(loginUser.getUser().getUserId());
+        scene.setUserName(loginUser.getUser().getUserName());
+        return toAjax(sceneService.insertScene(scene));
+    }
+
+    /**
+     * 修改场景联动
+     */
+    @ApiOperation("修改场景联动")
+    @PreAuthorize("@ss.hasPermi('iot:scene:edit')")
+    @Log(title = "场景联动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Scene scene)
+    {
+        return toAjax(sceneService.updateScene(scene));
+    }
+
+    /**
+     * 删除场景联动
+     */
+    @ApiOperation("删除场景联动")
+    @PreAuthorize("@ss.hasPermi('iot:scene:remove')")
+    @Log(title = "场景联动", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{sceneIds}")
+    public AjaxResult remove(@PathVariable Long[] sceneIds)
+    {
+        return toAjax(sceneService.deleteSceneBySceneIds(sceneIds));
+    }
+
+    /**
+     * 修改场景联动状态
+     */
+    @ApiOperation("修改场景联动状态")
+    @PreAuthorize("@ss.hasPermi('iot:scene:edit')")
+    @Log(title = "场景联动", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateStatus")
+    public AjaxResult updateStatus(@RequestBody Scene scene)
+    {
+        return toAjax(sceneService.updateStatus(scene));
+    }
+}

springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/ScriptController.java

@@ -0,0 +1,107 @@
+package com.fastbee.data.controller;
+
+import com.fastbee.common.annotation.Log;
+import com.fastbee.common.core.controller.BaseController;
+import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.common.core.page.TableDataInfo;
+import com.fastbee.common.enums.BusinessType;
+import com.fastbee.common.utils.poi.ExcelUtil;
+import com.fastbee.iot.domain.Script;
+import com.fastbee.iot.service.IScriptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 规则引擎脚本Controller
+ *
+ * @author lizhuangpeng
+ * @date 2023-07-01
+ */
+@RestController
+@RequestMapping("/iot/script")
+public class ScriptController extends BaseController
+{
+    @Autowired
+    private IScriptService scriptService;
+
+    /**
+     * 查询规则引擎脚本列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Script ruleScript)
+    {
+        startPage();
+        List<Script> list = scriptService.selectRuleScriptList(ruleScript);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出规则引擎脚本列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:export')")
+    @Log(title = "规则引擎脚本", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Script ruleScript)
+    {
+        List<Script> list = scriptService.selectRuleScriptList(ruleScript);
+        ExcelUtil<Script> util = new ExcelUtil<Script>(Script.class);
+        util.exportExcel(response, list, "规则引擎脚本数据");
+    }
+
+    /**
+     * 获取规则引擎脚本详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:query')")
+    @GetMapping(value = "/{scriptId}")
+    public AjaxResult getInfo(@PathVariable("scriptId") String scriptId)
+    {
+        return success(scriptService.selectRuleScriptById(scriptId));
+    }
+
+    /**
+     * 新增规则引擎脚本
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:add')")
+    @Log(title = "规则引擎脚本", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Script ruleScript)
+    {
+        return toAjax(scriptService.insertRuleScript(ruleScript));
+    }
+
+    /**
+     * 修改规则引擎脚本
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:edit')")
+    @Log(title = "规则引擎脚本", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Script ruleScript)
+    {
+        return toAjax(scriptService.updateRuleScript(ruleScript));
+    }
+
+    /**
+     * 删除规则引擎脚本
+     */
+    @PreAuthorize("@ss.hasPermi('iot:script:remove')")
+    @Log(title = "规则引擎脚本", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{scriptIds}")
+    public AjaxResult remove(@PathVariable String[] scriptIds)
+    {
+        return toAjax(scriptService.deleteRuleScriptByIds(scriptIds));
+    }
+
+    /**
+     * 删除规则引擎脚本
+     */
+    @PostMapping("/validate")
+    public AjaxResult validateScript(@RequestBody Script ruleScript)
+    {
+        return scriptService.validateScript(ruleScript);
+    }
+}

springboot/fastbee-open-api/src/main/java/com/fastbee/data/service/impl/DeviceJobServiceImpl.java

@@ -331,4 +331,9 @@ public class DeviceJobServiceImpl implements IDeviceJobService
     {
         return CronUtils.isValid(cronExpression);
     }
+
+    @Override
+    public List<DeviceJob> listShortJobBySceneId(Long[] sceneIds) {
+        return jobMapper.selectShortJobListBySceneIds(sceneIds);
+    }
 }