updates

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java

@@ -201,6 +201,15 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
         return mv;
     }
 
+    /**
+     * 复制
+     */
+    @RequestMapping(value = "/copy")
+    public Result<?> copy(@RequestBody OcrMetadataConfig ocrMetadataConfig){
+        ocrMetadataConfigService.copy(ocrMetadataConfig);
+        return Result.OK("操作成功");
+    }
+
     /**
      * 下载模板
      */

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java

@@ -258,4 +258,12 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
         return Result.error("文件导入失败！");
     }
 
+    /**
+     * 复制
+     */
+    @RequestMapping(value = "/copy")
+    public Result<?> copy(@RequestBody OcrRuleCheck ocrRuleCheck){
+        ocrRuleCheckService.copy(ocrRuleCheck);
+        return Result.OK("操作成功");
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfigDetail.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ocr.entity;
 
 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 com.fasterxml.jackson.annotation.JsonFormat;
@@ -64,4 +65,9 @@ public class OcrMetadataConfigDetail implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+
+    /**字段缩写*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "字段缩写")
+    private String abbrFieldName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java

@@ -55,4 +55,6 @@ public interface IOcrMetadataConfigService extends IService<OcrMetadataConfig> {
     void saveModelBatch(List<SaveOcrMetadataConfigVO> saveModelList);
 
     Map<String, OcrMetadataConfigDTO> listToMap(List<String> idList);
+
+    boolean copy(OcrMetadataConfig ocrMetadataConfig);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.ocr.dto.OcrRuleCheckDTO;
+import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
 import org.jeecg.modules.ocr.entity.OcrRuleCheck;
 import org.jeecg.modules.ocr.vo.SaveOcrRuleCheckVO;
 
@@ -74,4 +75,7 @@ public interface IOcrRuleCheckService extends IService<OcrRuleCheck> {
 
     Map<String, OcrRuleCheckDTO> listToMap(List<String> selectionList);
 
+    boolean copy(OcrRuleCheck ocrRuleCheck);
+
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java

@@ -94,6 +94,19 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         return metadataConfigVoList.stream().collect(Collectors.toMap(OcrMetadataConfigDTO::getId, o -> o));
     }
 
+    @Override
+    public boolean copy(OcrMetadataConfig ocrMetadataConfig) {
+        String id = ocrMetadataConfig.getId();
+        OcrMetadataConfig metadataConfig = this.getById(id);
+        LambdaQueryWrapper<OcrMetadataConfig> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(OcrMetadataConfig::getConfigName,metadataConfig.getConfigName());
+        long count = this.count(queryWrapper);
+        metadataConfig.setId(null);
+        metadataConfig.setConfigName(metadataConfig.getConfigName()+"("+(count+1)+")");
+        this.save(metadataConfig);
+        return true;
+    }
+
 
     @Override
     public OcrMetadataConfig updateModel(SaveOcrMetadataConfigVO saveOcrMetadataConfigVO) {
@@ -207,6 +220,17 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         OcrMetadataConfig ocrMetadataConfig = this.getById(id);
         BeanUtils.copyProperties(ocrMetadataConfig,copyEntityVo);
         List<OcrMetadataConfigDetail> list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper<OcrMetadataConfigDetail>().eq(OcrMetadataConfigDetail::getMetadataConfigId, id));
+        for (OcrMetadataConfigDetail ocrMetadataConfigDetail : list) {
+            if ("hospitalName".contains(ocrMetadataConfigDetail.getFieldName())) {
+                ocrMetadataConfigDetail.setAbbrFieldName("hn");
+            }else if("doctorName".contains(ocrMetadataConfigDetail.getFieldName())) {
+                ocrMetadataConfigDetail.setAbbrFieldName("dn");
+            }else if("departmentName".contains(ocrMetadataConfigDetail.getFieldName())) {
+                ocrMetadataConfigDetail.setAbbrFieldName("dmn");
+            }else if("time".contains(ocrMetadataConfigDetail.getFieldName())) {
+                ocrMetadataConfigDetail.setAbbrFieldName("time");
+            }
+        }
         String fieldName = list.stream().map(OcrMetadataConfigDetail::getFieldName).collect(Collectors.joining(","));
         String getField = list.stream().map(OcrMetadataConfigDetail::getGetField).collect(Collectors.joining(","));
         copyEntityVo.setResultName(fieldName);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.constant.OcrConstant;
 import org.jeecg.common.util.AssertUtils;
 import org.jeecg.modules.ocr.dto.OcrRuleCheckDTO;
+import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
 import org.jeecg.modules.ocr.entity.OcrMetadataConfigDetail;
 import org.jeecg.modules.ocr.entity.OcrRuleCheck;
 import org.jeecg.modules.ocr.mapper.OcrMetadataConfigDetailMapper;
@@ -75,6 +76,19 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
         return collect;
     }
 
+    @Override
+    public boolean copy(OcrRuleCheck ocrRuleCheck) {
+        String id = ocrRuleCheck.getId();
+        OcrRuleCheck ruleCheck = this.getById(id);
+        LambdaQueryWrapper<OcrRuleCheck> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(OcrRuleCheck::getConfigName,ruleCheck.getConfigName());
+        long count = this.count(queryWrapper);
+        ruleCheck.setId(null);
+        ruleCheck.setConfigName(ruleCheck.getConfigName()+"("+(count+1)+")");
+        this.save(ruleCheck);
+        return true;
+    }
+
     @Override
     public OcrRuleCheck updateModel(SaveOcrRuleCheckVO saveOcrRuleCheckVO) {
         OcrRuleCheck ocrRuleCheck=this.getById(saveOcrRuleCheckVO.getId());