master
周文涛 2 years ago
parent c81d69a502
commit 23b6ed6bcb

@ -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<List<OcrRuleCheckVo>> getRule() {
public Result<List<JSONObject>> getRule() {
IPage<OcrRuleCheckVo> ocrRuleCheckVoIPage = ocrRuleCheckService.pageVo(new Page<OcrRuleCheck>(1, Integer.MAX_VALUE), new OcrRuleCheck());
return Result.OK(ocrRuleCheckVoIPage.getRecords());
List<JSONObject> 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,"请输入[请求唯一标识]");

Loading…
Cancel
Save