From 23b6ed6bcb45adc5bb3afcdd2caaa5f887734b38 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 19 Jul 2023 15:36:59 +0800 Subject: [PATCH] updates --- .../modules/api/controller/ApiController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java index 914779b..0eb96bb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -59,9 +60,22 @@ public class ApiController { @ApiOperation(value="获取规则", notes="获取规则") @PostMapping(value = "/getRule") @Transactional(rollbackFor = Exception.class) - public Result> getRule() { + public Result> getRule() { IPage ocrRuleCheckVoIPage = ocrRuleCheckService.pageVo(new Page(1, Integer.MAX_VALUE), new OcrRuleCheck()); - return Result.OK(ocrRuleCheckVoIPage.getRecords()); + List records = new ArrayList<>(); + JSONObject copyEntity=new JSONObject(); + for (OcrRuleCheckVo record : ocrRuleCheckVoIPage.getRecords()) { + copyEntity = new JSONObject(); + copyEntity.put("ruleId",record.getId()); + copyEntity.put("ruleName",record.getConfigName()); + copyEntity.put("ruleInfo",record.getConfigRule()); + copyEntity.put("metadataId",record.getMetadataConfigId()); + copyEntity.put("metadataName",record.getMetadataConfigName()); + copyEntity.put("createTime",record.getCreateTime()); + copyEntity.put("createPeople",record.getCreateBy()); + records.add(copyEntity); + } + return Result.OK(records); /*String requestId = jsonObject.getString("requestId"); String fileName = jsonObject.getString("fileName"); AssertUtils.notEmpty(requestId,"请输入[请求唯一标识]");