From 3e172a1d533c62d84c30d81421d8739437466a32 Mon Sep 17 00:00:00 2001 From: ZhangAo Date: Mon, 23 Mar 2026 17:29:20 +0800 Subject: [PATCH] u --- .../g3soft/controller/DataListController.java | 6 + .../g3soft/controller/DataSaveController.java | 6 +- .../cn/g3soft/controller/FileController.java | 15 +- .../ocr-uniapp/src/pages-sub/upload/index.vue | 109 +- .../ocr-uniapp/src/request/api.ts | 21 +- .../ocr-uniapp/src/utils/file.ts | 2 +- code/container-ocr/ocr-vue/.env | 4 +- code/container-ocr/ocr-vue/components.d.ts | 8 + code/container-ocr/ocr-vue/package.json | 6 +- code/container-ocr/ocr-vue/pnpm-lock.yaml | 532 +++++++- .../ocr-vue/src/components/g3-file/index.vue | 1207 +++++++++++++++++ .../src/components/wang-editor/config.ts | 63 + .../src/components/wang-editor/index.vue | 236 ++++ .../wang-editor/modules/directory.vue | 169 +++ .../wang-editor/modules/preview.vue | 133 ++ .../ocr-vue/src/layout/components/menu.vue | 29 +- code/container-ocr/ocr-vue/src/request/api.js | 30 +- code/container-ocr/ocr-vue/src/utils/diff.js | 74 + code/container-ocr/ocr-vue/src/utils/file.js | 366 +++++ .../ocr-vue/src/views/system/module/index.vue | 588 ++++---- .../system/oa/notice/category-dialog.vue | 546 ++++++++ .../views/system/oa/notice/edit-drawer.vue | 174 +++ .../src/views/system/oa/notice/index.vue | 374 ++++- .../src/views/system/oa/reminder/index.vue | 469 ++++++- .../system/oa/reminder/popupTextarea.vue | 64 + code/g3hd-old/g3hd-vue/src/utils/file.js | 2 +- 26 files changed, 4820 insertions(+), 413 deletions(-) create mode 100644 code/container-ocr/ocr-vue/src/components/g3-file/index.vue create mode 100644 code/container-ocr/ocr-vue/src/components/wang-editor/config.ts create mode 100644 code/container-ocr/ocr-vue/src/components/wang-editor/index.vue create mode 100644 code/container-ocr/ocr-vue/src/components/wang-editor/modules/directory.vue create mode 100644 code/container-ocr/ocr-vue/src/components/wang-editor/modules/preview.vue create mode 100644 code/container-ocr/ocr-vue/src/utils/file.js create mode 100644 code/container-ocr/ocr-vue/src/views/system/oa/notice/category-dialog.vue create mode 100644 code/container-ocr/ocr-vue/src/views/system/oa/notice/edit-drawer.vue create mode 100644 code/container-ocr/ocr-vue/src/views/system/oa/reminder/popupTextarea.vue diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataListController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataListController.java index 27f3324f..98b6d629 100644 --- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataListController.java +++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataListController.java @@ -3,6 +3,7 @@ package cn.g3soft.controller; import cn.g3soft.utils.DbUtils; import cn.g3soft.utils.Result; import cn.g3soft.utils.ValidationUtils; +import cn.g3soft.utils.uniqueId.idgen.UniqueId; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -164,4 +165,9 @@ public class DataListController { return Result.ok(list.get(0)); } + + @PostMapping("/getUniqueId") + public Result getUniqueId(){ + return Result.ok(UniqueId.nextId()); + } } diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java index 4c195d2a..96a8b1fe 100644 --- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java +++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java @@ -192,13 +192,13 @@ public class DataSaveController { return Result.ok(); } - @PostMapping("/deleteModule") + @PostMapping("/deleteObject") @Transactional(rollbackFor = Exception.class) public Result> deleteModule(@RequestBody Map params) { - ValidationUtils.checkRequiredFields(params, "moduleId", "Id"); + ValidationUtils.checkRequiredFields(params, "moduleId", "id"); String moduleId = params.get("moduleId").toString(); - String id = params.get("Id").toString(); + String id = params.get("id").toString(); Map operationCounts = new LinkedHashMap<>(); operationCounts.put("total", 0); diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java index edd5f85d..0ac8345e 100644 --- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java +++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java @@ -21,13 +21,13 @@ public class FileController { @PostMapping("/getAliyunKey") public Result> getAliyunKey(@RequestBody Map params) { - ValidationUtils.checkRequiredFields(params, "bucket"); + ValidationUtils.checkRequiredFields(params, "bucketName"); - String bucket = (String) params.get("bucket"); + String bucketName = (String) params.get("bucketName"); String orgId = UserContext.get().getOrgId(); - String requestUrl = "http://g3oss.g3soft.cn:8082/upload?orgid=" + orgId + "&bucket=" + bucket; + String requestUrl = "http://g3oss.g3soft.cn:8082/upload?orgid=" + orgId + "&bucket=" + bucketName; String reqResult = HttpUtils.sendGet(requestUrl); Map objectMap = JsonUtils.toMap(reqResult); @@ -37,19 +37,22 @@ public class FileController { @PostMapping("/insert") @Transactional(rollbackFor = Exception.class) - public Result insertFile(@RequestBody Map params) { + public Result insertFile(@RequestBody Map params) { ValidationUtils.checkRequiredFields(params, "father", "mx_xh", "mx_filename", "mx_filesize", "mx_mapfilename", "mx_moduleid"); String userId = UserContext.get().getUserId(); - params.put("subid", UniqueId.nextId()); + long nextId = UniqueId.nextId(); + + params.put("subid", nextId); params.put("mx_inputuser_id",userId); params.put("mx_inputdatetime", TimeUtils.getDateTime()); dbUtils.insert("bf_file","subid",params); - return Result.ok(); + return Result.ok(nextId); } + @PostMapping("/delete") @Transactional(rollbackFor = Exception.class) public Result deleteFile(@RequestBody Map params) { diff --git a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue index d366ccc4..d3c89049 100644 --- a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue +++ b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue @@ -1,7 +1,8 @@