From 4d1360d7e91aa4d394eb4a35adea993a45c0d725 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 09 一月 2025 10:53:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0 into dev
---
src/main/java/com/product/mobile/core/controller/FaceMobileController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/controller/FaceMobileController.java b/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
index 660f11f..2a4ea8a 100644
--- a/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
+++ b/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
@@ -1,5 +1,6 @@
package com.product.mobile.core.controller;
+import com.product.common.lang.StringUtils;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.mobile.core.config.MobileCoreCode;
@@ -19,12 +20,31 @@
* @Date 2024/8/15 10:19
* @Desc
*/
-@RequestMapping("/mobile-face/")
+@RequestMapping("/api/mobile-face/")
@RestController
public class FaceMobileController extends AbstractBaseController {
@Resource
FaceMobileService faceMobileService;
+
+
+ /**
+ * 鑾峰彇琛ㄥ崟鎵�鏈夌粍浠剁殑瀛楁鏍规嵁涓氬姟琛ㄥ悕
+ */
+ @PostMapping("/get-face-field-by-table/{version}")
+ @ApiVersion(1)
+ public String getFaceFieldByTable(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return BaseUtil.success(faceMobileService.getFaceFieldByTable(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(MobileCoreCode.GET_FACE_FIELD_FAIL, e);
+ }
+ }
/**
* 鑾峰彇琛ㄥ崟鎵�鏈夌粍浠剁殑瀛楁鏍规嵁flow_task 琛� uuid 鎴栬�� flow_detail 琛� uuid
@@ -38,7 +58,16 @@
try {
//涓嶉獙璇佷紶鍏ョ殑琛ㄥ悕 鍙兘浼氭槸 product_sys_flow_task/product_sys_flow_detail
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return BaseUtil.success(faceMobileService.getFaceField(fse));
+// //閫氳繃瀹℃壒浠诲姟鐨剈uid鏉ユ煡琛ㄥ崟淇℃伅
+// if (StringUtils.isEmpty(fse.getString("table_uuid")) && StringUtils.isEmpty(fse.getString("table_name"))) {
+// return BaseUtil.success(faceMobileService.getFlowFaceField(fse));
+// }else {
+// //閫氳繃涓氬姟琛ㄤ俊鎭煡琛ㄥ崟淇℃伅
+// return BaseUtil.success(faceMobileService.getFaceFieldByTable(fse));
+// }
+
+ return BaseUtil.success(faceMobileService.getFaceConfig(fse));
+
} catch (BaseException e) {
e.printStackTrace();
return error(e);
--
Gitblit v1.9.2