From 782695f3ed653fa647920799885168ac86bd4f7d Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 24 五月 2023 14:53:53 +0800
Subject: [PATCH] 适配表单设计器，表单缓存
---
src/main/java/com/product/face/service/FaceCacheService.java | 7 +++----
src/main/java/com/product/face/service/FaceApplyService.java | 40 +++++++++++++++++++---------------------
src/main/java/com/product/face/config/ErrorCode.java | 2 ++
3 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/product/face/config/ErrorCode.java b/src/main/java/com/product/face/config/ErrorCode.java
index 49b8f60..1d2610e 100644
--- a/src/main/java/com/product/face/config/ErrorCode.java
+++ b/src/main/java/com/product/face/config/ErrorCode.java
@@ -23,6 +23,8 @@
REQUEST_PARAM_ERROR("璇锋眰鍙傛暟鏈夎", 6),
+ GET_FACE_CONF_FAIL("鑾峰彇琛ㄥ崟閰嶇疆澶辫触", 7),
+
;
diff --git a/src/main/java/com/product/face/service/FaceApplyService.java b/src/main/java/com/product/face/service/FaceApplyService.java
index b807fe8..53392e5 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -1,9 +1,12 @@
package com.product.face.service;
+import cn.hutool.core.map.MapBuilder;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.google.common.collect.Lists;
-import com.product.admin.entity.FaceListEntity;
import com.product.admin.service.SystemFaceService;
import com.product.common.lang.StringUtils;
import com.product.core.cache.util.RedisUtil;
@@ -13,6 +16,8 @@
import com.product.core.service.support.AbstractBaseService;
import com.product.face.config.ErrorCode;
import com.product.face.config.FaceConst;
+import com.product.face.entity.FaceEntity;
+import com.product.face.entity.FaceListEntity;
import com.product.face.entity.TableColumn;
import com.product.face.util.FaceUtil;
import com.product.util.BaseUtil;
@@ -37,6 +42,11 @@
@Resource
private FaceCacheService faceCacheService;
+ /**
+ * 鑾峰彇琛ㄥ崟閰嶇疆
+ * @param fse
+ * @return
+ */
public Object getFaceListConf(FieldSetEntity fse) {
String faceUuid = fse.getString(FaceConst.FIELD_FACE_UUID);
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
@@ -47,13 +57,11 @@
if (!StringUtils.isEmpty(faceUuid) && StringUtils.isEmpty(faceNumber)) {
return systemFaceService.getFaceFieldList(faceUuid);
}
- final String redisKey = FaceConst.FACE_LIST_KEY + ":face-number" + faceNumber;
- if (RedisUtil.exists(redisKey)) {
- return RedisUtil.get(redisKey);
+ FaceListEntity faceListCache = faceCacheService.getFaceListCache(faceNumber);
+ if (faceListCache == null) {
+ throw new BaseException(ErrorCode.GET_FACE_CONF_FAIL);
}
-
-
- return null;
+ return faceListCache;
}
/**
@@ -64,21 +72,11 @@
* @throws BaseException
*/
public String getFaceFormConfig(FieldSetEntity fse) throws BaseException {
- String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
- if (StringUtils.isEmpty(faceNumber)) {
- throw new BaseException(ErrorCode.REQUEST_PARAM_ERROR);
+ FaceEntity faceFormCache = faceCacheService.getFaceFormCache(fse.getString(FaceConst.FIELD_FACE_NUMBER));
+ if (faceFormCache == null) {
+ throw new BaseException(ErrorCode.GET_FACE_CONF_FAIL);
}
- //鏍规嵁琛ㄥ崟鍙锋煡璇�
- FieldSetEntity faceConf = getBaseDao().getFieldSetByFilter(FaceConst.TABLE_FACE_CONFIG, "face_number=?", new Object[]{faceNumber}, true);
- DataTableEntity fieldPropertyDt = faceConf.getSubDataTable(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY);
- if (DataTableEntity.isEmpty(fieldPropertyDt)) {
- throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
- }
- List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
- Map<String, Object> other = new HashMap<>();
- other.put("drawingList", faceControlList);
- faceConf.getSubData().clear();
- return BaseUtil.success(faceConf, other);
+ return BaseUtil.success(faceFormCache.getData(), MapUtil.builder("drawingList", (Object) faceFormCache.getDrawingList()).map());
}
}
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index edf1ce7..c21d415 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -54,8 +54,8 @@
if (!StringUtils.isEmpty(uuid)) {
objects = new Object[]{uuid};
}
- DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects);
- if (!DataTableEntity.isEmpty(dt)) {
+ DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects,null,null,Integer.MAX_VALUE,1,true);
+ if (DataTableEntity.isEmpty(dt)) {
return;
}
for (FieldSetEntity fs : dt.getData()) {
@@ -101,8 +101,7 @@
if (StringUtils.isEmpty(faceNumber)) {
return null;
}
- final String faceFormKey = FaceConst.FACE_FORM_CACHE_KEY + ":face-number" + faceNumber;
- return (FaceEntity) RedisUtil.get(faceFormKey);
+ return (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
}
/**
--
Gitblit v1.9.2