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/FaceApplyService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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..53392e5 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -1,13 +1,32 @@
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.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.FaceEntity;
+import com.product.face.entity.FaceListEntity;
+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 +39,44 @@
@Resource
private SystemFaceService systemFaceService;
+ @Resource
+ private FaceCacheService faceCacheService;
+ /**
+ * 鑾峰彇琛ㄥ崟閰嶇疆
+ * @param fse
+ * @return
+ */
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 浣跨敤琛ㄥ崟璁捐鍣ㄨ璁＄殑鍒楄〃杩斿洖
- return null;
+ FaceListEntity faceListCache = faceCacheService.getFaceListCache(faceNumber);
+ if (faceListCache == null) {
+ throw new BaseException(ErrorCode.GET_FACE_CONF_FAIL);
+ }
+ return faceListCache;
+ }
+
+ /**
+ * 褰曞叆琛ㄥ崟鑾峰彇琛ㄥ崟閰嶇疆
+ *
+ * @param fse
+ * @return
+ * @throws BaseException
+ */
+ public String getFaceFormConfig(FieldSetEntity fse) throws BaseException {
+ FaceEntity faceFormCache = faceCacheService.getFaceFormCache(fse.getString(FaceConst.FIELD_FACE_NUMBER));
+ if (faceFormCache == null) {
+ throw new BaseException(ErrorCode.GET_FACE_CONF_FAIL);
+ }
+ return BaseUtil.success(faceFormCache.getData(), MapUtil.builder("drawingList", (Object) faceFormCache.getDrawingList()).map());
}
}
--
Gitblit v1.9.2