WcsFlowInstanceController升级完整CRUD + WcsFlowLogController补全add/edit + flowinstance.js API + 编译通过

ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowInstanceController.java

@@ -1,20 +1,106 @@
 package com.ruoyi.wcs.flow.controller;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.wcs.flow.domain.WcsFlowInstance;
+import com.ruoyi.wcs.flow.service.IWcsFlowInstanceService;
 
 /**
- * WCS <20><><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5> Controller<EFBFBD><EFBFBD><EFBFBD>Ǽ<EFBFBD>ռλ<EFBFBD><EFBFBD>
+ * <20><><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5> Controller
+ *
+ * @author wcs
  */
 @RestController
 @RequestMapping("/wcs/flow/instance")
-public class WcsFlowInstanceController
+public class WcsFlowInstanceController extends BaseController
 {
+    @Autowired
+    private IWcsFlowInstanceService flowInstanceService;
+
+    /**
+     * <20><>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:list')")
     @GetMapping("/list")
-    public AjaxResult list()
+    public TableDataInfo list(WcsFlowInstance flowInstance)
     {
-        return AjaxResult.success("WCS <20><><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>ģ<EFBFBD><C4A3> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+        startPage();
+        List<WcsFlowInstance> list = flowInstanceService.selectFlowInstanceList(flowInstance);
+        return getDataTable(list);
+    }
+
+    /**
+     * <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:export')")
+    @Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WcsFlowInstance flowInstance)
+    {
+        List<WcsFlowInstance> list = flowInstanceService.selectFlowInstanceList(flowInstance);
+        ExcelUtil<WcsFlowInstance> util = new ExcelUtil<WcsFlowInstance>(WcsFlowInstance.class);
+        util.exportExcel(response, list, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+    }
+
+    /**
+     * <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>Ϣ
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
+    {
+        return success(flowInstanceService.selectFlowInstanceById(id));
+    }
+
+    /**
+     * <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:add')")
+    @Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody WcsFlowInstance flowInstance)
+    {
+        flowInstance.setCreateBy(getUsername());
+        return toAjax(flowInstanceService.insertFlowInstance(flowInstance));
+    }
+
+    /**
+     * <20>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:edit')")
+    @Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody WcsFlowInstance flowInstance)
+    {
+        flowInstance.setUpdateBy(getUsername());
+        return toAjax(flowInstanceService.updateFlowInstance(flowInstance));
+    }
+
+    /**
+     * ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowinstance:remove')")
+    @Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(flowInstanceService.deleteFlowInstanceByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowLogController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -58,7 +59,31 @@ public class WcsFlowLogController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(wcsFlowNodeLogService.selectFlowNodeLogById(id));
+        return success(wcsFlowNodeLogService.selectFlowNodeLogById(id));
+    }
+
+    /**
+     * 新增流程节点日志
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowlog:add')")
+    @Log(title = "流程节点日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody WcsFlowNodeLog wcsFlowNodeLog)
+    {
+        wcsFlowNodeLog.setCreateBy(getUsername());
+        return toAjax(wcsFlowNodeLogService.insertFlowNodeLog(wcsFlowNodeLog));
+    }
+
+    /**
+     * 修改流程节点日志
+     */
+    @PreAuthorize("@ss.hasPermi('wcs:flowlog:edit')")
+    @Log(title = "流程节点日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody WcsFlowNodeLog wcsFlowNodeLog)
+    {
+        wcsFlowNodeLog.setUpdateBy(getUsername());
+        return toAjax(wcsFlowNodeLogService.updateFlowNodeLog(wcsFlowNodeLog));
     }
 
     /**

ruoyi-ui/src/api/wcs/flowinstance.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流程实例列表
+export function listFlowInstance(query) {
+  return request({
+    url: '/wcs/flow/instance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流程实例详细
+export function getFlowInstance(id) {
+  return request({
+    url: '/wcs/flow/instance/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程实例
+export function addFlowInstance(data) {
+  return request({
+    url: '/wcs/flow/instance',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程实例
+export function updateFlowInstance(data) {
+  return request({
+    url: '/wcs/flow/instance',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程实例
+export function delFlowInstance(id) {
+  return request({
+    url: '/wcs/flow/instance/' + id,
+    method: 'delete'
+  })
+}