From c18646fe51ad7f329a3430faa56bf0335f8f80f9 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 17 十一月 2025 13:59:32 +0800
Subject: [PATCH] 列表搜索，取列表别名错误
---
src/main/java/com/product/face/controller/FaceDesignController.java | 162 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 110 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/product/face/controller/FaceDesignController.java b/src/main/java/com/product/face/controller/FaceDesignController.java
index 7280441..42829f9 100644
--- a/src/main/java/com/product/face/controller/FaceDesignController.java
+++ b/src/main/java/com/product/face/controller/FaceDesignController.java
@@ -1,5 +1,9 @@
package com.product.face.controller;
+import com.drew.metadata.Face;
+import com.product.core.cache.DataPoolCacheImpl;
+import com.product.core.config.CoreConst;
+import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.spring.context.SpringMVCContextHolder;
@@ -16,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* @Author cheng
@@ -26,61 +31,114 @@
@RequestMapping("/api/face-design")
public class FaceDesignController extends AbstractBaseController {
- @Resource
- private IFaceDesignService faceDesignService;
+ @Resource
+ private IFaceDesignService faceDesignService;
- /**
- * 鏌ヨ琛ㄥ崟璁捐鏁版嵁璇︽儏
- *
- * @param request
- * @return
- */
- @PostMapping("/find-face-config/{version}")
- @ApiVersion(1)
- public String findFaceConfig(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
- String uuid = fse.getUUID();
- return faceDesignService.getFaceConfigInfo(uuid);
- } catch (BaseException e) {
- e.printStackTrace();
- return error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return error(ErrorCode.SAVE_FACE_FAIL, e);
- }
- }
+ /**
+ * 琛ㄥ崟鍒楄〃宸︿晶鏍�
+ *
+ * @return
+ */
+ @PostMapping("/tree-face/{version}")
+ @ApiVersion(1)
+ public String faceListTree() {
+ DataTableEntity tableInfoData = DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夎〃淇℃伅");
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ if (!DataTableEntity.isEmpty(tableInfoData)) {
+ for (int i = 0; i < tableInfoData.getRows(); i++) {
+ FieldSetEntity fse = tableInfoData.getFieldSetEntity(i);
+ Map<String, Object> record = new HashMap<>();
+ String tableName = fse.getString(FaceConst.FIELD_TABLE_NAME);
+ String value = fse.getString(FaceConst.UUID);
+ String tableType = fse.getString(FaceConst.FIELD_TABLE_TYPE);
+ String tableDescription = fse.getString("table_description");
+ record.put("value", value);
+ record.put(FaceConst.FIELD_TABLE_NAME, tableName);
+ record.put(FaceConst.FIELD_TABLE_TYPE, tableType);
+ record.put("table_description", tableDescription);
+ resultList.add(record);
+ }
+ resultList.sort(Comparator.comparing(o -> o.get(FaceConst.FIELD_TABLE_TYPE).toString()));
+ }
+ return success(resultList);
+ }
- /**
- * 淇濆瓨琛ㄥ崟璁捐鏁版嵁
- *
- * @param request
- * @return
- */
- @PostMapping("/save-face/{version}")
- @ApiVersion(1)
- public String saveFaceData(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
- IFaceDesignService proxy = getProxy();
- return OK_List(proxy.saveFaceData(fse));
- } catch (BaseException e) {
- e.printStackTrace();
- return error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return error(ErrorCode.SAVE_FACE_FAIL, e);
- }
- }
- /**
- * 鑾峰彇浜嬪姟浠ｇ悊
- *
- * @return
- */
- private IFaceDesignService getProxy() {
- return (IFaceDesignService) getProxyInstance(faceDesignService);
- }
+ /**
+ * 鏌ヨ琛ㄥ崟璁捐鏁版嵁璇︽儏
+ *
+ * @param request
+ * @return
+ */
+ @PostMapping("/find-face-config/{version}")
+ @ApiVersion(1)
+ public String findFaceConfig(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
+ String uuid = fse.getUUID();
+ return faceDesignService.getFaceConfigInfo(uuid);
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(ErrorCode.SAVE_FACE_FAIL, e);
+ }
+ }
+
+ /**
+ * 淇濆瓨琛ㄥ崟璁捐鏁版嵁
+ *
+ * @param request
+ * @return
+ */
+ @PostMapping("/save-face/{version}")
+ @ApiVersion(1)
+ public String saveFaceData(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
+ IFaceDesignService proxy = getProxy();
+ return OK_List(proxy.saveFaceData(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(ErrorCode.SAVE_FACE_FAIL, e);
+ }
+ }
+
+ /**
+ * 鍒犻櫎琛ㄥ崟璁捐
+ *
+ * @param request
+ * @return
+ */
+ @PostMapping("/delete-face/{version}")
+ @ApiVersion(1)
+ public String deleteFace(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, FaceConst.TABLE_FACE_CONFIG);
+ IFaceDesignService proxy = getProxy();
+ proxy.deleteFace(fse);
+ return OK();
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(ErrorCode.DELETE_FACE_FAIL, e);
+ }
+ }
+
+ /**
+ * 鑾峰彇浜嬪姟浠ｇ悊
+ *
+ * @return
+ */
+ private IFaceDesignService getProxy() {
+ return (IFaceDesignService) getProxyInstance(faceDesignService);
+ }
}
--
Gitblit v1.9.2