From 9824fc1a7b71cb4d617ea18cab36b8c179e6a37c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 05 十一月 2024 17:34:16 +0800
Subject: [PATCH] commit
---
src/main/java/com/product/face/service/FaceApplyService.java | 30 ++++++++++++++++++++++++++++++
src/main/java/com/product/face/service/FaceDesignService.java | 1 +
src/main/java/com/product/face/controller/FaceApplyController.java | 19 +++++++++++++++++++
3 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/product/face/controller/FaceApplyController.java b/src/main/java/com/product/face/controller/FaceApplyController.java
index 003502c..d6886f5 100644
--- a/src/main/java/com/product/face/controller/FaceApplyController.java
+++ b/src/main/java/com/product/face/controller/FaceApplyController.java
@@ -71,4 +71,23 @@
return error(ErrorCode.GET_FACE_CONFIG_FAIL, e);
}
}
+
+ /**
+ * 鑾峰彇琛ㄥ崟涓娇鐢ㄧ殑鍙傜収
+ */
+ @PostMapping("/get-face-reference/{version}")
+ @ApiVersion(1)
+ public String getFaceReference(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return BaseUtil.success(faceApplyService.getFaceReference(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return error(ErrorCode.GET_FACE_CONFIG_FAIL, e);
+ }
+ }
}
diff --git a/src/main/java/com/product/face/service/FaceApplyService.java b/src/main/java/com/product/face/service/FaceApplyService.java
index 53392e5..ccc6406 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.aspose.slides.p2cbca448.and;
import com.google.common.collect.Lists;
import com.product.admin.service.SystemFaceService;
import com.product.common.lang.StringUtils;
@@ -79,4 +80,33 @@
return BaseUtil.success(faceFormCache.getData(), MapUtil.builder("drawingList", (Object) faceFormCache.getDrawingList()).map());
}
+ public List<String> getFaceReference(FieldSetEntity fse) throws BaseException {
+ String faceNumber = fse.getString("face_number");
+ if (StringUtils.isEmpty(faceNumber)) {
+ return null;
+ }
+ String[] faceNumberArr = faceNumber.split(",");
+ StringBuilder sql = new StringBuilder();
+ sql.append(" select case when c.property_value like '%prompt' then a.property_value else concat('銆�',a.property_value,'銆�') end as property_value from product_sys_face_control_property a ");
+ sql.append(" join product_sys_face_control_property b on a.group_uuid=b.group_uuid and a.uuid!=b.uuid ");
+ sql.append(" join product_sys_face_control_property c on b.uuid=c.parent_uuid ");
+ sql.append(" where a.property_name='advanceName' and a.master_uuid in (SELECT uuid from product_sys_face where face_type=2 and ").append(BaseUtil.buildQuestionMarkFilter("face_number", faceNumberArr.length, true)).append(") ");
+ sql.append(" and b.property_name='__config__' and c.property_name='tag' GROUP BY 1 ");
+
+
+ DataTableEntity dte = getBaseDao().listTable(sql.toString(), faceNumberArr);
+
+
+ List<String> list = Lists.newArrayList();
+
+ if (DataTableEntity.isEmpty(dte)) {
+ return list;
+ }
+
+ for (int i = 0; i < dte.getRows(); i++) {
+ FieldSetEntity fs = dte.getFieldSetEntity(i);
+ list.add(fs.getString("property_value"));
+ }
+ return list;
+ }
}
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 30ca858..5fe52a9 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONObject;
import com.product.admin.service.PublicService;
import com.product.common.lang.StringUtils;
+import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.CoreConst;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
--
Gitblit v1.9.2