diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java index 91b4c26..b1631d5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.ocr.controller; import java.util.Arrays; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; @@ -74,7 +75,13 @@ public class OcrMetadataConfigController extends JeecgController pageList = ocrMetadataConfigService.pageVo(page, ocrMetadataConfig); return Result.OK(pageList); } - + @ApiOperation(value="元数据配置-下拉列表", notes="元数据配置-下拉列表") + @GetMapping(value = "/allList") + public Result> allList(HttpServletRequest req){ + List allList= ocrMetadataConfigService.allList(); + return Result.OK(allList); + } + /** * 添加 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrMetadataConfigMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrMetadataConfigMapper.java index cac3b13..191dbec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrMetadataConfigMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrMetadataConfigMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.ocr.entity.OcrMetadataConfig; import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo; +import java.util.List; import java.util.Map; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml index 1111b1f..dc8913c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml @@ -21,4 +21,5 @@ group by oc.id order by oc.update_time,oc.create_time desc + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java index d97d6b6..20e2f91 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java @@ -7,6 +7,8 @@ import org.jeecg.modules.ocr.entity.OcrMetadataConfig; import org.jeecg.modules.ocr.model.OcrMetadataConfigSaveModel; import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo; +import java.util.List; + /** * @Description: 元数据配置 * @Author: jeecg-boot @@ -44,4 +46,6 @@ public interface IOcrMetadataConfigService extends IService { * @return */ IPage pageVo(Page page, OcrMetadataConfig ocrMetadataConfig); + + List allList(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java index 53de6aa..6a913a6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java @@ -65,14 +65,15 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl notRemoveIdList = new ArrayList<>(); if (ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().size()>0) { - List notRemoveIdList = ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().stream().map(o -> o.getId()).collect(Collectors.toList()); - LambdaQueryWrapper removeQueryWrapper = new LambdaQueryWrapper(); - removeQueryWrapper.eq(OcrMetadataConfigDetail::getMetadataConfigId, ocrMetadataConfigSaveModel.getId()); - removeQueryWrapper.notIn(notRemoveIdList!=null&¬RemoveIdList.size()>0, OcrMetadataConfigDetail::getId,notRemoveIdList); - //TODO zwt先检测这些删除的,有没有被规则检查配置 绑定(删除元数据配置明细时,需不需要先检查该元数据配置明细有没有被规则检查配置绑定,如果被绑定是否需要提示 不可删除) - ocrMetadataConfigDetailService.remove(removeQueryWrapper); + notRemoveIdList = ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().stream().map(o -> o.getId()).collect(Collectors.toList()); } + LambdaQueryWrapper removeQueryWrapper = new LambdaQueryWrapper(); + removeQueryWrapper.eq(OcrMetadataConfigDetail::getMetadataConfigId, ocrMetadataConfigSaveModel.getId()); + removeQueryWrapper.notIn(notRemoveIdList!=null&¬RemoveIdList.size()>0, OcrMetadataConfigDetail::getId,notRemoveIdList); + //TODO zwt先检测这些删除的,有没有被规则检查配置 绑定(删除元数据配置明细时,需不需要先检查该元数据配置明细有没有被规则检查配置绑定,如果被绑定是否需要提示 不可删除) + ocrMetadataConfigDetailService.remove(removeQueryWrapper); return ocrMetadataConfig; } @@ -100,4 +101,29 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl allList() { + List allList=new ArrayList<>(); + List list = this.list(); + OcrMetadataConfigVo copyEntityVo=null; + List metadataConfigDetails = ocrMetadataConfigDetailService.list(); + List arrayTestList=new ArrayList<>(); + String fieldName=null,getField=null; + for (OcrMetadataConfig ocrMetadataConfig : list) { + copyEntityVo = new OcrMetadataConfigVo(); + copyEntityVo.setId(ocrMetadataConfig.getId()); + copyEntityVo.setConfigName(ocrMetadataConfig.getConfigName()); + if (metadataConfigDetails!=null&&metadataConfigDetails.size()>0) { + arrayTestList = metadataConfigDetails.stream().filter(m -> m.getMetadataConfigId().equals(ocrMetadataConfig.getId())).collect(Collectors.toList()); + fieldName = arrayTestList.stream().map(o -> o.getFieldName()).collect(Collectors.joining(",")); + getField = arrayTestList.stream().map(o -> o.getGetField()).collect(Collectors.joining(",")); + copyEntityVo.setResultName(fieldName); + copyEntityVo.setGetField(getField); + copyEntityVo.setOcrMetadataConfigDetailList(arrayTestList); + } + allList.add(copyEntityVo); + } + return allList; + } }