From 64ab1f8566961340f91aefd75a25099b4c66a310 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期三, 10 四月 2024 10:20:32 +0800
Subject: [PATCH] 高斯数据库适配

---
 src/main/java/com/product/face/service/FaceCacheService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 51dcad4..7551f4f 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -54,7 +54,7 @@
 		if (!StringUtils.isEmpty(uuid)) {
 			objects = new Object[]{uuid};
 		}
-		DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, Integer.MAX_VALUE, 1, true);
+		DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, 0, 0, true);
 		if (DataTableEntity.isEmpty(dt)) {
 			return;
 		}
@@ -101,7 +101,8 @@
 		if (StringUtils.isEmpty(faceNumber)) {
 			return null;
 		}
-		return (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
+		FaceEntity face = (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
+		return face;
 	}
 
 	/**
@@ -116,7 +117,7 @@
 		}
 		fse.getSubData().clear();
 		String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
-		List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+		List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
 		if (faceControlList != null) {
 			FaceEntity face = new FaceEntity();
 			face.setData(BaseUtil.fieldSetEntityToJson(fse));
@@ -135,7 +136,7 @@
 		if (DataTableEntity.isEmpty(fieldPropertyDt)) {
 			return;
 		}
-		List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+		List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
 		JSONObject jsonObject = faceControlList.get(0);
 		if (jsonObject == null || jsonObject.isEmpty()) {
 			return;

--
Gitblit v1.9.2