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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceApplyService.java b/src/main/java/com/product/face/service/FaceApplyService.java
index c3bcc00..b807fe8 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -1,13 +1,27 @@
package com.product.face.service;
+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;
import com.product.core.service.support.AbstractBaseService;
+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;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Author cheng
@@ -20,20 +34,51 @@
@Resource
private SystemFaceService systemFaceService;
+ @Resource
+ private FaceCacheService faceCacheService;
public Object getFaceListConf(FieldSetEntity fse) {
- //TODO 浣跨敤鍙樺姩瀹�
String faceUuid = fse.getString(FaceConst.FIELD_FACE_UUID);
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
- if (faceNumber == null && faceUuid == null) {
- return null;
- }
+ if (StringUtils.isEmpty(faceNumber) && StringUtils.isEmpty(faceUuid)) {
+ throw new BaseException(ErrorCode.REQUEST_PARAM_ERROR);
- if(StringUtils.isEmpty(faceUuid)){
+ }
+ if (!StringUtils.isEmpty(faceUuid) && StringUtils.isEmpty(faceNumber)) {
return systemFaceService.getFaceFieldList(faceUuid);
}
- //TODO 浣跨敤琛ㄥ崟璁捐鍣ㄨ璁＄殑鍒楄〃杩斿洖
+ final String redisKey = FaceConst.FACE_LIST_KEY + ":face-number" + faceNumber;
+ if (RedisUtil.exists(redisKey)) {
+ return RedisUtil.get(redisKey);
+ }
+
+
return null;
}
+ /**
+ * 褰曞叆琛ㄥ崟鑾峰彇琛ㄥ崟閰嶇疆
+ *
+ * @param fse
+ * @return
+ * @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);
+ }
+ //鏍规嵁琛ㄥ崟鍙锋煡璇�
+ 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);
+ }
+
}
--
Gitblit v1.9.2