浏览代码

删除场景上传任务

LingxinMeng 2 年之前
父节点
当前提交
40a671ccc7

+ 1 - 1
api-common/src/main/java/api/common/pojo/param/scene/SystemScenePackageParam.java

@@ -24,7 +24,7 @@ public class SystemScenePackageParam extends  PageVO implements Serializable {
     private String[] packageNames ; //回显数组
     public String yearMax;//结束时间
     public String yearMin;//开始时间
-    public List<String> sceneNames;
+    public List<String> sceneNames; // 场景名称,供删除场景上传任务使用
     public Timestamp createTime; //记录创建时间
     public Timestamp modifyTime; //记录最后更新时间(包括删除)
     public String createUserId; //记录创建人(用户id)

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -63,5 +63,5 @@ public interface ScenePackageMapper {
 
     List<ScenePackagePO> selectByIndexIds(ScenePackageParam scenePackageParam);
 
-    void update(List<ScenePackagePO> testPackages);
+    void update(@Param("testPackages") List<ScenePackagePO> testPackages);
 }

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageSublistMapper.java

@@ -31,5 +31,5 @@ public interface ScenePackageSublistMapper {
 
     List<ScenePackageSublistPO> selectBySceneIds(ScenePackageSublistParam scenePackageSublistParam);
 
-    void update(List<ScenePackageSublistPO> indexes);
+    void update(@Param("indexes")List<ScenePackageSublistPO> indexes);
 }

+ 2 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SceneImportService.java

@@ -19,6 +19,7 @@ import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
 import com.css.simulation.resource.scene.service.scene.SceneStandardsService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,6 +106,7 @@ public class SceneImportService {
     }
 
     @Transactional
+    @SneakyThrows
     public void deleteTask(String taskId) {
         // 查询任务相关的场景类型和场景列表
         SceneImportPO sceneImportPO = sceneImportMapper.querySceneImportByTaskId(taskId);

+ 1 - 1
simulation-resource-server/src/main/resources/mapper/scene/ScenePackageMapper.xml

@@ -257,7 +257,7 @@
         where package_id in (select distinct root_id from scene_package_sublist where package_and_rules = #{rulesId})
     </update>
     <update id="update" parameterType="java.util.List">
-        <foreach collection="packages" item="item" index="index" open="" close="" separator=";">
+        <foreach collection="testPackages" item="item" index="index" open="" close="" separator=";">
             update scene_package
             set scene_num = #{item.sceneNum},
             is_unavailable = #{item.isUnavailable}