mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -8,7 +8,10 @@ import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.pojo.vo.scene.ScenePackageVO;
 import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
+import api.common.util.TimeUtil;
+import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
+import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
 import com.css.simulation.resource.scene.service.ScenePackageService;
 import com.css.simulation.resource.system.service.ParameterService;
 import com.github.pagehelper.PageInfo;
@@ -33,9 +36,11 @@ import java.util.Map;
 public class ScenePackageController {
 
     @Resource
-    ScenePackageService scenePackageService;
+   private  ScenePackageService scenePackageService;
     @Resource
-    ParameterService parameterService;
+    private ScenePackageMapper scenePackageMapper;
+    @Resource
+    private  ParameterService parameterService;
 
     //查询主表列表
     @PostMapping("/queryScenePackageList")
@@ -55,6 +60,9 @@ public class ScenePackageController {
     }
 
 
+    /**
+     * 保存场景测试包
+     */
     @PostMapping("/saveScenePackage")
     public ResponseBodyVO<String> saveScenePackage(@RequestBody Map<String, List<ScenePackageSublistVO>> map) {
         ResponseBodyVO<String> result = new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
@@ -77,6 +85,12 @@ public class ScenePackageController {
             params.get(0).setId("");
             result = scenePackageService.saveScenePackage(scenePackageSublistVO, params.get(0).getPackageLevel());
         }
+        // 将场景测试包修改成未禁用
+        ScenePackagePO scenePackagePO = new ScenePackagePO();
+        scenePackagePO.setPackageId(packageId);
+        scenePackagePO.setModifyTime(TimeUtil.getNowForMysql());
+        scenePackagePO.setModifyUserId(AuthUtil.getCurrentUserId());
+        scenePackageMapper.updateIsUnavailable2(scenePackagePO);
         return result;
     }
 

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

@@ -41,6 +41,9 @@ public interface ScenePackageMapper {
     //改变状态是否禁用
     void updateIsUnavailable(ScenePackagePO params);
 
+    //改变状态是否禁用
+    void updateIsUnavailable2(ScenePackagePO params);
+
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{sceneId}, '%'))")

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

@@ -219,4 +219,20 @@
         </set>
         where is_deleted = '0' and package_id in #{rootIds}
     </update>
+
+    <update id="updateIsUnavailable2" parameterType="api.common.pojo.po.scene.ScenePackagePO">
+        update simulation.scene_package
+        <set>
+            <if test="isUnavailable != null and isUnavailable!=''">
+                is_unavailable = #{isUnavailable,jdbcType=VARCHAR},
+            </if>
+            <if test="modifyUserId != null and modifyUserId!=''">
+                modify_user_id = #{modifyUserId},
+            </if>
+            <if test="modifyTime != null ">
+                modify_time = #{modifyTime},
+            </if>
+        </set>
+        where package_id = #{packageId}
+    </update>
 </mapper>