Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

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

@@ -1,5 +1,6 @@
 package com.ruoyi.interfaces.controller;
 
+import com.aizuda.snailjob.client.job.core.openapi.SnailJobOpenApi;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -10,6 +11,9 @@ import com.ruoyi.interfaces.service.IMdFlowDispatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 /**
  * 计算调度控制层
@@ -52,9 +56,13 @@ public class MdFlowDispatchController extends BaseController {
     @DeleteMapping("/{id}")
     public AjaxResult delete(@PathVariable String id) {
         MdFlowDispatchVo info = mdFlowDispatchService.getInfo(id);
-        if (StringUtils.isNotNull(info)) return error("任务不存在");
+        if (StringUtils.isNull(info)) return error("任务不存在");
         if ("1".equals(info.getJobStatus())) return error("请先关闭任务");
+
         Long delete = mdFlowDispatchService.delete(id);
+        Set<Long> ids = new HashSet<>();
+        ids.add(info.getId());
+        SnailJobOpenApi.deleteJob(ids).execute();
         return success(delete);
     }
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdAppFlowMapper.java

@@ -62,4 +62,6 @@ public interface MdAppFlowMapper
      * @return 结果
      */
     public int deleteMdAppFlowByFlowIds(Long[] flowIds);
+
+    MdAppFlow selectMdAppFlowByAppId(String appId);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdFlowDispatchMapper.java

@@ -17,4 +17,6 @@ public interface MdFlowDispatchMapper {
     MdFlowDispatchVo getInfo(String id);
 
     Long updateMdFlowJob(MdFlowDispatchVo flowDispatchVo);
+
+    Long deleteMdFlowJobById(String id);
 }

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

@@ -63,4 +63,7 @@ public interface IMdAppFlowService
     public int deleteMdAppFlowByFlowId(Long flowId);
 
     Map<String, Object> runFlow(MdAppFlowVo appFlow);
+
+    MdAppFlow selectMdAppFlowByAppId(String appId);
+
 }

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

@@ -186,4 +186,10 @@ public class MdAppFlowServiceImpl implements IMdAppFlowService {
 
         return chain.executeForResult(appFlow.getParams());
     }
+
+    @Override
+    public MdAppFlow selectMdAppFlowByAppId(String appId)
+    {
+        return mdAppFlowMapper.selectMdAppFlowByAppId(appId);
+    }
 }

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

@@ -5,6 +5,7 @@ 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;
+import com.ruoyi.interfaces.service.IMdAppFlowService;
 import com.ruoyi.interfaces.service.IMdFlowDispatchService;
 import com.ruoyi.interfaces.service.SnailJobService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +23,14 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
     @Autowired
     private MdFlowDispatchMapper flowDispatchMapper;
 
+    @Autowired
+    private IMdAppFlowService appFlowService;
+
     @Override
     public Long add(MdFlowDispatchVo jobRequest) {
+
         HashMap<String, Object> argsMap = new HashMap<>();
-        argsMap.put("flowId", jobRequest.getAppId());
+        argsMap.put("appId", jobRequest.getAppId());
         argsMap.put("flowParam", jobRequest.getFlowParam());
 
 
@@ -64,6 +69,7 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
     @Override
     public MdFlowDispatchVo getInfo(String id) {
         MdFlowDispatchVo info = flowDispatchMapper.getInfo(id);
+        if (StringUtils.isNull(info)) return info;
         info.initFlowParam();
         return info;
     }
@@ -71,7 +77,7 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
     @Override
     public Long update(MdFlowDispatchVo flowDispatchVo) {
         HashMap<String, Object> argsMap = new HashMap<>();
-        argsMap.put("flowId", flowDispatchVo.getAppId());
+        argsMap.put("appId", flowDispatchVo.getAppId());
         argsMap.put("flowParam", flowDispatchVo.getFlowParam());
 
 
@@ -103,8 +109,7 @@ public class MdFlowDispatchServiceImpl implements IMdFlowDispatchService {
 
     @Override
     public Long delete(String id) {
-        MdFlowDispatchVo info = flowDispatchMapper.getInfo(id);
 
-        return 0L;
+        return flowDispatchMapper.deleteMdFlowJobById(id);
     }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/snailJob/flowJob.java → ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/snailJob/FlowJob.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 import java.util.Map;
 
 @Component
-public class flowJob {
+public class FlowJob {
     @Autowired
     private IMdAppFlowService  mdAppFlowService;
     @JobExecutor(name = "runFolwJob")
@@ -25,7 +25,7 @@ public class flowJob {
 
         System.out.println(jobArgs.getJobParams());
         MdAppFlow flowPar = JsonUtils.jsonToPojo(jobArgs.getJobParams().toString(), MdAppFlow.class);
-        MdAppFlow mdAppFlow = mdAppFlowService.selectMdAppFlowByFlowId(flowPar.getFlowId());
+        MdAppFlow mdAppFlow = mdAppFlowService.selectMdAppFlowByAppId(flowPar.getAppId());
         Tinyflow tinyflow = TinyflowUtil.getTinyflow(mdAppFlow.getFlowGraph());
         Chain chain = tinyflow.toChain();
         Map<String, Object> stringObjectMap = chain.executeForResult(flowPar.getParams());

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

@@ -44,6 +44,10 @@
         <include refid="selectMdAppFlowVo"/>
         where FLOW_ID = #{flowId}
     </select>
+    <select id="selectMdAppFlowByAppId" resultMap="MdAppFlowResult">
+        <include refid="selectMdAppFlowVo"/>
+        where APP_ID = #{appId}
+    </select>
 
     <insert id="insertMdAppFlow" parameterType="com.ruoyi.interfaces.domain.MdAppFlow" useGeneratedKeys="true" keyProperty="flowId">
         insert into md_app_flow

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

@@ -36,6 +36,11 @@
             charge_phone      = #{chargePhone,jdbcType=VARCHAR}
         where flow_job_id = #{flowJobId}
     </update>
+    <delete id="deleteMdFlowJobById">
+        delete
+        from MD_FLOW_JOB
+        where flow_job_id = #{flowJobId}
+    </delete>
     <resultMap type="com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo" id="MdFlowDispatchMap">
         <result property="flowJobId" column="FLOW_JOB_ID"/>
         <result property="appId" column="APP_ID"/>