From 7baf145ac8ca6cff9177c50c8862ba38d274b484 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 24 五月 2023 11:34:32 +0800
Subject: [PATCH] 表单缓存、列表模糊搜索
---
src/main/java/com/product/face/service/FaceApplyService.java | 47 ++++++++++-------------------------------------
1 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceApplyService.java b/src/main/java/com/product/face/service/FaceApplyService.java
index 689c4a8..b807fe8 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -3,8 +3,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
@@ -12,6 +14,7 @@
import com.product.face.config.ErrorCode;
import com.product.face.config.FaceConst;
import com.product.face.entity.TableColumn;
+import com.product.face.util.FaceUtil;
import com.product.util.BaseUtil;
import org.springframework.stereotype.Service;
@@ -19,7 +22,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* @Author cheng
@@ -33,8 +35,7 @@
private SystemFaceService systemFaceService;
@Resource
- private FaceDesignService designService;
-
+ private FaceCacheService faceCacheService;
public Object getFaceListConf(FieldSetEntity fse) {
String faceUuid = fse.getString(FaceConst.FIELD_FACE_UUID);
@@ -46,41 +47,13 @@
if (!StringUtils.isEmpty(faceUuid) && StringUtils.isEmpty(faceNumber)) {
return systemFaceService.getFaceFieldList(faceUuid);
}
- //鏍规嵁琛ㄥ崟鍙锋煡璇�
- 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 = designService.getFaceControlList(fieldPropertyDt);
- JSONObject jsonObject = faceControlList.get(0);
- if (jsonObject == null || jsonObject.isEmpty()) {
- throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
- }
- //琛ㄦ牸鍒�
- JSONArray tableColumns = jsonObject.getJSONObject(FaceConst.FIELD_PROPERTY_CONFIG).getJSONArray(FaceConst.CHILDREN);
- if (tableColumns == null || tableColumns.isEmpty()) {
- throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
- }
- List<TableColumn> result = Lists.newArrayList();
- for (int i = 0; i < tableColumns.size(); i++) {
- TableColumn tableColumn = new TableColumn();
- JSONObject columnJson = tableColumns.getJSONObject(i);
- String fieldName = columnJson.getString(FaceConst.FIELD_PROPERTY_VMODEL);
- if (StringUtils.isEmpty(fieldName)) {
- continue;
- }
- JSONObject config = columnJson.getJSONObject(FaceConst.FIELD_PROPERTY_CONFIG);
- Object setWidth = config.get("setWidth");
- if (!StringUtils.isEmpty(setWidth)) {
- tableColumn.setColumnWidth(setWidth + "%");
- }
- tableColumn.setField(fieldName);
- tableColumn.setTitle(config.getString(FaceConst.FIELD_PROPERTY_LABEL));
- result.add(tableColumn);
+ final String redisKey = FaceConst.FACE_LIST_KEY + ":face-number" + faceNumber;
+ if (RedisUtil.exists(redisKey)) {
+ return RedisUtil.get(redisKey);
}
- return result;
+
+ return null;
}
/**
@@ -101,7 +74,7 @@
if (DataTableEntity.isEmpty(fieldPropertyDt)) {
throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
}
- List<JSONObject> faceControlList = designService.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
Map<String, Object> other = new HashMap<>();
other.put("drawingList", faceControlList);
faceConf.getSubData().clear();
--
Gitblit v1.9.2