From 8744b00a45abf2a51f7e95bd87d0e88d28b3e82a Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Mon, 24 Jul 2023 16:25:28 +0800 Subject: [PATCH] updates --- .../OcrMetadataConfigController.java | 2 +- .../modules/ocr/entity/OcrMetadataConfig.java | 1 - .../ocr/mapper/OcrMetadataConfigMapper.java | 2 ++ .../mapper/xml/OcrMetadataConfigMapper.xml | 15 +++++++++++ .../impl/OcrMetadataConfigServiceImpl.java | 27 ++++++++++--------- .../modules/ocr/vo/OcrMetadataConfigVo.java | 2 ++ 6 files changed, 34 insertions(+), 15 deletions(-) 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 486f49a..7bef0ce 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 @@ -280,7 +280,7 @@ public class OcrMetadataConfigController extends JeecgController resultList=new ArrayList<>(); List getFieldList=new ArrayList<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java index 4cf3f17..64a6726 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java @@ -72,6 +72,5 @@ public class OcrMetadataConfig implements Serializable { /**任务类型*/ @ApiModelProperty(value = "任务类型") - @Excel(name = "任务类型", width = 15) private String taskType; } 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 191dbec..86a6d0a 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 @@ -19,4 +19,6 @@ import java.util.Map; public interface OcrMetadataConfigMapper extends BaseMapper { IPage pageVo(@Param("page") Page page,@Param("o") Map params); + + List allList(@Param("idList") List idList); } 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 7af7631..b29aa76 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 @@ -27,4 +27,19 @@ order by oc.update_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/impl/OcrMetadataConfigServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java index 103b944..8e35201 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 @@ -15,6 +15,8 @@ import org.jeecg.modules.ocr.service.IOcrMetadataConfigDetailService; import org.jeecg.modules.ocr.service.IOcrMetadataConfigService; import org.jeecg.modules.ocr.service.IOcrTaskTypeService; import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo; +import org.jeecg.modules.system.service.ISysDictItemService; +import org.jeecg.modules.system.service.ISysDictService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -39,6 +41,10 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -152,30 +158,25 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl allList(List idList) { List allList=new ArrayList<>(); - List list = new ArrayList<>(); if (idList!=null && idList.size()>0) { - list=this.listByIds(idList); + allList=baseMapper.allList(idList); }else{ - list=this.list(); + allList=baseMapper.allList(null); } - 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()); - copyEntityVo.setTaskType(ocrMetadataConfig.getTaskType()); + for (OcrMetadataConfigVo ocrMetadataConfig : allList) { + ocrMetadataConfig.setId(ocrMetadataConfig.getId()); + ocrMetadataConfig.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); + ocrMetadataConfig.setResultName(fieldName); + ocrMetadataConfig.setGetField(getField); + ocrMetadataConfig.setOcrMetadataConfigDetailList(arrayTestList); } - allList.add(copyEntityVo); } return allList; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java index de69923..eb04a59 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.ocr.entity.OcrMetadataConfig; import org.jeecg.modules.ocr.entity.OcrMetadataConfigDetail; +import org.jeecgframework.poi.excel.annotation.Excel; import java.util.ArrayList; import java.util.List; @@ -19,6 +20,7 @@ public class OcrMetadataConfigVo extends OcrMetadataConfig { /**任务类型_字段中文*/ @ApiModelProperty(value = "任务类型名称") @TableField(exist = false) + @Excel(name = "任务类型", width = 15) private String taskType_dictText; /**配置明细信息*/