模型计算管理开发

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdFlowDispatchController.java

@@ -4,6 +4,7 @@ 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.ExecutorName;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo;
 import com.ruoyi.interfaces.service.IMdFlowDispatchService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +49,14 @@ public class MdFlowDispatchController extends BaseController {
         return success(mdFlowDispatchService.update(flowDispatchVo));
     }
 
-
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable String id) {
+        MdFlowDispatchVo info = mdFlowDispatchService.getInfo(id);
+        if (StringUtils.isNotNull(info)) return error("任务不存在");
+        if ("1".equals(info.getJobStatus())) return error("请先关闭任务");
+        Long delete = mdFlowDispatchService.delete(id);
+        return success(delete);
+    }
 
 
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/vo/MdFlowDispatchVo.java

@@ -1,12 +1,9 @@
 package com.ruoyi.interfaces.domain.vo;
 
-import com.aizuda.snailjob.model.request.base.JobRequest;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.pagehelper.util.StringUtil;
-import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.interfaces.domain.Job;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -23,7 +20,7 @@ public class MdFlowDispatchVo extends JobRequestVo {
     /**
      * 流程id
      */
-    private Long flowId;
+    private Long appId;
 
 
     /**
@@ -166,11 +163,11 @@ public class MdFlowDispatchVo extends JobRequestVo {
         this.flowJobId = flowJobId;
     }
 
-    public Long getFlowId() {
-        return flowId;
+    public Long getAppId() {
+        return appId;
     }
 
-    public void setFlowId(Long flowId) {
-        this.flowId = flowId;
+    public void setAppId(Long appId) {
+        this.appId = appId;
     }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdFlowDispatchService.java

@@ -12,4 +12,6 @@ public interface IMdFlowDispatchService {
     MdFlowDispatchVo getInfo(String id);
 
     Long update(MdFlowDispatchVo flowDispatchVo);
+
+    Long delete(String id);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdFlowDispatchServiceImpl.java

@@ -1,8 +1,7 @@
 package com.ruoyi.interfaces.service.impl;
 
-import com.aizuda.snailjob.client.job.core.openapi.SnailJobOpenApi;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo;
 import com.ruoyi.interfaces.mapper.MdFlowDispatchMapper;
@@ -11,7 +10,6 @@ import com.ruoyi.interfaces.service.SnailJobService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -27,7 +25,7 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
     @Override
     public Long add(MdFlowDispatchVo jobRequest) {
         HashMap<String, Object> argsMap = new HashMap<>();
-        argsMap.put("flowId", jobRequest.getFlowId());
+        argsMap.put("flowId", jobRequest.getAppId());
         argsMap.put("flowParam", jobRequest.getFlowParam());
 
 
@@ -73,7 +71,7 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
     @Override
     public Long update(MdFlowDispatchVo flowDispatchVo) {
         HashMap<String, Object> argsMap = new HashMap<>();
-        argsMap.put("flowId", flowDispatchVo.getFlowId());
+        argsMap.put("flowId", flowDispatchVo.getAppId());
         argsMap.put("flowParam", flowDispatchVo.getFlowParam());
 
 
@@ -102,4 +100,11 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
         }
         return flowDispatchMapper.updateMdFlowJob(flowDispatchVo);
     }
+
+    @Override
+    public Long delete(String id) {
+        MdFlowDispatchVo info = flowDispatchMapper.getInfo(id);
+
+        return 0L;
+    }
 }

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdFlowDispatchMapper.xml

@@ -7,7 +7,7 @@
     <insert id="insertMdFlowJob">
         insert into MD_FLOW_JOB(flow_job_id,
                                 flow_job_name,
-                                flow_id,
+                                app_id,
                                 id,
                                 flow_param_string,
                                 create_by,
@@ -16,7 +16,7 @@
                                 charge_phone)
         values (#{flowJobId,jdbcType=VARCHAR},
                 #{flowJobName,jdbcType=VARCHAR},
-                #{flowId,jdbcType=INTEGER},
+                #{appId,jdbcType=INTEGER},
                 #{id,jdbcType=INTEGER},
                 #{flowParamString,jdbcType=VARCHAR},
                 #{createBy,jdbcType=VARCHAR},
@@ -27,7 +27,7 @@
     <update id="updateMdFlowJob">
         update MD_FLOW_JOB
         set flow_job_name     = #{flowJobName,jdbcType=VARCHAR},
-            flow_id           = #{flowId,jdbcType=INTEGER},
+            app_id           = #{appId,jdbcType=INTEGER},
             id                = #{id,jdbcType=INTEGER},
             flow_param_string = #{flowParamString,jdbcType=VARCHAR},
             create_by         = #{createBy,jdbcType=VARCHAR},
@@ -38,7 +38,7 @@
     </update>
     <resultMap type="com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo" id="MdFlowDispatchMap">
         <result property="flowJobId" column="FLOW_JOB_ID"/>
-        <result property="flowId" column="FLOW_ID"/>
+        <result property="appId" column="APP_ID"/>
         <result property="id" column="ID"/>
         <result property="groupName" column="GROUP_NAME"/>
         <result property="jobName" column="JOB_NAME"/>
@@ -72,8 +72,7 @@
 
     <select id="selectFlowDispatch" resultMap="MdFlowDispatchMap">
         select fj.FLOW_JOB_ID,
-        fj.FLOW_ID,
-        f.FLOW_NAME,
+        fj.APP_ID,
         fj.ID,
         j.JOB_NAME,
         j.JOB_STATUS,
@@ -85,23 +84,22 @@
         fj.CHARGE_BY,
         fj.CHARGE_PHONE
         from MD_FLOW_JOB fj
-        LEFT JOIN MD_APP_FLOW f ON fj.FLOW_ID = f.FLOW_ID
         LEFT JOIN SNAIL_JOB.SJ_JOB J ON fj.id = j.id
         <where>
-            <if test="flowId != null and flowId != ''">
-                and fj.FLOW_ID = #{flowId}
+            <if test="appId != null and appId != ''">
+                and fj.APP_ID = #{appId}
             </if>
-            <if test="flowId != null and flowId != ''">
+            <if test="jobName != null and jobName != ''">
                 and j.JOB_NAME like CONCAT('%', #{jobName}, '%')
             </if>
             <if test="jobStatus != null and jobStatus != ''">
-                and j.JOB_STATUS like CONCAT('%', #{jobStatus}, '%')
+                and j.JOB_STATUS = #{jobStatus}
             </if>
         </where>
     </select>
     <select id="getInfo" resultMap="MdFlowDispatchMap" >
         select fj.FLOW_JOB_ID,
-               fj.FLOW_ID,
+               fj.APP_ID,
                fj.ID,
                j.GROUP_NAME,
                j.JOB_NAME,