From 79bfe693a7daaf84cd8b02109c7af23041dd5399 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 16 Feb 2022 16:03:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B9+=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDictItemController.java | 74 ++++++++----------- .../jero/modules/system/entity/SysDict.java | 22 +++++- .../modules/system/entity/SysDictItem.java | 12 +-- .../controller/OnlCgformTagController.java | 1 + .../modules/tag/entity/OnlCgformArea.java | 3 - .../tag/service/IOnlCgformTagService.java | 3 +- .../service/impl/OnlCgformTagServiceImpl.java | 7 +- 7 files changed, 58 insertions(+), 64 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 1cec501ef..10af86dcc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -37,7 +37,7 @@ public class SysDictItemController { @Autowired private ISysDictItemService sysDictItemService; - + /** * @功能：查询字典数据 * @param sysDictItem @@ -49,24 +49,17 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); + queryWrapper.orderByAsc("sort_order"); Page page = new Page(pageNo, pageSize); - if(sysDictItem.getIsTagDict()==0) { - queryWrapper.like("is_tag_dict",0).and(wq->wq.orderByAsc("sort_order")); - IPage pageList = sysDictItemService.page(page, queryWrapper); - result.setResult(pageList); - } - else if(sysDictItem.getIsTagDict()==1) { - queryWrapper.like("is_tag_dict",1).and(wq->wq.orderByAsc("sort_order")); - IPage pageList = sysDictItemService.page(page, queryWrapper); - result.setResult(pageList); - } + IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); + result.setResult(pageList); return result; } - + /** * @功能：新增 * @return @@ -87,7 +80,7 @@ public class SysDictItemController { } return result; } - + /** * @功能：编辑 * @param sysDictItem @@ -102,21 +95,19 @@ public class SysDictItemController { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if(sysdict==null) { result.error500("未找到对应实体"); - }else { - if(sysDictItem.getIsReadOnly()==2){ - result.error("固定字段,不可修改"); - }else { - sysDictItem.setUpdateTime(new Date()); - boolean ok = sysDictItemService.updateById(sysDictItem); - //TODO 返回false说明什么？ - if(ok) { - result.success("编辑成功!"); - } + }/*else if(sysDictItem.getIsReadOnly()==1){ + result.error("固定字段,不可修改"); + }*/else { + sysDictItem.setUpdateTime(new Date()); + boolean ok = sysDictItemService.updateById(sysDictItem); + //TODO 返回false说明什么？ + if(ok) { + result.success("编辑成功!"); } } return result; } - + /** * @功能：删除字典数据 * @param id @@ -131,20 +122,17 @@ public class SysDictItemController { SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { result.error500("未找到对应实体"); - }else { - if(joinSystem.getIsReadOnly()==2){ - result.error("固定字段,不可修改"); - }else { - boolean ok = sysDictItemService.removeById(id); - if(ok) { - result.success("删除成功!"); - } + }/*else if(joinSystem.getIsReadOnly()==1||joinSystem.getIsTagDict()==1){ + result.error("固定字段,不可修改"); + }*/else { + boolean ok = sysDictItemService.removeById(id); + if(ok) { + result.success("删除成功!"); } - } return result; } - + /** * @功能：批量删除字典数据 * @param ids @@ -156,16 +144,14 @@ public class SysDictItemController { @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); + SysDictItem sysDictItem = sysDictItemService.getById(ids); if(ids==null || "".equals(ids.trim())) { result.error500("参数不识别！"); - }else { - SysDictItem sysDictItem = sysDictItemService.getById(ids); - if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly()==2){ - result.error("固定字段,不可删除"); - }else { - this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); - result.success("批量删除成功!"); - } + }/*else if(sysDictItem.getIsReadOnly() == 1){ + result.error("固定字段,不可删除"); + }*/else { + this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); + result.success("批量删除成功!"); } return result; } @@ -198,5 +184,5 @@ public class SysDictItemController { return Result.error("该值不可用，系统中已存在！"); } } - + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 2aac6b479..69947b431 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -1,15 +1,16 @@ package com.jero.modules.system.entity; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; - +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.Date; /** *

@@ -86,5 +87,18 @@ public class SysDict implements Serializable { */ private Date updateTime; + /**是否为标签内容-数据字典（1是 0否）*/ + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) + @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") + private java.lang.Integer isTagDict; + /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/ + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) + @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") + private java.lang.Integer isReadOnly; + + /**表单控件类型*/ + @Excel(name = "表单控件类型", width = 15) + @ApiModelProperty(value = "表单控件类型") + private java.lang.String fieldShowType; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 03de2afa1..6b4fdc5bf 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -77,16 +77,18 @@ public class SysDictItem implements Serializable { private Date updateTime; - /** - * 是否为标签内容-数据字典（1是 0否） - */ + /**是否为标签内容-数据字典（1是 0否）*/ @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/ - @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15, dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") - @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") private java.lang.Integer isReadOnly; + + /**表单控件类型*/ + @Excel(name = "表单控件类型", width = 15) + @ApiModelProperty(value = "表单控件类型") + private java.lang.String fieldShowType; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index b1d291c48..6a7dc4893 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -83,6 +83,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.queryExitData(onlCgformTag); + QueryWrapper queryWrapper = new QueryWrapper<>(); onlCgformTagService.add(onlCgformTag); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index eabd2fd10..6c010719a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -60,19 +60,16 @@ public class OnlCgformArea implements Serializable { /**展示区域(1基本信息,2文本信息,3关联关系)*/ @Excel(name = "展示区域(1基本信息,2文本信息,3关联关系)", width = 15) - @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "展示区域(1基本信息,2文本信息,3关联关系)") private java.lang.String showArea; /**英文名称*/ @Excel(name = "英文名称", width = 15) - @javax.validation.constraints.Pattern(regexp = "^[A-Za-z]*(\\s[A-Za-z]*)*$",message = "请输入正确的英文名称") @ApiModelProperty(value = "英文名称") private java.lang.String enName; /**所属模块(1文档库,0文档拆分)*/ @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15) - @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") private java.lang.String isModel; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index af9875fd9..6c0ebe863 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -1,7 +1,6 @@ package com.jero.modules.tag.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.common.api.vo.Result; import com.jero.modules.tag.entity.OnlCgformTag; import java.util.List; @@ -66,5 +65,5 @@ public interface IOnlCgformTagService extends IService { * * @return */ - Result queryExitData(OnlCgformTag onlCgformTag) ; + void queryExitData(OnlCgformTag onlCgformTag) ; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 5f0a083ea..fe0712d0f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -2,7 +2,6 @@ package com.jero.modules.tag.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; @@ -100,14 +99,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryExitData(OnlCgformTag onlCgformTag) { + public void queryExitData(OnlCgformTag onlCgformTag) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt())); Integer count = onlCgformTagMapper.selectCount(queryWrapper); - if (count > 0) { - return Result.error("已存在数据,不能重复添加"); - } - return Result.OK(onlCgformTag); } } From 21e51bf25b9efa61c692893b0f952de766f0435d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 16 Feb 2022 16:53:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/entity/SysDictItem.java | 4 ++ .../system/mapper/SysDictItemMapper.java | 3 ++ .../system/service/ISysDictItemService.java | 6 +++ .../service/impl/SysDictItemServiceImpl.java | 9 ++++ .../BussDocumentLibraryEOServiceImpl.java | 51 ++++++++++++++++++- 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 6b4fdc5bf..2b1ccedb8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -1,6 +1,7 @@ package com.jero.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; @@ -63,6 +64,9 @@ public class SysDictItem implements Serializable { private Integer sortOrder; + @TableField(exist = false) + private String dictCode; + /** * 状态（1启用 0不启用） */ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index fd73fb936..62c0d1704 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -17,4 +17,7 @@ import java.util.List; public interface SysDictItemMapper extends BaseMapper { @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc") public List selectItemsByMainId(String mainId); + + @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1") + List selectItemsAll(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 81c0cba97..e1ad6ef68 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -15,4 +15,10 @@ import java.util.List; */ public interface ISysDictItemService extends IService { public List selectItemsByMainId(String mainId); + + /** + * 查询所有数据字典信息 + * @return + */ + public List selectItemsAll(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 11922993e..b1e9a426f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -27,4 +27,13 @@ public class SysDictItemServiceImpl extends ServiceImpl selectItemsByMainId(String mainId) { return sysDictItemMapper.selectItemsByMainId(mainId); } + + /** + * 查询所有数据字典信息 + * @return + */ + @Override + public List selectItemsAll() { + return sysDictItemMapper.selectItemsAll(); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 0ecffe576..e0f2fbfeb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -15,6 +15,8 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; import org.apache.commons.lang3.ObjectUtils; @@ -49,6 +51,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + + //下拉选处理数据字典 + List records = infoPage.getRecords(); + for (Object record : records) { + Map record1 = (Map) record; + for (Map.Entry entry : record1.entrySet()) { + List collect = fieldList.stream() + .filter(e -> entry.getKey().equals(e.getDictField())) + .collect(Collectors.toList()); + //下拉选处理数据字典 + dictItem(sysDictItems, entry, collect); + } + } return infoPage; + } + /** + * 下拉选处理数据字典 + * @param sysDictItems + * @param entry + * @param collect + */ + private void dictItem(List sysDictItems, Map.Entry entry, List collect) { + //通过dictField判断字段是否为下拉选(不为空则为下拉选) + if(collect.size() != 0 && StringUtils.isNotBlank(collect.get(0).getDictField())){ + String value = (String) entry.getValue(); + //数据字典中文 + List dictItemsCh = new ArrayList<>(); + for (String itemValue : value.split(",")) { + //字段的数据字典 + List dictItemList = sysDictItems.stream() + .filter(e -> e.getDictCode().equals(entry.getKey())) + .collect(Collectors.toList()); + if(dictItemList.size() != 0){ + List dictItems = dictItemList.stream() + .filter(e -> itemValue.equals(e.getItemValue())) + .collect(Collectors.toList()); + if(dictItems.size() != 0){ + List itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + dictItemsCh.addAll(itemText); + } + } + } + entry.setValue(StringUtils.join(dictItemsCh, ",")); + } } } From e703c1cc63a37b305528c687f468b1ab95037965 Mon Sep 17 00:00:00 2001 From: caoyang Date: Wed, 16 Feb 2022 18:09:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/libraryAddForm/index.vue | 2 +- jero-web/src/components/ocrUpload/index.vue | 148 +++++ .../src/views/documentManage/ocr/index.vue | 510 ++++++++++++++++++ .../documentManage/ocr/modules/addForm.vue | 11 + .../tags/dialog/OnlCgformTagForm.vue | 2 +- 5 files changed, 671 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/components/ocrUpload/index.vue create mode 100644 jero-web/src/views/documentManage/ocr/index.vue create mode 100644 jero-web/src/views/documentManage/ocr/modules/addForm.vue diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index fcaf99d55..4fa6bba83 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -183,7 +183,7 @@ - + diff --git a/jero-web/src/components/ocrUpload/index.vue b/jero-web/src/components/ocrUpload/index.vue new file mode 100644 index 000000000..d1aa2e85f --- /dev/null +++ b/jero-web/src/components/ocrUpload/index.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue new file mode 100644 index 000000000..350ea7e23 --- /dev/null +++ b/jero-web/src/views/documentManage/ocr/index.vue @@ -0,0 +1,510 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/ocr/modules/addForm.vue b/jero-web/src/views/documentManage/ocr/modules/addForm.vue new file mode 100644 index 000000000..e1bd8b16a --- /dev/null +++ b/jero-web/src/views/documentManage/ocr/modules/addForm.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index cc1dedec3..9ca932bf4 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -31,7 +31,7 @@ - + From b393cbabac167f5b61e9747a6ddf5fabf20183fd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 16 Feb 2022 18:28:50 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 2 +- .../BussDocumentLibraryEOServiceImpl.java | 75 +++++++++---------- 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 6f81ec1c5..247ec651c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -237,7 +237,7 @@ public class BussDocumentLibraryEOController extends JeroController updateInfo(Map map) { + public Result updateInfo(@RequestBody Map map) { try { bussDocumentLibraryEOService.updateInfo(map); } catch (Exception e) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e0f2fbfeb..f911fbcdf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -325,50 +325,45 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); - //处理修改人和修改时间 - if ("update_by".equals(key)) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - value = sysUser.getUsername(); - } - if ("update_time".equals(key)) { - value = new Date(); - } - List fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - //处理时间类型 - if (fieldDate.size() != 0) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (ObjectUtils.isNotEmpty(value)) { - value = "str_to_date('" + sdf.format(value) + "','%Y-%m-%d %H:%i:%s')"; + if(ObjectUtils.isNotEmpty(value)){ + //处理修改人和修改时间 + if ("update_by".equals(key)) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + value = sysUser.getUsername(); } - valuesBuilder.append(value + ","); - } else { - //处理文件类型 - List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { + if ("update_time".equals(key)) { + value = new Date(); + } + List fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + //处理时间类型 + if (fieldDate.size() != 0) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (ObjectUtils.isNotEmpty(value)) { + value = "str_to_date('" + sdf.format(new Date()) + "','%Y-%m-%d %H:%i:%s')"; + } + valuesBuilder.append(value + ","); + } else { + //处理文件类型 + List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { - String valueTemp = UUID.randomUUID().toString().replace("-", ""); - value = valueTemp; - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : value.toString().split(",")) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); - ossFile.setConnectId(valueTemp); - oSSFileList.add(ossFile); + String valueTemp = UUID.randomUUID().toString().replace("-", ""); +// value = valueTemp; + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : value.toString().split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(valueTemp); + oSSFileList.add(ossFile); + } + iOSSFileService.updateFileInfo(oSSFileList); + valuesBuilder.append("'" + value + "'" + ","); + }else{ + valuesBuilder.append("'" + value + "'" + ","); } - iOSSFileService.updateFileInfo(oSSFileList); } - valuesBuilder.append("'" + value + "'" + ","); - } - fieldsBuilder.append(key + ","); - - //处理文件类型 - List fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { - - String valueTemp = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - + fieldsBuilder.append(key + ","); } } String insertField = fieldsBuilder.substring(0, fieldsBuilder.length() - 1); From d59eb2e329431152ea694e2bf5f72d832e4d2971 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 16 Feb 2022 18:40:42 +0800 Subject: [PATCH 5/8] =?UTF-8?q?OCR=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrRecordEOController.java | 184 ++++++++++++++++++ .../jero/modules/ocr/entity/OcrRecordEO.java | 132 +++++++++++++ .../modules/ocr/enums/FileSyncStateEnum.java | 36 ++++ .../jero/modules/ocr/enums/FileTypeEnum.java | 36 ++++ .../modules/ocr/mapper/OcrRecordEOMapper.java | 14 ++ .../ocr/mapper/xml/OcrRecordEOMapper.xml | 25 +++ .../ocr/service/IOcrRecordEOService.java | 64 ++++++ .../service/impl/OcrRecordEOServiceImpl.java | 90 +++++++++ 8 files changed, 581 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileSyncStateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/OcrRecordEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/xml/OcrRecordEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java 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 new file mode 100644 index 000000000..7df54f9b3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -0,0 +1,184 @@ +package com.jero.modules.ocr.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.modules.ocr.entity.OcrRecordEO; +import com.jero.modules.ocr.service.IOcrRecordEOService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: OCR识别转换记录表 + * @Author: jero-boot + * @Date: 2022-02-16 + * @Version: V1.0 + */ +@Api(tags="OCR识别转换记录表") +@RestController +@RequestMapping("/ocr/ocrRecord") +@Slf4j +public class OcrRecordEOController extends JeroController { + @Autowired + private IOcrRecordEOService ocrRecordService; + + @Value("${OCR.ocrDownPath}") + private String ocrDownPath; + + /** + * 分页列表查询 + * + * @param ocrRecordEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "OCR识别转换记录表-分页列表查询") + @ApiOperation(value="OCR识别转换记录表-分页列表查询", notes="OCR识别转换记录表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OcrRecordEO ocrRecordEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(ocrRecordEO.getStandName()), OcrRecordEO::getStandName, ocrRecordEO.getStandName()) + .like(StringUtils.isNotEmpty(ocrRecordEO.getStandNumber()), OcrRecordEO::getStandNumber, ocrRecordEO.getStandNumber()) + .eq(StringUtils.isNotEmpty(ocrRecordEO.getResultContent()), OcrRecordEO::getResultContent, ocrRecordEO.getResultContent()) + .orderByDesc(OcrRecordEO::getCreateTime); + Page page = new Page(pageNo, pageSize); + IPage pageList = ocrRecordService.page(page, queryWrapper); + List rows = pageList.getRecords(); + for (OcrRecordEO row : rows){ + row.setDocRealFile(ocrDownPath+row.getDocRealName()); + row.setJsonRealFile(ocrDownPath+row.getJsonRealName()); + } + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "OCR识别转换记录表-列表查询") + @ApiOperation(value="OCR识别转换记录表-列表查询", notes="OCR识别转换记录表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = ocrRecordService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param ocrRecordEO + * @return + */ + @AutoLog(value = "OCR识别转换记录表-添加") + @ApiOperation(value="OCR识别转换记录表-添加", notes="OCR识别转换记录表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OcrRecordEO ocrRecordEO) { + ocrRecordService.add(ocrRecordEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ocrRecordEO + * @return + */ + @AutoLog(value = "OCR识别转换记录表-编辑") + @ApiOperation(value="OCR识别转换记录表-编辑", notes="OCR识别转换记录表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OcrRecordEO ocrRecordEO) { + ocrRecordService.editById(ocrRecordEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "OCR识别转换记录表-通过id删除") + @ApiOperation(value="OCR识别转换记录表-通过id删除", notes="OCR识别转换记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + ocrRecordService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "OCR识别转换记录表-批量删除") + @ApiOperation(value="OCR识别转换记录表-批量删除", notes="OCR识别转换记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.ocrRecordService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "OCR识别转换记录表-通过id查询") + @ApiOperation(value="OCR识别转换记录表-通过id查询", notes="OCR识别转换记录表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OcrRecordEO ocrRecordEO = ocrRecordService.queryById(id); + if(ocrRecordEO ==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(ocrRecordEO); + } + + /** + * 导出excel + * + * @param request + * @param ocrRecordEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OcrRecordEO ocrRecordEO) { + return super.exportXls(request, ocrRecordEO, OcrRecordEO.class, "OCR识别转换记录表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OcrRecordEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java new file mode 100644 index 000000000..7309cded0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java @@ -0,0 +1,132 @@ +package com.jero.modules.ocr.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: OCR识别转换记录表 + * @Author: jero-boot + * @Date: 2022-02-16 + * @Version: V1.0 + */ +@Data +@TableName("ocr_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ocr_record对象", description="OCR识别转换记录表") +public class OcrRecordEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**标准名称*/ + @Excel(name = "标准名称", width = 15) + @ApiModelProperty(value = "标准名称") + private String standName; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private String standNumber; + + /**文本状态*/ + @Excel(name = "文本状态", width = 15, dicCode = "file_type") + @Dict(dicCode = "file_type") + @ApiModelProperty(value = "文本状态") + private String fileType; + + /**文件名称*/ + @Excel(name = "文件名称", width = 15) + @ApiModelProperty(value = "文件名称") + private String fileName; + + /**转换结果*/ + @Excel(name = "转换结果", width = 15) + @ApiModelProperty(value = "转换结果") + private String resultContent; + + /**doc本地存放全路径*/ + @Excel(name = "doc本地存放全路径", width = 15) + @ApiModelProperty(value = "doc本地存放全路径") + private String docName; + + /**doc文件名称*/ + @Excel(name = "doc文件名称", width = 15) + @ApiModelProperty(value = "doc文件名称") + private String docRealName; + + /**doc文件编码*/ + @Excel(name = "doc文件编码", width = 15) + @ApiModelProperty(value = "doc文件编码") + private String wordFileCode; + + /**json文件本地存放全路径*/ + @Excel(name = "json文件本地存放全路径", width = 15) + @ApiModelProperty(value = "json文件本地存放全路径") + private String jsonName; + + /**json文件名称*/ + @Excel(name = "json文件名称", width = 15) + @ApiModelProperty(value = "json文件名称") + private String jsonRealName; + + /**json文件编码*/ + @Excel(name = "json文件编码", width = 15) + @ApiModelProperty(value = "json文件编码") + private String jsonFileCode; + + /**pdf文件id*/ + @Excel(name = "pdf文件id", width = 15) + @ApiModelProperty(value = "pdf文件id") + private String attId; + + /**同步状态*/ + @Excel(name = "同步状态", width = 15) + @ApiModelProperty(value = "同步状态") + private String syncState; + + private String docRealFile; + private String jsonRealFile; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileSyncStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileSyncStateEnum.java new file mode 100644 index 000000000..bb50eb541 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileSyncStateEnum.java @@ -0,0 +1,36 @@ +package com.jero.modules.ocr.enums; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 14:49 2022/2/16 + */ +public enum FileSyncStateEnum { + SYNC_NO("未同步","未同步"), + SYNC_YES("已同步","已同步"); + + String name; + String value; + + private FileSyncStateEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java new file mode 100644 index 000000000..cbfd89a5c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java @@ -0,0 +1,36 @@ +package com.jero.modules.ocr.enums; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 14:49 2022/2/16 + */ +public enum FileTypeEnum { + OCR_CONVERTING("转换中","转换中"), + OCR_CONVERT_SUCCESS("转换成功","转换成功"), + OCR_CONVERT_FAIL("转换失败","转换失败"); + + String name; + String value; + + private FileTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/OcrRecordEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/OcrRecordEOMapper.java new file mode 100644 index 000000000..dea1de40c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/OcrRecordEOMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.ocr.mapper; + +import com.jero.modules.ocr.entity.OcrRecordEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: OCR识别转换记录表 + * @Author: jero-boot + * @Date: 2022-02-16 + * @Version: V1.0 + */ +public interface OcrRecordEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/xml/OcrRecordEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/xml/OcrRecordEOMapper.xml new file mode 100644 index 000000000..1f4706a18 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/mapper/xml/OcrRecordEOMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java new file mode 100644 index 000000000..62e754ae0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java @@ -0,0 +1,64 @@ +package com.jero.modules.ocr.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.ocr.entity.OcrRecordEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: OCR识别转换记录表 + * @Author: jero-boot + * @Date: 2022-02-16 + * @Version: V1.0 + */ +public interface IOcrRecordEOService extends IService { + + /** + * 保存 + * + * @param ocrRecordEO + * @return + */ + void add(OcrRecordEO ocrRecordEO); + + /** + * 更新 + * + * @param ocrRecordEO + * @return + */ + void editById(OcrRecordEO ocrRecordEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OcrRecordEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java new file mode 100644 index 000000000..9a067876d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -0,0 +1,90 @@ +package com.jero.modules.ocr.service.impl; + +import com.jero.modules.ocr.entity.OcrRecordEO; +import com.jero.modules.ocr.mapper.OcrRecordEOMapper; +import com.jero.modules.ocr.service.IOcrRecordEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: OCR识别转换记录表 + * @Author: jero-boot + * @Date: 2022-02-16 + * @Version: V1.0 + */ +@Service +public class OcrRecordEOServiceImpl extends ServiceImpl implements IOcrRecordEOService { + + /** + * 保存 + * + * @param ocrRecordEO + * @return + */ + @Override + public void add(OcrRecordEO ocrRecordEO) { + Date now = new Date(); + ocrRecordEO.setCreateTime(now); + ocrRecordEO.setUpdateTime(now); + save(ocrRecordEO); + } + + /** + * 更新 + * + * @param ocrRecordEO + * @return + */ + @Override + public void editById(OcrRecordEO ocrRecordEO) { + Date now = new Date(); + ocrRecordEO.setUpdateTime(now); + saveOrUpdate(ocrRecordEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OcrRecordEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From 90e696ece4975613a683c79e3ebe59cc34ccf04f Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 17 Feb 2022 09:13:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OCR=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 5d4623ad5..15bb8a97b 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -292,6 +292,30 @@ justauth: type: default prefix: 'demo::' timeout: 1h +# 云端OCR识别集成配置参数 +OCR: + #请求OCR转换接口 + handleFileUrl: https://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion + #handleFileUrl = https://61.136.1.103:8091/WebService.asmx/FileConversion + # OCR回调接口地址 配置客户本地的IP及端口号 +# callBackUrl: http://139.9.235.66:9110/api/ocr/OCRRestful/OcrHandleResult + callBackUrl: http://127.0.0.1:8080/api/ocr/OCRRestful/OcrHandleResult + # OCR认证用户 + userId: dayuzhou1234 + # OCR认证编码 + authCode: 123456 + # OCR接口公钥 + publicKey: EC4KKA6ZDTCPAOCRBC5M + # OCR文件存储路径 + ocrPath: D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ + #ocrPath: /data/DeploymentPackage/laws-shanqi/APPSOFT/LAWSOCRDEMO/OCRFILE/ + # OCR文件下载地址 +# ocrDownPath: http://139.9.235.66:9020/downfile/ + ocrDownPath: http://127.0.0.1:9020/downfile/ + # OCR接口超时时间 + times: 20 + # OCR转换类型 + convertType: BOTH ## eureka注册中心 eureka: client: From a95e95c3e4dcc61975e4e13553590c636c970a67 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 17 Feb 2022 10:26:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?OCR-=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ocr/controller/OcrRecordEOController.java | 8 ++++++-- .../java/com/jero/modules/ocr/entity/OcrRecordEO.java | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) 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 7df54f9b3..da9f2c22f 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 @@ -66,8 +66,12 @@ public class OcrRecordEOController extends JeroController pageList = ocrRecordService.page(page, queryWrapper); List rows = pageList.getRecords(); for (OcrRecordEO row : rows){ - row.setDocRealFile(ocrDownPath+row.getDocRealName()); - row.setJsonRealFile(ocrDownPath+row.getJsonRealName()); + if(StringUtils.isNotEmpty(row.getDocRealName())) { + row.setDocRealFile(ocrDownPath + row.getDocRealName()); + } + if(StringUtils.isNotEmpty(row.getJsonRealName())) { + row.setJsonRealFile(ocrDownPath + row.getJsonRealName()); + } } return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java index 7309cded0..1331a7185 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -126,7 +127,9 @@ public class OcrRecordEO implements Serializable { @Excel(name = "同步状态", width = 15) @ApiModelProperty(value = "同步状态") private String syncState; - + + @TableField(exist = false) private String docRealFile; + @TableField(exist = false) private String jsonRealFile; } From 6eebe0a223dae7cd715de8cff39b3d5a61f71ce8 Mon Sep 17 00:00:00 2001 From: caoyang Date: Thu, 17 Feb 2022 13:47:22 +0800 Subject: [PATCH 8/8] =?UTF-8?q?ocr=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentManage/ocr/index.vue | 530 +++++++++--------- .../documentManage/ocr/modules/docTable.vue | 151 +++++ 2 files changed, 415 insertions(+), 266 deletions(-) create mode 100644 jero-web/src/views/documentManage/ocr/modules/docTable.vue diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue index 350ea7e23..4a4979f4d 100644 --- a/jero-web/src/views/documentManage/ocr/index.vue +++ b/jero-web/src/views/documentManage/ocr/index.vue @@ -1,149 +1,164 @@ @@ -497,6 +491,10 @@ .action-delete{ color:red; } + .page{ + text-align:right ; + margin-top:20px; + } } } diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue new file mode 100644 index 000000000..4aaa91672 --- /dev/null +++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file