From 0476f81ef696f3606d76778b7e444e008dcbbefa Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 9 Mar 2022 13:58:48 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ocr/controller/OcrRecordEOController.java | 4 ++++ .../com/jero/modules/ocr/controller/OcrRestfulController.java | 3 +++ .../jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java | 2 ++ 3 files changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java index 686997b33..e11a3f4fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; @@ -91,6 +92,7 @@ public class OcrRecordEOController extends JeroController syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) { if(StringUtils.isBlank(ocrRecordEO.getConnectId())){ return Result.error("同步失败"); @@ -209,6 +211,7 @@ public class OcrRecordEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { if (StringUtils.isBlank(id)) { return Result.error("删除数据不能为空"); @@ -226,6 +229,7 @@ public class OcrRecordEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { if (StringUtils.isBlank(ids)) { return Result.error("删除数据不能为空"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java index dec4efd75..8379a8849 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.http.entity.ContentType; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; @@ -64,6 +65,7 @@ public class OcrRestfulController{ @ApiOperation(value = "下载word文件") @GetMapping("/downFile") + @RequiresPermissions("ocr:ocrRestful:downFile") public void downFile(String fileName, HttpServletResponse response, HttpServletRequest request) throws Exception { InputStream is = null; OutputStream os = null; @@ -151,6 +153,7 @@ public class OcrRestfulController{ */ @ApiOperation(value = "新增OCR内容") @PostMapping("/addOcrRecord") + @RequiresPermissions("ocr:ocrRestful:addOcrRecord") public Result addOcrRecord(@RequestBody OcrRecordEO ocrRecordEO) throws Exception { SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); log.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java index 24388ccae..67f0876e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java @@ -152,6 +152,7 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService { ocrRecordEO.setStandName(getOcrEO.getStandName()); ocrRecordEO.setFileType(getOcrEO.getFileType()); ocrRecordEO.setConnectId(getOcrEO.getConnectId()); + ocrRecordEO.setAttId(getOcrEO.getAttId()); // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // ocrRecordEO.setCreateBy(sysUser.getId()); // ocrRecordEO.setCreateTime(new Date()); @@ -168,6 +169,7 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService { ocrRecordEO.setFileType(getOcrEO.getFileType()); ocrRecordEO.setCreateTime(new Date()); ocrRecordEO.setConnectId(getOcrEO.getConnectId()); + ocrRecordEO.setAttId(getOcrEO.getAttId()); ocrRecordEOService.editById(ocrRecordEO); //TODO ?? return Result.OK( "加入转换成功", taskId); }