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

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

@@ -367,6 +367,7 @@ public class SceneGeneralTemplateService {
         for (String id : idS) {
             parm.setModifyTime(TimeUtil.getNowForMysql());
             parm.setSceneFhId(id);
+
            // List<String> packageIdS = scenePackageSublistMapper.selectPackageIdById(parm);
             List<ScenePackageSublistPO> listPo= scenePackageSublistMapper.selectPackageFhById(parm);
                 for (ScenePackageSublistPO scenePackageSublistPO : listPo) {

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

@@ -208,7 +208,7 @@
         set is_unavailable = #{isUnavailable},
                 modify_user_id = #{modifyUserId},
                 modify_time = #{modifyTime},
-               scene_num =scene_num-'${sceneNum}',
+               scene_num =scene_num-'${sceneNum}'
         where is_deleted = '0' and package_id =#{packageId}
     </update>
 

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

@@ -124,8 +124,9 @@
                 scene_statue_ids=replace(replace(replace(scene_statue_ids, concat(#{sceneBzId}, ','), ''), concat(',', #{sceneBzId}), ''),#{sceneBzId}, ''),
             </if>
             <if test="sceneFhId != null and sceneFhId!=''">
-                scene_generalization_ids=replace(replace(replace(scene_generalization_ids, concat(#{sceneFhId}, ','), ''), concat(',', #{sceneFhId}), ''),#{sceneFhId}, ''),
+                scene_generalization_ids='',
                 scene_num='0',
+                template_id ='',
             </if>
             <if test="modifyUserId != null and modifyUserId!=''">
                 modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
@@ -146,10 +147,10 @@
         <if test="sceneBzId != null and sceneBzId != ''">
             and scene_statue_ids  like CONCAT('%',#{sceneBzId,jdbcType=VARCHAR},'%')
         </if>
+
         <if test="sceneFhId != null and sceneFhId != ''">
-            and scene_generalization_ids  like CONCAT('%',#{sceneFhId,jdbcType=VARCHAR},'%')
+            and template_id =#{sceneFhId}
         </if>
-
     </update>
 
 
@@ -175,10 +176,10 @@
     </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,
+        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},'%')
+                and template_id =#{sceneFhId}
 
     </select>
 </mapper>