获取git最新版本

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/mapper/AlgorithmMapper.java

@@ -20,7 +20,7 @@ public interface AlgorithmMapper {
 
     int update(AlgorithmPO po);
 
-    int deleteByid(AlgorithmParameter param);
+    int deleteById(AlgorithmParameter param);
 
     AlgorithmPO selectDetailsById(@Param("algorithmId") String algorithmId);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -272,44 +272,38 @@ public class AlgorithmServiceImpl implements AlgorithmService {
     public ResponseBodyVO<String> deleteById(AlgorithmParameter param) {
         if (isEmpty(param.getId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
-        } else {
-            String algorithmId = param.getId();
-            List<RunningProjectVO> runningProjectVos = algorithmMapper.selectRunningProject(algorithmId);
-            if (runningProjectVos != null && runningProjectVos.size() > 0) {
-                StringBuilder stringBuilder = new StringBuilder();
-                for (RunningProjectVO vo : runningProjectVos) {
-                    // 删除算法将停止所有使用该算法的正在运行中的工作项目
-                    //子项目
-                    SimulationManualProjectParam voparam = new SimulationManualProjectParam();
-                    voparam.setId(vo.getId());
-                    voparam.setNowRunState(DictConstants.PROJECT_TERMINATED);
-                    simulationProjectService.updateProjectNowRunState(voparam);
-                }
-
-                //父项目
-                List<RunningProjectVO> runningParentProjectVos = algorithmMapper.selectRunningProjectParent(algorithmId);
-                if (runningParentProjectVos != null && runningParentProjectVos.size() > 0) {
-
-                    for (RunningProjectVO voParent : runningParentProjectVos) {
-                        SimulationManualProjectParam voparamParent = new SimulationManualProjectParam();
-                        stringBuilder.append(voParent.getProjectId()).append(",");
-                        voparamParent.setId(voParent.getId());
-                        voparamParent.setAutomaticRunState("1");
-                        simulationProjectService.updateAutomaticRunState(voparamParent);
-                    }
+        }
+        String algorithmId = param.getId();
+        // 查询算法相关的正在运行的项目
+        List<RunningProjectVO> runningProjectVos = algorithmMapper.selectRunningProject(algorithmId);
+        if (runningProjectVos != null && runningProjectVos.size() > 0) {
+            StringBuilder stringBuilder = new StringBuilder();
+            for (RunningProjectVO vo : runningProjectVos) {
+                // 删除算法将停止所有使用该算法的正在运行中的工作项目
+                // 子项目
+                SimulationManualProjectParam voparam = new SimulationManualProjectParam();
+                voparam.setId(vo.getId());
+                voparam.setNowRunState(DictConstants.PROJECT_TERMINATED);
+                simulationProjectService.updateProjectNowRunState(voparam);
+            }
 
+            // 停用所有父项目
+            List<RunningProjectVO> runningParentProjectVos = algorithmMapper.selectRunningProjectParent(algorithmId);
+            if (runningParentProjectVos != null && runningParentProjectVos.size() > 0) {
+                for (RunningProjectVO voParent : runningParentProjectVos) {
+                    SimulationManualProjectParam voParamParent = new SimulationManualProjectParam();
+                    stringBuilder.append(voParent.getProjectId()).append(",");
+                    voParamParent.setId(voParent.getId());
+                    voParamParent.setAutomaticRunState("1");
+                    simulationProjectService.updateAutomaticRunState(voParamParent);
                 }
-                String substring = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "该算法已绑定ID：" + substring + " 自动运行项目，删除后该项目将停止自动运行");
-            } else {
-                int i = algorithmMapper.deleteByid(param);
-                if (i > 0) {
-                    LogUtil.delete();
-                    return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-                }
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "删除失败");
             }
+            String substring = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "该算法已绑定ID为 " + substring + " 自动运行项目，删除后该项目将停止自动运行");
         }
+        algorithmMapper.deleteById(param);
+        LogUtil.delete();
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
     }
 

simulation-resource-server/src/main/resources/mapper/algorithm/AlgorithmMapper.xml

@@ -167,9 +167,9 @@
     </select>
 
     <!--删除-->
-    <update id="deleteByid">
+    <update id="deleteById">
         update algorithm
-        set is_deleted='1'
+        set is_deleted = '1'
         where id = #{id,jdbcType=VARCHAR}
     </update>