优化onlyoffice在线编辑
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.controller.admin;
|
||||
|
||||
|
||||
import com.zt.plat.framework.business.annotation.FileUploadController;
|
||||
import com.zt.plat.framework.business.controller.AbstractFileUploadController;
|
||||
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||
import com.zt.plat.framework.common.enums.UserTypeEnum;
|
||||
@@ -12,7 +11,6 @@ import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.zt.plat.framework.tenant.core.aop.TenantIgnore;
|
||||
import com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.controller.vo.OnlyOfficeEditorConfigRespVO;
|
||||
import com.zt.plat.module.qms.resource.record.controller.admin.onlyOffice.service.OnlyOfficeService;
|
||||
import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.RecordRecordController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -34,15 +32,15 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
@RequestMapping("/qms/common/only-office")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.only-office", codeKey = "data.fileUploadBusinessCode")
|
||||
//@FileUploadController(source = "qms.only-office", codeKey = "data.fileUploadBusinessCode")
|
||||
public class OnlyOfficeController extends AbstractFileUploadController implements BusinessControllerMarker {
|
||||
|
||||
static {
|
||||
FileUploadController annotation = RecordRecordController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
// static {
|
||||
// FileUploadController annotation = RecordRecordController.class.getAnnotation(FileUploadController.class);
|
||||
// if (annotation != null) {
|
||||
// setFileUploadInfo(annotation);
|
||||
// }
|
||||
// }
|
||||
|
||||
@Resource
|
||||
private OnlyOfficeService onlyOfficeService;
|
||||
@@ -57,6 +55,7 @@ public class OnlyOfficeController extends AbstractFileUploadController implement
|
||||
@GetMapping("/file-content")
|
||||
@Operation(summary = "获取文档文件内容")
|
||||
@PermitAll
|
||||
@TenantIgnore
|
||||
public void getFileContent(@RequestParam("fileId") Long fileId,
|
||||
@RequestParam("token") String token,
|
||||
HttpServletResponse response) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -63,4 +63,6 @@ public interface RecordFileAttachmentService {
|
||||
PageResult<RecordFileAttachmentDO> getRecordFileAttachmentPage(RecordFileAttachmentPageReqVO pageReqVO);
|
||||
|
||||
int createRecordFileAttachmentBatch(List<RecordFileAttachmentSaveReqVO> createAttachmentReqVOList);
|
||||
|
||||
void deleteRecordFileAttachmentByRecord(Long recordId);
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.zt.plat.module.qms.resource.record.service.recordfileattachment;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.jwt.JWT;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentPageReqVO;
|
||||
@@ -97,6 +98,12 @@ public class RecordFileAttachmentServiceImpl implements RecordFileAttachmentServ
|
||||
return bean.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteRecordFileAttachmentByRecord(Long recordId) {
|
||||
LambdaQueryWrapper<RecordFileAttachmentDO> query = new LambdaQueryWrapper<>();
|
||||
query.eq(RecordFileAttachmentDO::getRecordId, recordId);
|
||||
recordFileAttachmentMapper.delete(query);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -41,6 +41,7 @@ import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
@@ -105,6 +106,11 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
||||
return BeanUtils.toBean(recordRecord, RecordRecordRespVO.class);
|
||||
}
|
||||
|
||||
// 删除附件,通过recordId
|
||||
public void deleteFileAttachment(Long recordId) {
|
||||
recordFileAttachmentService.deleteRecordFileAttachmentByRecord(recordId);
|
||||
}
|
||||
|
||||
// 添加文件记录附件
|
||||
public void createFileAttachment(List<UploadFileVo> files, Long recordId) {
|
||||
// List<UploadFileVo> files = createReqVO.getFiles();
|
||||
@@ -273,6 +279,57 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
||||
// return BeanUtils.toBean(recordRecordList, RecordRecordRespVO.class);
|
||||
//
|
||||
// }
|
||||
// 文件提交,修改生效状态
|
||||
public void recordSubmitStatus(RecordRecordDO recordDO) {
|
||||
Integer recordStatus = recordDO.getRecordStatus();
|
||||
if (recordStatus != null && recordStatus == 1)
|
||||
throw exception0(RECORD_APPLY_NOT_EXISTS.getCode(), "文件已提交,无法提交申请");
|
||||
// RecordCategoryDO recordCategory = recordCategoryService.getRecordCategory(recordDO.getCategoryId());
|
||||
// 获取分类的根分类Id
|
||||
// String idPath = recordCategory.getIdPath();
|
||||
// Optional<String> segment = RecordCommonUtils.getSegment(idPath, 1);
|
||||
// String s = segment.orElse(null);
|
||||
// if (ObjectUtils.isEmpty(s))
|
||||
// throw exception(RECORD_APPLY_NOT_EXISTS);
|
||||
// RecordCategoryDO category = recordCategoryService.getRecordCategory(Long.valueOf(s));
|
||||
// String customConfig = category.getCustomConfig();
|
||||
// if (ObjectUtils.isEmpty(customConfig)) { // 空,直接判断是否到生效日期
|
||||
// 判断是否到生效日期
|
||||
// RecordRecordDO effectiveRecordRecordDO = isEffective(recordDO);
|
||||
// this.updateRecordRecordById(effectiveRecordRecordDO);
|
||||
// return true;
|
||||
// }
|
||||
// JSONObject jsonObject = JSONObject.parseObject(customConfig);
|
||||
// Integer submitFlag = jsonObject.getInteger("submitFlag");
|
||||
// if (submitFlag == 0) {
|
||||
// 不允许提交,直接修改文件记录状态
|
||||
// recordDO.setRecordStatus(1); // 已生效
|
||||
RecordRecordDO effectiveRecordRecordDO = isEffective(recordDO);
|
||||
this.updateRecordRecordById(effectiveRecordRecordDO);
|
||||
// return true;
|
||||
// } else { // 需要走流程
|
||||
// recordDO.setSubmitFlag(1);
|
||||
// recordDO.setRecordStatus(0);
|
||||
// this.updateRecordRecordById(recordDO);
|
||||
// }
|
||||
|
||||
// return false;
|
||||
}
|
||||
|
||||
// 判断文件记录生效状态
|
||||
public RecordRecordDO isEffective(RecordRecordDO recordDO) {
|
||||
LocalDateTime effectiveDate = recordDO.getEffectiveDate();
|
||||
if (effectiveDate == null) { // 没有生效日期,立即生效
|
||||
recordDO.setRecordStatus(1);
|
||||
} else {
|
||||
recordDO.setRecordStatus(0); // 待生效
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
if (now.isAfter(effectiveDate) || now.isEqual(effectiveDate)) {
|
||||
recordDO.setRecordStatus(1); // 已生效
|
||||
}
|
||||
}
|
||||
return recordDO;
|
||||
}
|
||||
|
||||
|
||||
//通过跟分类的自定义属性判断文件状态
|
||||
@@ -316,6 +373,7 @@ public class RecordRecordServiceImpl implements RecordRecordService {
|
||||
|
||||
//删除附件
|
||||
//TODO
|
||||
deleteFileAttachment(updateObj.getId());
|
||||
// 保存附件
|
||||
List<UploadFileVo> files = updateObj.getFiles();
|
||||
createFileAttachment(files, updateObj.getId());
|
||||
|
||||
Reference in New Issue
Block a user