From 78c1f87d61d1411356a422ab841afde67342d228 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Wed, 04 Sep 2024 20:52:15 +0800
Subject: [PATCH] 1、事项登记、详情查询接口 2、ocr识别文字接口 3、办理流转-查询下属人员、选择经办人、获取工作人员信息、添加办理反馈、获取办理反馈信息、修改办理反馈信息 4、督办-添加督办、回复督办、查询督办列表 5、查询评价

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
index 963a377..6967199 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
@@ -18,6 +18,7 @@
 import cn.huge.module.sys.constant.FileBaseConsts;
 import cn.huge.module.sys.constant.FileOwnerTypeBaseEnum;
 import cn.huge.module.sys.dto.FileInfoBaseDTO;
+import cn.huge.module.utils.BaiduOcrUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -61,20 +62,20 @@
 
     /**
      * 页面附件上传-文件流方式
-     * @url {ctx}/api/wechat/fileInfo/upload/{mainId}/{ownerId}/{ownerType}
+     * @url {ctx}/api/wechat/fileInfo/upload?mainId=&ownerId=&ownerType=
      * @param mainId 所属业务主体编号
      * @param ownerId 所属业务编号
      * @param ownerType 所属业务类型
      * @param request 请求头
      * @return Object
      */
-    @PostMapping("/upload/{ownerId}/{ownerType}")
-    public Object upload(@PathVariable(value = "mainId") String mainId,
-                         @PathVariable(value = "ownerId") String ownerId,
-                         @PathVariable(value = "ownerType") String ownerType,
+    @PostMapping("/upload")
+    public Object upload(@RequestParam(value = "mainId") String mainId,
+                         @RequestParam(value = "ownerId") String ownerId,
+                         @RequestParam(value = "ownerType") String ownerType,
                          @CurrentUser String userId, MultipartHttpServletRequest request) {
         try{
-            PaUserDTO loginUser = custClient.paclientGetUser(userId);
+            PaUserDTO loginUser = custClient.paClientGetUserAll(userId);
             UploaderDTO uploaderDTO = new UploaderDTO();
             uploaderDTO.setUploaderId(loginUser.getId());
             uploaderDTO.setUploaderName(loginUser.getTrueName());
@@ -93,9 +94,15 @@
                         if (StringUtils.isEmpty(ownerType)) {
                             ownerType = FileOwnerTypeBaseEnum.OWNER_TYPE_000.getIndex();
                         }
-                        FileInfo fileInfo = service.webUploadFile(file, mainId, ownerId, ownerType, fileCount, uploaderDTO);
+                        FileInfo fileInfo = service.wechatUploadFile(file, mainId, ownerId, ownerType, fileCount, uploaderDTO);
                         FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
                         BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
+
+                        // 如果是身份证,就调用ocr识别
+                        if (FileOwnerTypeBaseEnum.OWNER_TYPE_202.getIndex().equals(ownerType)){
+                            fileInfoBaseDTO.setIdcardOcrResult(BaiduOcrUtils.ocrIdcard(file.getBytes()));
+                        }
+
                         files.add(fileInfoBaseDTO);
                         fileCount++;
                     } else {
@@ -175,6 +182,22 @@
         }
     }
 
+    /**
+     * 删除附件
+     * @url {ctx}/api/wechat/fileInfo/deleteFileById?id=
+     * @param id 附件编号
+     * @return Object
+     */
+    @GetMapping("/deleteFileById")
+    public Object deleteFileById(@RequestParam(value = "id") String id) {
+        try {
+            service.deleteFileById(id);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
 
 
 

--
Gitblit v1.8.0