1

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -90,24 +90,24 @@ public class TestController extends BaseController {
 
     @GetMapping("/updateFolderScene")
     public ResultData updateFolderScene(){
-        List<FolderScene> list = folderSceneService.list();
-        for (FolderScene folderScene : list) {
-            String num = null;
-            ScenePro scenePro = sceneProService.getById(folderScene.getSceneId());
-            if(scenePro !=null){
-                num = scenePro.getNum();
-            }else {
-                ScenePlus scenePlus = scenePlusService.getById(folderScene.getSceneId());
-                if(scenePlus != null){
-                    num = scenePlus.getNum();
-                }
-            }
-
-            LambdaUpdateWrapper<FolderScene> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(FolderScene::getId,folderScene.getId());
-            wrapper.set(FolderScene::getNum,num);
-            folderSceneService.update(wrapper);
-        }
+//        List<FolderScene> list = folderSceneService.list();
+//        for (FolderScene folderScene : list) {
+//            String num = null;
+//            ScenePro scenePro = sceneProService.getById(folderScene.getSceneId());
+//            if(scenePro !=null){
+//                num = scenePro.getNum();
+//            }else {
+//                ScenePlus scenePlus = scenePlusService.getById(folderScene.getSceneId());
+//                if(scenePlus != null){
+//                    num = scenePlus.getNum();
+//                }
+//            }
+//
+//            LambdaUpdateWrapper<FolderScene> wrapper = new LambdaUpdateWrapper<>();
+//            wrapper.eq(FolderScene::getId,folderScene.getId());
+//            wrapper.set(FolderScene::getNum,num);
+//            folderSceneService.update(wrapper);
+//        }
 
         return ResultData.ok();
     }

src/main/java/com/fdkankan/ucenter/entity/FolderScene.java

@@ -34,9 +34,6 @@ public class FolderScene implements Serializable {
     @TableField("scene_id")
     private Long sceneId;
 
-    @TableField("num")
-    private String num;
-
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/ucenter/mapper/IFolderSceneMapper.java

@@ -19,7 +19,8 @@ import java.util.List;
 @Mapper
 public interface IFolderSceneMapper extends BaseMapper<FolderScene> {
 
-    FolderScene getByType(@Param("num")String num, @Param("type")Integer type);
+    FolderScene getByTypeNum(@Param("num")String num, @Param("type")Integer type);
+    FolderScene getByType(@Param("sceneId")String sceneId, @Param("type")Integer type);
 
     List<GroupByCount> getGroupByFolderIds(@Param("folderIds") List<Long> folderIds);
 }

src/main/java/com/fdkankan/ucenter/service/IFolderSceneService.java

@@ -19,7 +19,8 @@ public interface IFolderSceneService extends IService<FolderScene> {
 
     void deleteByFolderIds(List<Long> delIds,Long userId);
 
-    FolderScene getByType(String num, Integer type);
+    FolderScene getByTypeNum(String num, Integer type);
+    FolderScene getByType(String sceneId, Integer type);
 
     HashMap<Long, Long> getGroupByFolderIds(List<Folder> folderIds);
 

src/main/java/com/fdkankan/ucenter/service/impl/FolderSceneServiceImpl.java

@@ -49,8 +49,13 @@ public class FolderSceneServiceImpl extends ServiceImpl<IFolderSceneMapper, Fold
     }
 
     @Override
-    public FolderScene getByType(String num, Integer type) {
-        return getBaseMapper().getByType(num,type);
+    public FolderScene getByTypeNum(String num, Integer type) {
+        return getBaseMapper().getByTypeNum(num,type);
+    }
+
+    @Override
+    public FolderScene getByType(String sceneId, Integer type) {
+        return getBaseMapper().getByType(sceneId,type);
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

@@ -162,23 +162,26 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
 
         }
         for (String num : param.getNumList()) {
-            FolderScene folderSceneEntity = null;
-            folderSceneEntity = folderSceneService.getByType(num, param.getType());
-            if(folderSceneEntity != null){
-                folderSceneService.removeById(folderSceneEntity.getId());
-            }
-            if(param.getParentId() != null){
-                Folder folderEntity = getById(param.getParentId());
-                if(!folderEntity.getType().equals(param.getType())){
-                    throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
-                }
-                folderSceneEntity = new FolderScene();
-                folderSceneEntity.setNum(num);
-                folderSceneEntity.setFolderId(param.getParentId());
-                folderSceneService.save(folderSceneEntity);
-            }
+
         }
         if(StringUtils.isNotEmpty(param.getSceneIds())){
+            for (String s : param.getSceneIds().split(",")) {
+                FolderScene folderSceneEntity = null;
+                folderSceneEntity = folderSceneService.getByType(s, param.getType());
+                if(folderSceneEntity != null){
+                    folderSceneService.removeById(folderSceneEntity.getId());
+                }
+                if(param.getParentId() != null){
+                    Folder folderEntity = getById(param.getParentId());
+                    if(!folderEntity.getType().equals(param.getType())){
+                        throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
+                    }
+                    folderSceneEntity = new FolderScene();
+                    folderSceneEntity.setSceneId(Long.valueOf(s));
+                    folderSceneEntity.setFolderId(param.getParentId());
+                    folderSceneService.save(folderSceneEntity);
+                }
+            }
 
         }
 

src/main/resources/mapper/ucenter/FolderSceneMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.ucenter.mapper.IFolderSceneMapper">
 
-    <select id="getByType" resultType="com.fdkankan.ucenter.entity.FolderScene">
+    <select id="getByTypeNum" resultType="com.fdkankan.ucenter.entity.FolderScene">
         SELECT b.* from t_folder a left join t_folder_scene b on a.id = b.folder_id
         where  b.rec_status ='A' and b.num = #{num}
         <if test= 'type != null'>
@@ -10,6 +10,15 @@
         </if>
         limit 1
     </select>
+
+    <select id="getByType" resultType="com.fdkankan.ucenter.entity.FolderScene">
+        SELECT b.* from t_folder a left join t_folder_scene b on a.id = b.folder_id
+        where  b.rec_status ='A' and b.scene_id = #{sceneId}
+        <if test= 'type != null'>
+            and a.type = #{type}
+        </if>
+        limit 1
+    </select>
     <select id="getGroupByFolderIds" resultType="com.fdkankan.ucenter.vo.response.GroupByCount">
         SELECT folder_id as id ,count(scene_id) as count  FROM t_folder_scene
         where rec_status = 'A'