|
@@ -11,7 +11,9 @@ import com.backendsys.modules.common.config.security.utils.HttpRequestUtil;
|
|
|
import com.backendsys.modules.common.config.security.utils.SecurityUtil;
|
|
|
import com.backendsys.modules.sdk.douyincloud.tos.service.DouyinTosService;
|
|
|
import com.backendsys.modules.sdk.tencentcloud.cos.service.TencentCosService;
|
|
|
+import com.backendsys.modules.system.dao.SysUserDao;
|
|
|
import com.backendsys.modules.system.entity.SysCommon;
|
|
|
+import com.backendsys.modules.system.entity.SysUser;
|
|
|
import com.backendsys.modules.system.service.SysCommonService;
|
|
|
import com.backendsys.modules.upload.dao.SysFileDao;
|
|
|
import com.backendsys.modules.upload.entity.SysFile;
|
|
@@ -60,6 +62,9 @@ public class SysFileMultipartServiceImpl implements SysFileMultipartService {
|
|
|
private DouyinTosService douyinTosService;
|
|
|
@Autowired
|
|
|
private SysCommonService sysCommonService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SysUserDao sysUserDao;
|
|
|
@Autowired
|
|
|
private SysFileDao sysFileDao;
|
|
|
|
|
@@ -368,12 +373,15 @@ public class SysFileMultipartServiceImpl implements SysFileMultipartService {
|
|
|
// [DB] 更新分块记录
|
|
|
sysFileDao.updateCompleteFile(sysFileEntity);
|
|
|
|
|
|
-// Map<String, Object> resp = new LinkedHashMap<>();
|
|
|
-// resp.put("upload_id", upload_id);
|
|
|
-// resp.put("request_id", sysFileEntity.getRequest_id());
|
|
|
-// resp.put("object_key", sysFileEntity.getObject_key());
|
|
|
-// resp.put("url", sysFileEntity.getUrl());
|
|
|
-// return resp;
|
|
|
+ // -- 合并分块成功时,返回值 -------------------------------------
|
|
|
+ // 移除 upload_id
|
|
|
+ sysFileEntity.setUpload_id(null);
|
|
|
+ // 翻译 储存介质
|
|
|
+ sysFileEntity.setTarget_label(StyleEnums.targetToLabel(sysFileEntity.getTarget()));
|
|
|
+ // 翻译 用户名
|
|
|
+ SysUser userEntity = sysUserDao.selectById(sysFileEntity.getUser_id());
|
|
|
+ sysFileEntity.setUsername(userEntity.getUsername());
|
|
|
+ // ----------------------------------------------------
|
|
|
|
|
|
return sysFileEntity;
|
|
|
|