From ed5409e9520a8951665883e210afc162339d0cb7 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 17 Jul 2023 22:05:33 +0800
Subject: [PATCH] updates

---
 .../modules/ocr/controller/OcrMetadataConfigController.java   | 2 +-
 .../jeecg/modules/ocr/controller/OcrRuleCheckController.java  | 1 +
 .../main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java  | 3 +++
 .../modules/ocr/service/impl/OcrRuleCheckServiceImpl.java     | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

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 b1631d5..78d12d0 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
@@ -128,7 +128,7 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel) {
 		checkSaveModel(ocrMetadataConfigSaveModel);
-		AssertUtils.notEmpty(ocrMetadataConfigSaveModel.getId(),"");
+		AssertUtils.notEmpty(ocrMetadataConfigSaveModel.getId(),"[id]不可为空");
 		String configName = ocrMetadataConfigSaveModel.getConfigName();
 		boolean existsFlag=ocrMetadataConfigService.existsByConfigName(configName,ocrMetadataConfigSaveModel.getId());//true 已存在,false不存在
 		AssertUtils.notTrue(existsFlag,String.format("[配置名称]-%s 已存在",configName));
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java
index 7438e2c..96dba81 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java
@@ -117,6 +117,7 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
 	public Result<String> edit(@RequestBody OcrRuleCheckSaveModel ocrRuleCheckSaveModel) {
 		checkSaveModel(ocrRuleCheckSaveModel);
 		String configName = ocrRuleCheckSaveModel.getConfigName();
+		AssertUtils.notEmpty(ocrRuleCheckSaveModel.getId(),"[id]不可为空");
 		boolean existsFlag=ocrRuleCheckService.existsByConfigName(configName,ocrRuleCheckSaveModel.getId());//true 已存在,false不存在
 		AssertUtils.notTrue(existsFlag,String.format("[配置名称]-%s 已存在",configName));
 		ocrRuleCheckService.updateModel(ocrRuleCheckSaveModel);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java
index 1a2510f..e3bc65b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java
@@ -66,4 +66,7 @@ public class OcrRuleCheck implements Serializable {
 	@Excel(name = "结果名称", width = 15)
     @ApiModelProperty(value = "结果名称")
     private String resultName;
+
+    @ApiModelProperty(value = "元数据配置id")
+    private String metadataConfigId;
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java
index 51004a0..55e380a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java
@@ -39,6 +39,8 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
     @Override
     public OcrRuleCheck saveModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) {
         OcrRuleCheck ocrRuleCheck=new OcrRuleCheck();
+        ocrRuleCheck.setConfigRule(ocrRuleCheckSaveModel.getConfigRule());
+        ocrRuleCheck.setMetadataConfigId(ocrRuleCheckSaveModel.getMetadataConfigId());
         ocrRuleCheck.setConfigName(ocrRuleCheckSaveModel.getConfigName());
         this.save(ocrRuleCheck);
 
@@ -62,6 +64,8 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
     @Override
     public OcrRuleCheck updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) {
         OcrRuleCheck ocrRuleCheck=this.getById(ocrRuleCheckSaveModel.getId());
+        ocrRuleCheck.setConfigRule(ocrRuleCheckSaveModel.getConfigRule());
+        ocrRuleCheck.setMetadataConfigId(ocrRuleCheckSaveModel.getMetadataConfigId());
         ocrRuleCheck.setConfigName(ocrRuleCheckSaveModel.getConfigName());
         this.save(ocrRuleCheck);