Merge branch 'master' of https://gitee.com/mlx__martin/simulation-cloud

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageSublistVO.java

@@ -34,4 +34,5 @@ public class ScenePackageSublistVO implements Serializable {
     private String treeNode;//模板预览node节点
     private String templateId;//泛化模板id
     private String exampleId;//泛化实例id
+    private String share;//公有私有
 }

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

@@ -28,6 +28,7 @@ public interface ScenePackageSublistMapper {
 
 
     List<String> selectPackageIdById(SceneDeleteParam param);
+    List<ScenePackageSublistPO> selectPackageFhById(SceneDeleteParam param);
 
 
     void updateScenePackageSublistById(SceneDeleteParam param);

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

@@ -20,6 +20,8 @@ public interface SystemScenePackageSublistMapper {
 
     void deleteSystemScenePackageSublist(SystemScenePackageSublistPO po);
 
+    void deleteSystemScenePackageSublistBySC(SystemScenePackageSublistPO po);
+
     @Update("update system_scene_package_sublist\n" +
             "set is_deleted  = '1',\n" +
             "    modify_time = now()\n" +

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneGeneralTemplateService.java

@@ -8,6 +8,7 @@ import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.SceneGeneralTemplateParam;
 import api.common.pojo.po.scene.SceneGeneralTemplatePO;
 import api.common.pojo.po.scene.ScenePackagePO;
+import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.scene.SystemScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
@@ -358,20 +359,33 @@ public class SceneGeneralTemplateService {
         systemScenePackageSublistPO.setModifyUserId(AuthUtil.getCurrentUserId());
         systemScenePackageSublistPO.setModifyTime(TimeUtil.getNowForMysql());
         systemScenePackageSublistPO.setSceneName(po.getSceneId());
-        systemScenePackageSublistMapper.deleteSystemScenePackageSublist(systemScenePackageSublistPO);
+        systemScenePackageSublistMapper.deleteSystemScenePackageSublistBySC(systemScenePackageSublistPO);
         //删除测试包中场景
         SceneDeleteParam parm = new SceneDeleteParam();
         parm.setModifyUserId(AuthUtil.getCurrentUserId());
-        Set<String> set = new HashSet<>();
+       // Set<String> set = new HashSet<>();
         for (String id : idS) {
             parm.setModifyTime(TimeUtil.getNowForMysql());
             parm.setSceneFhId(id);
-            List<String> packageIdS = scenePackageSublistMapper.selectPackageIdById(parm);
-            set.addAll(packageIdS);
+           // List<String> packageIdS = scenePackageSublistMapper.selectPackageIdById(parm);
+            List<ScenePackageSublistPO> listPo= scenePackageSublistMapper.selectPackageFhById(parm);
+                for (ScenePackageSublistPO scenePackageSublistPO : listPo) {
+                    ScenePackagePO scenePackagePO = new ScenePackagePO();
+                    scenePackagePO.setModifyUserId(AuthUtil.getCurrentUserId());
+                    scenePackagePO.setModifyTime(TimeUtil.getNowForMysql());
+                    scenePackagePO.setIsUnavailable("1");
+                    scenePackagePO.setSceneNum(scenePackageSublistPO.getSceneNum());
+                    scenePackagePO.setPackageId(scenePackageSublistPO.getRootId());
+                    //改变测试包状态及数量
+                    scenePackageMapper.updateIsUnavailable(scenePackagePO);
+                }
+            //set.addAll(packageIdS);
             //删除场景测试包
-            scenePackageSublistMapper.updateScenePackageSublistById(parm);
+                scenePackageSublistMapper.updateScenePackageSublistById(parm);
+            //改变场景包场景数量
+
         }
-        //改变测试包状态
+       /* //改变测试包状态
         List<String> listIds = new ArrayList<>(set);
         ScenePackagePO scenePackagePO = new ScenePackagePO();
         scenePackagePO.setModifyUserId(AuthUtil.getCurrentUserId());
@@ -379,7 +393,7 @@ public class SceneGeneralTemplateService {
         scenePackagePO.setIsUnavailable("1");
         scenePackagePO.setRootIds(listIds);
         scenePackageMapper.updateIsUnavailable(scenePackagePO);
-
+*/
 
         Map map = new HashMap();
         map.put("sceneId", po.getId());

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -122,7 +122,12 @@ public class ScenePackageService {
             //判断唯一
             po.setPackageName(vo.getSublistName());
             po.setCreateUserId(AuthUtil.getCurrentUserId());
-            po.setShare("0");
+            if(ObjectUtil.isNull(vo.getShare())){
+                po.setShare("0");
+            }else{
+                po.setShare(vo.getShare());
+            }
+           //
             po.setPackageId(vo.getId());
             ScenePackageNewVO scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
             if (ObjectUtil.isNotNull(scenePackageNewVO)) {
@@ -138,7 +143,9 @@ public class ScenePackageService {
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setIsDeleted("0");
-        po.setShare("0");
+        if(ObjectUtil.isNull(po.getShare())){
+            po.setShare("0");
+        }
         List<ScenePackageSublistPO> poList = new ArrayList<>();
         List<ScenePackageSublistPO> treeList = instShareListTree(listSublictTree, po.getPackageId(), po.getPackageId(), poList, "0", 1);
         if (treeList == null || treeList.size() < 1) {

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

@@ -205,23 +205,11 @@
     </select>
     <update id="updateIsUnavailable" parameterType="api.common.pojo.po.scene.ScenePackagePO">
         update simulation.scene_package
-        <set>
-            <if test="isUnavailable != null and isUnavailable!=''">
-                is_unavailable = #{isUnavailable,jdbcType=VARCHAR},
-                scene_num=scene_num-1,
-            </if>
-            <if test="modifyUserId != null and modifyUserId!=''">
+        set is_unavailable = #{isUnavailable},
                 modify_user_id = #{modifyUserId},
-            </if>
-            <if test="modifyTime != null ">
                 modify_time = #{modifyTime},
-            </if>
-        </set>
-        where is_deleted = '0' and package_id in
-        <foreach collection="rootIds" item="item" index="index"
-                 separator="," open="(" close=")">
-            #{item}
-        </foreach>
+               scene_num =scene_num-'${sceneNum}',
+        where is_deleted = '0' and package_id =#{packageId}
     </update>
 
     <update id="updateIsUnavailable2" parameterType="api.common.pojo.po.scene.ScenePackagePO">

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

@@ -173,4 +173,12 @@
             </if>
         </where>
     </select>
+    <select id="selectPackageFhById" parameterType="api.common.pojo.param.scene.SceneDeleteParam"
+            resultType="api.common.pojo.po.scene.ScenePackageSublistPO">
+        select root_id,scene_num,sublist_id,
+        from simulation.scene_package_sublist
+        where is_deleted = '0'
+                and scene_generalization_ids  like CONCAT('%',#{sceneFhId,jdbcType=VARCHAR},'%')
+
+    </select>
 </mapper>

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

@@ -68,4 +68,12 @@
         </if>
     </update>
 
+
+    <update id="deleteSystemScenePackageSublistBySC" parameterType="api.common.pojo.po.scene.SystemScenePackageSublistPO">
+        update simulation.system_scene_package_sublist
+        set is_deleted = #{isDeleted,jdbcType=VARCHAR},
+         modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+         modify_time = #{modifyTime},
+        where is_deleted='0' and scene_name=#{sceneName}
+    </update>
 </mapper>