From 3f175663a851caa93a705ec0de39359726ff720f Mon Sep 17 00:00:00 2001 From: 杜洪波 <1074825718@qq.com> Date: 星期五, 23 八月 2024 17:29:48 +0800 Subject: [PATCH] 代码提交 --- src/main/java/com/product/file/config/DocumentCode.java | 2 + src/main/java/com/product/file/controller/DocumentController.java | 45 ++++++++++++++++++++++ src/main/java/com/product/file/service/DocumentService.java | 62 ++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/product/file/config/DocumentCode.java b/src/main/java/com/product/file/config/DocumentCode.java index 7857aaf..577f645 100644 --- a/src/main/java/com/product/file/config/DocumentCode.java +++ b/src/main/java/com/product/file/config/DocumentCode.java @@ -33,6 +33,8 @@ DOCUMENT_COLLECTION_FAIL("鏂囨。鏀惰棌澶辫触锛�", ModuleEnum.FILE.getValue() + "011"), DOCUMENT_CANCEL_COLLECTION_FAIL("鏂囨。鍙栨秷鏀惰棌澶辫触", ModuleEnum.FILE.getValue() + "012"), DOCUMENT_OPERATE_FAIL("鏂囨。鎿嶄綔澶辫触", ModuleEnum.FILE.getValue() + "013"), + DOCUMENT_SAVE_NEW_VERION_FAIL("鏂囨。鏈�鏂扮増鏈繚瀛樺け璐�", ModuleEnum.FILE.getValue() + "014"), + DOCUMENT_DATA_NO_EXIST("鏂囨。鏁版嵁涓嶅瓨鍦�", ModuleEnum.FILE.getValue() + "015"), ; private String text; diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java index 905f65c..91af889 100644 --- a/src/main/java/com/product/file/controller/DocumentController.java +++ b/src/main/java/com/product/file/controller/DocumentController.java @@ -415,6 +415,51 @@ return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage()); } } + + /** + * 鏂囨。鍘嗗彶鐗堟湰 + * @param request + * @return + */ + @RequestMapping(value = "/document-history/{version}", method = RequestMethod.POST) + @ApiVersion(1) + public String findDocumentHistory(HttpServletRequest request) { + try { + //鑾峰彇鍙傛暟 + FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION); + return OK_List(documentService.findDocumentHistory(fse.getUUID())); + } catch (BaseException e) { + e.printStackTrace(); + return this.error(e); + } catch (Exception e) { + e.printStackTrace(); + return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage()); + } + } + + /** + * 鏂囨。鏈�鏂扮増鏈繚瀛� + * @param request + * @return + */ + @RequestMapping(value = "/document-save-new-version/{version}", method = RequestMethod.POST) + @ApiVersion(1) + public String documentSaveNewVersion(HttpServletRequest request) { + try { + //鑾峰彇鍙傛暟 + FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION); + if (documentService.documentSaveNewVersion(fse)) { + return OK(); + } + return error(DocumentCode.DOCUMENT_SAVE_NEW_VERION_FAIL.getValue(), DocumentCode.DOCUMENT_SAVE_NEW_VERION_FAIL.getText()); + } catch (BaseException e) { + e.printStackTrace(); + return this.error(e); + } catch (Exception e) { + e.printStackTrace(); + return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage()); + } + } @RequestMapping(value = "/getApplyDocument/{version}", method = RequestMethod.POST) diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java index 8effcfd..f6609a9 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -6,7 +6,6 @@ import com.product.common.collect.ListUtils; import com.product.common.collect.MapUtils; import com.product.common.lang.DateUtils; -import com.product.core.config.Global; import com.product.core.dao.BaseDao; import com.product.core.entity.DataTableEntity; import com.product.core.entity.FieldMetaEntity; @@ -17,6 +16,7 @@ import com.product.core.spring.context.SpringMVCContextHolder; import com.product.core.transfer.Transactional; import com.product.file.config.CmnConst; +import com.product.file.config.DocumentCode; import com.product.file.service.ide.IDocumentService; import com.product.module.sys.entity.SystemUser; import com.product.util.BaseUtil; @@ -87,6 +87,7 @@ BaseUtil.createCreatorAndCreationTime(fseDocumentHistory); fseDocument.setValue("document_uuid", documentUUID); fseDocument.setValue("attachment_uuid", attachment.getUUID()); + fseDocument.setValue("version_number", "v1"); baseDao.add(fseDocumentHistory); uuidList.add(documentUUID); @@ -500,6 +501,65 @@ public boolean documentCancelCollection(String documentUUID) { return baseDao.delete(CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION, "document_uuid = ? AND document_collector = ?", new Object[] {documentUUID, SpringMVCContextHolder.getCurrentUserId()}); } + + /** + * 鏌ヨ鏂囨。鍘嗗彶鐗堟湰 + * @param documentUUID + * @return + */ + public DataTableEntity findDocumentHistory(String documentUUID) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT A.*,B.file_name"); + sql.append("FROM product_oa_document_history A \n"); + sql.append("LEFT JOIN product_oa_document_history B ON B.uuid = A.document_uuid \n"); + sql.append("WHERE A.document_uuid = ?"); + sql.append("ORDER BY A.version_number"); + return baseDao.listTable(sql.toString(), new Object[] {documentUUID}); + } + + /** + * 鏂囨。鏈�鏂扮増鏈繚瀛� + * @param fse + * @return + */ + @Transactional + public boolean documentSaveNewVersion(FieldSetEntity fse) { + // 鑾峰彇鏂囨。鏁版嵁鍜屾渶澶х紪鍙� + StringBuilder sql = new StringBuilder(); + sql.append("SELECT A.*, IFNULL(B.max_version_number, 'v0')AS max_version_number \n"); + sql.append("FROM product_oa_document A \n"); + sql.append("LEFT JOIN ( \n"); + sql.append(" SELECT document_uuid, MAX(version_number) AS max_version_number \n"); + sql.append(" FROM product_oa_document_history B \n"); + sql.append(" WHERE document_uuid = ? \n"); + sql.append(" GROUP BY document_uuid \n"); + sql.append(") B ON B.document_uuid = A.uuid \n"); + sql.append("WHERE uuid = ? \n"); + FieldSetEntity fseDocument = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[] {fse.getString("document_uuid"),fse.getString("document_uuid")}, false); + if(fseDocument == null) { + throw new BaseException(DocumentCode.DOCUMENT_DATA_NO_EXIST.getValue(), DocumentCode.DOCUMENT_DATA_NO_EXIST.getText()); + } + fseDocument.setValue("attachments_uuid", fse.getString("attachment_uuid")); + baseDao.saveFieldSetEntity(fseDocument); + + fse.setValue("version_number", versionNUmberAddne(fseDocument.getString("max_version_number"))); + return baseDao.saveFieldSetEntity(fse); + } + + /** + * 鏂囨。鐗堟湰+1 + * @param originNumber + * @return + */ + public String versionNUmberAddne(String originNumber) { + String numberStr = originNumber.substring(1); // 鍘绘帀鍓嶇紑"v" + int number = Integer.parseInt(numberStr); // 灏嗗瓧绗︿覆杞� + // 鏁板瓧鍔犱竴 + number += 1; + + // 閲嶆柊鏋勫缓瀛楃涓诧紙杩欓噷鎴戜滑鍋囪鍓嶇紑鎬绘槸"v"锛� + return "v" + number; + } @Override public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException { -- Gitblit v1.9.2