1

src/main/java/com/fdkankan/fusion/common/util/FileWriterUtil.java

@@ -61,6 +61,9 @@ public class FileWriterUtil {
     public static String setFileSize(Long length) {
         BigDecimal decimal = new BigDecimal(length);
         BigDecimal size = new BigDecimal(1024);
+        if(length >= 1024 * 1024 * 1024 ){
+            return decimal.divide(size.multiply(size.multiply(size))).setScale(2,BigDecimal.ROUND_HALF_UP).toString() + "GB";
+        }
         if(length >= 1024 * 1024 ){
             return decimal.divide(size.multiply(size)).setScale(2,BigDecimal.ROUND_HALF_UP).toString() + "MB";
         }

src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -149,6 +149,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         for (ModelVo model : page.getRecords()) {
             if(model.getModelId() == null){
                 model.setCreateStatus(0);
+                model.setModelTitle(model.getUploadTitle());
             }
             if( model.getModelId() != null && StringUtils.isEmpty(model.getNum()) ) {
                 model.setNum(model.getModelId().toString());
@@ -193,16 +194,15 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                 throw new BusinessException(ResultCode.CASE_USE.code, String.format(ResultCode.CASE_USE.msg,title));
             }
             Model model = this.getById(modelId);
-            if(model == null ){
-                throw new BusinessException(ResultCode.MODEL_NOT_EXIST);
-            }
-            this.removeById(modelId);
-            fusionNumService.deleteByModelId(modelId);
-            if(StringUtils.isNotBlank(model.getModelGlbUrl())){
-                uploadService.deleteOssUrl(model.getModelGlbUrl());
-            }
-            if(model.getUploadId() != null){
-                this.updateUploadId(model.getModelId(),null);
+            if(model != null ){
+                this.removeById(modelId);
+                fusionNumService.deleteByModelId(modelId);
+                if(StringUtils.isNotBlank(model.getModelGlbUrl())){
+                    uploadService.deleteOssUrl(model.getModelGlbUrl());
+                }
+                if(model.getUploadId() != null){
+                    this.updateUploadId(model.getModelId(),null);
+                }
             }
         }
         if(modelId == null && uploadId != null){

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -170,6 +170,9 @@ public class SceneService implements ISceneService {
             sceneVo.setSceneName(sceneVo.getTitle());
             sceneVo.setName(sceneVo.getTitle());
             sceneVo.setType(param.getType());
+            if(StringUtils.isNotBlank(sceneVo.getFileSize())){
+                sceneVo.setFileSize(FileWriterUtil.setFileSize(Long.valueOf(sceneVo.getFileSize())));
+            }
         }
 
         return PageInfo.PageInfo(sceneVoPage);

src/main/resources/mapper/fusion/ModelMapper.xml

@@ -29,7 +29,7 @@
         u.model_id,u.model_title,u.model_date_type,u.model_size,u.model_obj_url,u.model_glb_url,u.type,uc.user_name,u.create_status,u.num,
         u.model_type,uc.tb_status,uc.create_time,uc.dept_id,u.file_new_name,u.render_type,uc.id as upload_id,uc.title as uploadTitle,uc.upload_status ,uc.file_type
         from t_upload_chunk uc
-        left join t_model u on uc.id = u.upload_id
+        left join t_model u on uc.id = u.upload_id and u.tb_status = 0
         where uc.tb_status = 0 and uc.file_type in (4,5,6)
         <if test="param.deptId != null and param.deptId != ''">
             and uc.dept_id = #{param.deptId}

src/main/resources/mapper/fusion/ScenePlusMapper.xml

@@ -39,7 +39,7 @@
             left join t_scene_plus_ext e on s.id = e.plus_id
             left join t_camera a on s.camera_id = a.id
             left join t_user u on s.user_id = u.id
-        where s.rec_status = 'A'  and s.other_type  not in ('E57_V1','E57_V2','E57_V3','AZ')
+        where s.rec_status = 'A'  and s.other_type  is null
         <if test="param.snCode != null and param.snCode != ''">
             and a.sn_code like concat ('%',#{param.snCode},'%')
         </if>

src/main/resources/mapper/fusion/UploadChunkMapper.xml

@@ -7,7 +7,7 @@
     select  u.id,u.title,s.num,s.scene_source,u.create_time,s.scene_status as status ,u.upload_status ,u.user_name,u.dept_id ,s.title as sceneName,s.id as sceneId,u.file_md5,u.file_type,u.file_size
         from fd_fusion_xj.t_upload_chunk u
         left join  4dkankan_v4.t_scene_plus s on u.id = s.source_id
-    where u.tb_status = 0
+        where u.tb_status = 0
         <if test="param.type != null and param.type ==7">
               and u.file_type in (0,1,2)
         </if>
@@ -24,6 +24,13 @@
             </foreach>
         </if>
 
+        <if test="param.userNames != null and param.userNames.size >0">
+            and u.user_name in
+            <foreach collection="param.userNames" item="userName" open="(" separator="," close=")">
+                #{userName}
+            </foreach>
+        </if>
+
         <if test="param.sceneName != null and param.sceneName != ''">
             and (u.title like concat ('%',#{param.sceneName},'%')
                 or s.title like concat ('%',#{param.sceneName},'%') )