WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocr,拆分-添加接口权限

Browse Source
This commit is contained in:
liyawei
2022-04-15 19:02:45 +08:00
parent 2fe3bd130e
commit 3c9f89372f
6 changed files with 78 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+20 -6
View File
@@ -83,7 +83,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
@ApiOperation(value="ocr识别调取已入库文件", notes="ocr识别调取已入库文件")
@PostMapping(value = "/ocrPageInfo")
@ResponseBody
// @RequiresPermissions("document:ocrPageInfo")
@RequiresPermissions("document:ocrPageInfo")
public Result<?> ocrPageInfo(@RequestBody Map<String,Object> parameter) {
IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
return Result.OK(infoPage);
@@ -207,13 +207,27 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
@AutoLog(value = "文档库信息表-ocr表头和查询条件")
@ApiOperation(value="文档库信息表-ocr表头和查询条件", notes="文档库信息表-ocr表头和查询条件")
@GetMapping(value = "/getHeaderOrConditionForOcr")
// @RequiresPermissions("document:getHeaderOrConditionForOcr")
@RequiresPermissions("document:ocrPageInfo")
public Result<List<Map<String,Object>>> getHeaderOrConditionForOcr(@RequestParam(name="flag",required=true) String flag,
@RequestParam(name="cut",required=true) String cut) {
List<Map<String, Object>> list = bussDocumentLibraryEOService.getHeaderOrConditionForOcr(flag,cut);
return Result.OK(list);
}
/**
* @param flag 标识传 1-->用于查询文档库字段属性
* @return
*/
@AutoLog(value = "文档库信息表-文档拆分表头和查询条件")
@ApiOperation(value="文档库信息表-文档拆分表头和查询条件", notes="文档库信息表-文档拆分表头和查询条件")
@GetMapping(value = "/getHeaderOrConditionForSplitFile")
@RequiresPermissions("split:sarFileSplitInfo:splitFile")
public Result<List<Map<String,Object>>> getHeaderOrConditionForSplitFile(@RequestParam(name="flag",required=true) String flag,
@RequestParam(name="cut",required=true) String cut) {
List<Map<String, Object>> list = bussDocumentLibraryEOService.getHeaderOrConditionForSplit(flag,cut);
return Result.OK(list);
}
/**
* ocr识别调取已入库文件-中英文切换
* @param flag 标识传 1-->用于查询文档库字段属性
@@ -221,10 +235,10 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
*/
@AutoLog(value = "文档库信息表-文档拆分表头和查询条件")
@ApiOperation(value="文档库信息表-文档拆分表头和查询条件", notes="文档库信息表-文档拆分表头和查询条件")
@GetMapping(value = "/getHeaderOrConditionForSplit")
// @RequiresPermissions("document:getHeaderOrConditionForSplit")
public Result<List<Map<String,Object>>> getHeaderOrConditionForSplit(@RequestParam(name="flag",required=true) String flag,
@RequestParam(name="cut",required=true) String cut) {
@GetMapping(value = "/getHeaderOrConditionForSplitResult")
@RequiresPermissions("split:sarFileSplitInfo:splitResult")
public Result<List<Map<String,Object>>> getHeaderOrConditionForSplitResult(@RequestParam(name="flag",required=true) String flag,
@RequestParam(name="cut",required=true) String cut) {
List<Map<String, Object>> list = bussDocumentLibraryEOService.getHeaderOrConditionForSplit(flag,cut);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+3
View File
@@ -58,6 +58,7 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
@AutoLog(value = "OCR识别转换记录表-分页列表查询")
@ApiOperation(value="OCR识别转换记录表-分页列表查询", notes="OCR识别转换记录表-分页列表查询")
@PostMapping(value = "/page")
@RequiresPermissions("ocr:ocrRecord:page")
public Result<?> queryPageList(@RequestBody OcrRecordEOPage ocrRecordEOPage) {
LambdaQueryWrapper<OcrRecordEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(ocrRecordEOPage.getStandName()), OcrRecordEO::getStandName, ocrRecordEOPage.getStandName())
@@ -110,6 +111,7 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
@AutoLog(value = "OCR识别转换记录表-表头中英文切换")
@ApiOperation(value="OCR识别转换记录表-表头中英文切换", notes="OCR识别转换记录表-表头中英文切换")
@GetMapping(value = "/getHeader")
@RequiresPermissions("ocr:ocrRecord:page")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = ocrRecordService.getHeader(flag, cut);
@@ -124,6 +126,7 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
@AutoLog(value = "OCR识别转换记录表-查询条件中英文切换")
@ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换")
@GetMapping(value = "/queryCondition")
@RequiresPermissions("ocr:ocrRecord:page")
public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = ocrRecordService.queryCondition(flag, cut);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+1
View File
@@ -50,6 +50,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@AutoLog(value = "分页查询")
@ApiOperation(value = "分页查询")
@PostMapping("/getSplitItemsByPage")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<IPage> page(@RequestBody Map<String, Object> parameter) throws Exception {
IPage infoPage = fileSplitItemsEOService.getInfoPage(parameter);
return Result.OK(infoPage);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
+36
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.split.entity.SarFileSplitInfoEO;
import com.jero.modules.split.page.SarFileSplitInfoEOPage;
import com.jero.modules.split.service.ISarFileSplitInfoService;
@@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -39,6 +41,9 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@Autowired
private ISarFileSplitInfoService sarFileSplitInfoService;
@Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
/**
* 分页列表查询
* @param sarFileSplitInfoEOPage
@@ -47,6 +52,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@AutoLog(value = "文档拆分表-分页列表查询Y")
@ApiOperation(value="文档拆分表-分页列表查询", notes="文档拆分表-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("split:sarFileSplitInfo:page")
public Result<?> queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) {
LambdaQueryWrapper<SarFileSplitInfoEO> queryWrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){
@@ -169,6 +175,36 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
return Result.OK(sarFileSplitInfoEO);
}
/**
* 拆分已入库文本
* @param parameter
* @return
*/
@AutoLog(value = "拆分已入库文本-分页查询")
@ApiOperation(value="拆分已入库文本-分页查询", notes="拆分已入库文本-分页查询")
@PostMapping(value = "/splitFilePageInfo")
@ResponseBody
@RequiresPermissions("split:sarFileSplitInfo:splitFile")
public Result<?> splitFilePageInfo(@RequestBody Map<String,Object> parameter) {
IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
return Result.OK(infoPage);
}
/**
* ocr识别调取已入库文件
* @param parameter
* @return
*/
@AutoLog(value = "导入拆分结果-分页查询")
@ApiOperation(value="导入拆分结果-分页查询", notes="导入拆分结果-分页查询")
@PostMapping(value = "/splitResultPageInfo")
@ResponseBody
@RequiresPermissions("split:sarFileSplitInfo:splitResult")
public Result<?> splitResultPageInfo(@RequestBody Map<String,Object> parameter) {
IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
return Result.OK(infoPage);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+1
View File
@@ -49,6 +49,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
@ApiOperation(value = "文档拆分条款目录-查询Y")
@GetMapping("/getSplitMenusByInfoId")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<List<SarFileSplitMenuEO>> list(SarFileSplitMenuEOPage page) throws Exception {
page.setValidFlag("0");
// page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+17 -15
View File
@@ -801,7 +801,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 查询条款表单字段
List<OnlCgformField> formFieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue());
if (formFieldList.size() != 0) {
//过滤出表单字段中 控件类型为树结构的
//过滤出表单字段
formFieldList = formFieldList.stream()
.filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())))
.collect(Collectors.toList());
@@ -1276,20 +1276,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
for (SarFileSplitMenuTreeNode treeNode : treeList) {
//创建菜单
SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
sarFileSplitMenuEO.setId(treeNode.getId());
sarFileSplitMenuEO.setInfoId(infoId);
sarFileSplitMenuEO.setName(treeNode.getName());
sarFileSplitMenuEO.setItemName(treeNode.getItemName());
sarFileSplitMenuEO.setPId(treeNode.getParentId());
sarFileSplitMenuEO.setDisplaySeq(treeNode.getOrderNum());
sarFileSplitMenuEO.setCreationUser(userId);
sarFileSplitMenuEO.setModifyUser(userId);
sarFileSplitMenuEO.setValidFlag(0);
sarFileSplitMenuEO.setCreationTime(new Date());
sarFileSplitMenuEO.setModifyTime(new Date());
sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
menuAndItemMap.put(treeNode.getItemId(), treeNode.getId());
}
// }else{
@@ -1324,6 +1310,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
}
}
for (SarFileSplitMenuTreeNode treeNode : treeList) {
//创建菜单
SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
sarFileSplitMenuEO.setId(treeNode.getId());
sarFileSplitMenuEO.setInfoId(infoId);
sarFileSplitMenuEO.setName(treeNode.getName());
sarFileSplitMenuEO.setItemName(treeNode.getItemName());
sarFileSplitMenuEO.setPId(treeNode.getParentId());
sarFileSplitMenuEO.setDisplaySeq(treeNode.getOrderNum());
sarFileSplitMenuEO.setCreationUser(userId);
sarFileSplitMenuEO.setModifyUser(userId);
sarFileSplitMenuEO.setValidFlag(0);
sarFileSplitMenuEO.setCreationTime(new Date());
sarFileSplitMenuEO.setModifyTime(new Date());
sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
}
String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = "成功导入" + countSuccess + "条";