Browse Source

model2mediy

lyhzzz 3 tháng trước cách đây
mục cha
commit
7d1d059f45

+ 51 - 0
doc/v1.9.0/fusion-1.9.0.sql

@@ -31,3 +31,54 @@ CREATE TABLE `t_case_path` (
 
 
 
+CREATE TABLE `t_dict` (
+                          `id` int(11) NOT NULL AUTO_INCREMENT,
+                          `dict_name` varchar(255) DEFAULT NULL,
+                          `dict_key` varchar(255) DEFAULT NULL,
+                          `sort` int(11) DEFAULT '1',
+                          `rec_status` varchar(255) DEFAULT 'A',
+                          `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                          `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                          `sys_user_id` varchar(255) DEFAULT NULL,
+                          `parent_id` int(11) DEFAULT NULL,
+                          `use_type` varchar(255) DEFAULT 'ordinary',
+                          PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
+
+
+CREATE TABLE `t_dict_file` (
+                               `id` int(11) NOT NULL AUTO_INCREMENT,
+                               `name` varchar(255) DEFAULT NULL,
+                               `type_key` varchar(255) DEFAULT NULL,
+                               `dict_id` int(11) DEFAULT NULL,
+                               `rec_status` varchar(255) DEFAULT 'A',
+                               `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                               `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                               `sys_user_id` varchar(255) DEFAULT NULL,
+                               `upload_id` int(11) DEFAULT NULL,
+                               `use_type` varchar(255) DEFAULT 'ordinary',
+                               PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;
+
+
+
+CREATE TABLE `t_common_upload` (
+                                   `id` int(11) NOT NULL AUTO_INCREMENT,
+                                   `file_name` varchar(255) DEFAULT NULL,
+                                   `file_url` varchar(255) DEFAULT NULL,
+                                   `file_size` varchar(255) DEFAULT NULL,
+                                   `new_file_name` varchar(255) DEFAULT NULL,
+                                   `file_type_str` varchar(255) DEFAULT NULL,
+                                   `file_format` varchar(255) DEFAULT NULL,
+                                   `result_file_format` varchar(255) DEFAULT NULL,
+                                   `rec_status` varchar(255) DEFAULT 'A',
+                                   `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                                   `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                   `status` int(11) DEFAULT '0',
+                                   `unzip_path` varchar(255) DEFAULT NULL,
+                                   `file_type` int(11) DEFAULT NULL,
+                                   `wgs84` varchar(255) DEFAULT NULL,
+                                   `gcj02` varchar(255) DEFAULT NULL,
+                                   `use_type` varchar(255) DEFAULT 'ordinary',
+                                   PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;

+ 1 - 1
src/main/java/com/fdkankan/fusion/entity/Dict.java

@@ -45,7 +45,7 @@ public class Dict implements Serializable {
     private Date updateTime;
 
     @TableField("sys_user_id")
-    private Integer sysUserId;
+    private String sysUserId;
 
     @TableField("use_type")
     private String useType;

+ 1 - 1
src/main/java/com/fdkankan/fusion/entity/DictFile.java

@@ -45,7 +45,7 @@ public class DictFile implements Serializable {
     private Date updateTime;
 
     @TableField("sys_user_id")
-    private Integer sysUserId;
+    private String sysUserId;
 
     @TableField("upload_id")
     private Integer uploadId;

+ 1 - 1
src/main/java/com/fdkankan/fusion/request/DictFileParam.java

@@ -13,5 +13,5 @@ public class DictFileParam extends RequestBase {
     private Integer fileType;
     private List<String> fileFormats;
     private List<Integer> dictIds;
-    private Long sysUserId;
+    private String sysUserId;
 }

+ 3 - 0
src/main/java/com/fdkankan/fusion/service/impl/DictFileServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.service.impl;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.PageInfo;
@@ -40,6 +41,7 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
         if(StringUtils.isBlank(param.getTypeKey())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        param.setSysUserId((String) StpUtil.getLoginId());
         Page<DictFileVo> pageVo = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(pageVo);
     }
@@ -50,6 +52,7 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
                 || dictFile.getDictId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        dictFile.setSysUserId((String) StpUtil.getLoginId());
         this.saveOrUpdate(dictFile);
     }
 

+ 5 - 0
src/main/java/com/fdkankan/fusion/service/impl/DictServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.service.impl;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.PageInfo;
@@ -39,6 +40,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         }
         LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Dict::getDictKey,dictKey);
+        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         return list(wrapper);
@@ -54,6 +56,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         if(StringUtils.isNotBlank(param.getDictName())){
             wrapper.like(Dict::getDictName,param.getDictName());
         }
+        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
@@ -65,6 +68,8 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         if(StringUtils.isBlank(dict.getDictName()) || StringUtils.isBlank(dict.getDictKey())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        String userId  =(String) StpUtil.getLoginId();
+        dict.setSysUserId(userId);
         this.saveOrUpdate(dict);
     }
 

+ 65 - 2
src/main/java/com/fdkankan/fusion/task/TaskService.java

@@ -1,8 +1,12 @@
 package com.fdkankan.fusion.task;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.unit.DataSizeUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.util.DateUtils;
-import com.fdkankan.fusion.entity.CaseLive;
-import com.fdkankan.fusion.service.ICaseLiveService;
+import com.fdkankan.fusion.entity.*;
+import com.fdkankan.fusion.service.*;
 import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -45,4 +49,63 @@ public class TaskService {
             }
         }
     }
+
+    @Autowired
+    IModelService modelService;
+    @Autowired
+    ICommonUploadService commonUploadService;
+    @Autowired
+    IDictFileService dictFileService;
+    @Autowired
+    ITmUserService tmUserService;
+
+    public void modelToMedia(){
+        LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Model::getType,3);
+        wrapper.eq(Model::getCreateStatus,1);
+        wrapper.isNotNull(Model::getModelGlbUrl);
+        wrapper.isNotNull(Model::getUserName);
+        List<Model> list = modelService.list(wrapper);
+
+        LambdaQueryWrapper<CommonUpload> wrapper1 = new LambdaQueryWrapper<>();
+
+        for (Model model : list) {
+            TmUser tmUser = tmUserService.getByUserName(model.getUserName());
+            if(tmUser == null){
+                continue;
+            }
+
+            String modelGlbUrl = model.getModelGlbUrl();
+            JSONArray jsonArray = JSONArray.parseArray(modelGlbUrl);
+            String fileUrl = (String) jsonArray.get(0);
+
+            wrapper1.eq(CommonUpload::getFileUrl,fileUrl);
+            List<CommonUpload> list1 = commonUploadService.list(wrapper1);
+            if(!list1.isEmpty()){
+                continue;
+            }
+
+            CommonUpload commonUpload = new CommonUpload();
+            commonUpload.setFileName(model.getModelTitle());
+            commonUpload.setFileUrl(fileUrl);
+            commonUpload.setFileSize(String.valueOf(DataSizeUtil.parse(model.getModelSize())));
+            commonUpload.setNewFileName(model.getModelTitle());
+            commonUpload.setFileType(3);
+            commonUpload.setFileTypeStr("模型");
+            commonUpload.setFileFormat(model.getModelDateType());
+            commonUpload.setResultFileFormat(model.getModelType());
+            commonUpload.setStatus(1);
+            commonUpload.setUseType("ordinary");
+            commonUploadService.save(commonUpload);
+
+            DictFile dictFile = new DictFile();
+            dictFile.setName(model.getModelTitle());
+            dictFile.setTypeKey("media-library");
+            dictFile.setSysUserId(tmUser.getUserName());
+            dictFile.setUploadId(commonUpload.getId());
+            dictFile.setUseType("ordinary");
+            dictFileService.save(dictFile);
+        }
+    }
+
 }