From e27c43f254793a834f4713637494b088bdb34680 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 30 八月 2024 18:31:50 +0800
Subject: [PATCH] 文档检索代码优化

---
 src/main/java/com/product/lucene/controller/LuceneController.java |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/product/lucene/controller/LuceneController.java b/src/main/java/com/product/lucene/controller/LuceneController.java
index 47c9dd9..7239dc2 100644
--- a/src/main/java/com/product/lucene/controller/LuceneController.java
+++ b/src/main/java/com/product/lucene/controller/LuceneController.java
@@ -5,11 +5,11 @@
 import com.product.core.config.CoreConst;
 import com.product.core.controller.support.AbstractBaseController;
 import com.product.core.entity.FieldSetEntity;
-import com.product.core.entity.RequestParameterEntity;
 import com.product.core.exception.BaseException;
 import com.product.core.spring.context.SpringMVCContextHolder;
 import com.product.lucene.service.LuceneService;
 import com.product.module.sys.version.ApiVersion;
+import com.product.util.BaseUtil;
 import com.product.util.ResultInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,16 +31,11 @@
 	 * 	鍒涘缓绱㈠紩
 	 * @param request
 	 */
-	@RequestMapping("created/{version}")
+	@RequestMapping("/created/{version}")
 	@ApiVersion(1)
     public void create(HttpServletRequest request) {
 		try {
-            FieldSetEntity fse = null;
-            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-            if (bean != null) {
-                RequestParameterEntity reqp = (RequestParameterEntity) bean;
-                fse = reqp.getFormData();
-            }
+            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
             luceneService.createdIndex(fse);
         } catch (BaseException e) {
             SpringMVCContextHolder.getSystemLogger().error(e);
@@ -54,30 +49,45 @@
 	 * @param request
 	 * @return
 	 */
-    @RequestMapping("search/{version}")
+    @RequestMapping("/search/{version}")
     @ApiVersion(1)
     public String search(HttpServletRequest request) {
     	try {
-            FieldSetEntity fse = null;
-            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-            if (bean != null) {
-                RequestParameterEntity reqp = (RequestParameterEntity) bean;
-                fse = reqp.getFormData();
-            }
+            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
             if (StringUtils.isEmpty(fse.getString("pagesize")) || StringUtils.isEmpty(fse.getString("cpage"))) {
-				
 			}
             if (StringUtils.isEmpty(fse.getString("search_key"))) {
 				
 			}
-            JSONObject object=luceneService.searchProduct(fse);
-           
+            JSONObject object = luceneService.searchProduct(fse);
             return ResultInfo.success(object);
         } catch (BaseException e) {
-            SpringMVCContextHolder.getSystemLogger().error(e);
+        	e.printStackTrace();
+        	return error(e);
         } catch (Exception e) {
             e.printStackTrace();
+            return error("", "");
         }
-    	return null;
+    }
+    
+    /**
+	 * 	妫�绱㈡枃浠惰烦杞潈闄�
+	 * @param request
+	 * @return
+	 */
+    @RequestMapping("/permission/{version}")
+    @ApiVersion(1)
+    public String permission(HttpServletRequest request) {
+    	try {
+            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+            JSONObject object = luceneService.permission(fse.getUUID(), fse.getString(CoreConst.FUNCTION_UUID));
+            return ResultInfo.success(object);
+        } catch (BaseException e) {
+        	e.printStackTrace();
+        	return error(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error("", "");
+        }
     }
 }

--
Gitblit v1.9.2