三位模型编辑器

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

@@ -80,6 +80,17 @@ public class NjsSceneBoxModelController {
         return ResultData.ok();
     }
 
+    /**
+     * 批量修改 是否显示或显示尺寸
+     * @param param
+     * @return
+     */
+    @PostMapping("getProgress")
+    public ResultData<Void> getProgress(@RequestBody @Valid BaseSceneParamVO dto) throws IOException {
+        sceneBoxModelService.getProgress(dto);
+        return ResultData.ok();
+    }
+
 
 
 

src/main/java/com/fdkankan/scene/dto/NjsBoxModelDTO.java

@@ -72,7 +72,7 @@ public class NjsBoxModelDTO {
      */
     private Integer status;
 
-    private Integer loaded;
+    private Byte loaded;
 
     private Integer visible;
 

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

@@ -86,7 +86,7 @@ public class NjsSceneBoxModel implements Serializable {
     private Integer status;
 
     @TableField("loaded")
-    private Integer loaded;
+    private Byte loaded;
 
     @TableField("create_time")
     private Date createTime;

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

@@ -146,15 +146,9 @@ public class NjsSceneBoxModelServiceImpl extends ServiceImpl<INjsSceneBoxModelMa
 
     @Override
     public List<NjsBoxModelDTO> listNjsBoxModel(BaseSceneParamVO param) {
-        List<NjsSceneBoxModel> list = lambdaQuery().eq(NjsSceneBoxModel::getNum, param.getNum()).list();
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         List<NjsBoxModelDTO> results = new ArrayList<>();
-        if(CollUtil.isNotEmpty(list)){
-            List<NjsBoxModelDTO> njsBoxModelDTOS = BeanUtil.copyToList(list, NjsBoxModelDTO.class);
-            njsBoxModelDTOS.stream().forEach(v->v.setSourceType("model"));
-            results.addAll(njsBoxModelDTOS);
-        }
         if(StrUtil.isNotEmpty(sceneEditInfo.getBoxModels())){
             JSONArray boxModels = JSON.parseArray(sceneEditInfo.getBoxModels());
             List<NjsBoxModelDTO> collect = boxModels.stream().map(m -> {
@@ -170,7 +164,20 @@ public class NjsSceneBoxModelServiceImpl extends ServiceImpl<INjsSceneBoxModelMa
             }).collect(Collectors.toList());
             results.addAll(collect);
         }
-        if(CollUtil.isEmpty(list)){
+        List<NjsSceneBoxModel> list = lambdaQuery().eq(NjsSceneBoxModel::getNum, param.getNum()).list();
+        if(CollUtil.isNotEmpty(list)){
+            List<NjsSceneBoxModel> notLoadedList = list.stream().filter(
+                    v -> v.getStatus().equals(CommonSuccessStatus.SUCCESS.code()) && v.getLoaded().equals(CommonStatus.NO.code())
+            ).map(v->v.setLoaded(CommonStatus.YES.code()).code())).collect(Collectors.toList());
+            if(!notLoadedList.isEmpty()){
+                notLoadedList.stream().forEach();
+            }
+            List<NjsBoxModelDTO> njsBoxModelDTOS = BeanUtil.copyToList(list, NjsBoxModelDTO.class);
+            njsBoxModelDTOS.stream().forEach(v->v.setSourceType("model"));
+            results.addAll(njsBoxModelDTOS);
+        }
+
+        if(CollUtil.isEmpty(results)){
             return null;
         }