updates

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<OcrMetadataConf
 		IPage<OcrMetadataConfigVo> pageList = ocrMetadataConfigService.pageVo(page, ocrMetadataConfig);
 		return Result.OK(pageList);
 	}
-	
+	 @ApiOperation(value="元数据配置-下拉列表", notes="元数据配置-下拉列表")
+	 @GetMapping(value = "/allList")
+	public Result<List<OcrMetadataConfigVo>> allList(HttpServletRequest req){
+		List<OcrMetadataConfigVo> allList= ocrMetadataConfigService.allList();
+		return Result.OK(allList);
+	 }
+
 	/**
 	 *   添加
 	 *

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;
 
 /**

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
     </select>
+
 </mapper>

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<OcrMetadataConfig> {
      * @return
      */
     IPage<OcrMetadataConfigVo> pageVo(Page<OcrMetadataConfig> page, OcrMetadataConfig ocrMetadataConfig);
+
+    List<OcrMetadataConfigVo> allList();
 }

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<OcrMetadataConfigM
             ocrMetadataConfigDetailService.saveOrUpdate(detail);
         }
         //删除旧明细
+        List<String> notRemoveIdList = new ArrayList<>();
         if (ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().size()>0) {
-            List<String> notRemoveIdList = ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().stream().map(o -> o.getId()).collect(Collectors.toList());
-            LambdaQueryWrapper<OcrMetadataConfigDetail> removeQueryWrapper = new LambdaQueryWrapper<OcrMetadataConfigDetail>();
-            removeQueryWrapper.eq(OcrMetadataConfigDetail::getMetadataConfigId, ocrMetadataConfigSaveModel.getId());
-            removeQueryWrapper.notIn(notRemoveIdList!=null&&notRemoveIdList.size()>0, OcrMetadataConfigDetail::getId,notRemoveIdList);
-            //TODO zwt先检测这些删除的，有没有被规则检查配置 绑定（删除元数据配置明细时，需不需要先检查该元数据配置明细有没有被规则检查配置绑定，如果被绑定是否需要提示 不可删除）
-            ocrMetadataConfigDetailService.remove(removeQueryWrapper);
+            notRemoveIdList = ocrMetadataConfigSaveModel.getOcrMetadataConfigDetailList().stream().map(o -> o.getId()).collect(Collectors.toList());
         }
+        LambdaQueryWrapper<OcrMetadataConfigDetail> removeQueryWrapper = new LambdaQueryWrapper<OcrMetadataConfigDetail>();
+        removeQueryWrapper.eq(OcrMetadataConfigDetail::getMetadataConfigId, ocrMetadataConfigSaveModel.getId());
+        removeQueryWrapper.notIn(notRemoveIdList!=null&&notRemoveIdList.size()>0, OcrMetadataConfigDetail::getId,notRemoveIdList);
+        //TODO zwt先检测这些删除的，有没有被规则检查配置 绑定（删除元数据配置明细时，需不需要先检查该元数据配置明细有没有被规则检查配置绑定，如果被绑定是否需要提示 不可删除）
+        ocrMetadataConfigDetailService.remove(removeQueryWrapper);
         return ocrMetadataConfig;
     }
 
@@ -100,4 +101,29 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         }
         return pageList;
     }
+
+    @Override
+    public List<OcrMetadataConfigVo> allList() {
+        List<OcrMetadataConfigVo> allList=new ArrayList<>();
+        List<OcrMetadataConfig> list = this.list();
+        OcrMetadataConfigVo copyEntityVo=null;
+        List<OcrMetadataConfigDetail> metadataConfigDetails = ocrMetadataConfigDetailService.list();
+        List<OcrMetadataConfigDetail> 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;
+    }
 }