111

src/main/java/com/fdkankan/scene/Interceptor/InitEditInfoAspect.java

@@ -70,7 +70,7 @@ public class InitEditInfoAspect {
 		String num = (String) parameter.get("num");
 		Integer subgroup = (Integer) parameter.get("subgroup");
 
-		List<Scene> scenes = sceneService.listByNum(num);
+		List<Scene> scenes = sceneService.listByNum(num, subgroup);
 		if(CollUtil.isEmpty(scenes)){
 			throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 		}
@@ -113,7 +113,7 @@ public class InitEditInfoAspect {
 
 		Set<String> keySet = new HashSet<>();
 		Set<Long> deleteIds = new HashSet<>();
-		List<SceneFileMapping> mappingList = sceneFileMappingService.list(new LambdaQueryWrapper<SceneFileMapping>().eq(SceneFileMapping::getNum, num).orderByDesc(SceneFileMapping::getId));
+		List<SceneFileMapping> mappingList = sceneFileMappingService.list(new LambdaQueryWrapper<SceneFileMapping>().eq(SceneFileMapping::getNum, num).eq(SceneFileMapping::getSubgroup, subgroup).orderByDesc(SceneFileMapping::getId));
 		for (SceneFileMapping mapping : mappingList) {
 			if(keySet.contains(mapping.getKey())){
 				deleteIds.add(mapping.getId());

src/main/java/com/fdkankan/scene/controller/OssFileMappingController.java

@@ -26,18 +26,18 @@ public class OssFileMappingController {
                               HttpServletRequest request,
                               HttpServletResponse response) throws IOException {
         String key = request.getServletPath().replaceFirst("/", "").replace("scene_edit_data", "scene_view_data");
-        if(Objects.nonNull(subgroup)){
-            String[] split = key.split("/");
-            StringBuilder keyBuilder = new StringBuilder();
-            for (int i = 0; i < split.length; i++){
-                keyBuilder.append(split[i]);
-                if(i == 1){
-                    keyBuilder.append("-" + subgroup);
-                }
-            }
-            key = keyBuilder.toString();
-        }
-        sceneService.outFileByKey2(key, response);
+//        if(Objects.nonNull(subgroup)){
+//            String[] split = key.split("/");
+//            StringBuilder keyBuilder = new StringBuilder();
+//            for (int i = 0; i < split.length; i++){
+//                keyBuilder.append(split[i]);
+//                if(i == 1){
+//                    keyBuilder.append("-" + subgroup);
+//                }
+//            }
+//            key = keyBuilder.toString();
+//        }
+        sceneService.outFileByKey2(key, subgroup, response);
     }
 
 

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -64,7 +64,7 @@ public class SceneController {
 
     @GetMapping("/file")
     public void outFileByKey2(String key, HttpServletResponse response) throws IOException {
-        sceneService.outFileByKey2(key, response);
+        sceneService.outFileByKey2(key, null, response);
     }
 
 

src/main/java/com/fdkankan/scene/entity/SceneFileMapping.java

@@ -41,6 +41,9 @@ public class SceneFileMapping extends Model<SceneFileMapping> {
     @TableField("URL")
     private String url;
 
+    @TableField("SUBGROUP")
+    private Integer subgroup;
+
 
     @Override
     public Serializable pkVal() {

src/main/java/com/fdkankan/scene/service/SceneService.java

@@ -28,10 +28,10 @@ public interface SceneService extends IService<Scene> {
 
     ResponseEntity<Resource> outFileByKey(String key, HttpServletResponse response) throws IOException;
 
-    void outFileByKey2(String key, HttpServletResponse response) throws IOException;
+    void outFileByKey2(String key, Integer subgroup, HttpServletResponse response) throws IOException;
 
     Scene getByNum(String num, Integer subgroup);
 
-    List<Scene> listByNum(String num);
+    List<Scene> listByNum(String num, Integer subgroup);
 
 }

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -106,8 +106,8 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
     }
 
     @Override
-    public void outFileByKey2(String key, HttpServletResponse response) throws IOException {
-        SceneFileMapping one = sceneFileMappingService.getOne(new LambdaQueryWrapper<SceneFileMapping>().eq(SceneFileMapping::getKey, key));
+    public void outFileByKey2(String key, Integer subgroup, HttpServletResponse response) throws IOException {
+        SceneFileMapping one = sceneFileMappingService.getOne(new LambdaQueryWrapper<SceneFileMapping>().eq(SceneFileMapping::getKey, key).eq(SceneFileMapping::getSubgroup, subgroup));
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
         response.setHeader("Content-Disposition", "attachment; filename=\"" + FileUtil.getName(key) + "\"");
         try(
@@ -159,7 +159,7 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
     }
 
     @Override
-    public List<Scene> listByNum(String num) {
-        return this.list(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
+    public List<Scene> listByNum(String num, Integer subgroup) {
+        return this.list(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num).eq(Scene::getSubgroup, subgroup));
     }
 }