From 17764bd12c42512189ea5c71fac8be2614fb7589 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 22 十月 2020 15:38:15 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/listener/basePrivilege/CheckUserHasResourceListener.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/basePrivilege/CheckUserHasResourceListener.java b/service-api/src/main/java/com/java110/api/listener/basePrivilege/CheckUserHasResourceListener.java
index 06e9e6c..25c853b 100644
--- a/service-api/src/main/java/com/java110/api/listener/basePrivilege/CheckUserHasResourceListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/basePrivilege/CheckUserHasResourceListener.java
@@ -5,17 +5,19 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.entity.center.AppService;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+import java.util.Map;
/**
* 妫�鏌ョ敤鎴锋槸鍚︽湁璧勬簮
@@ -43,32 +45,16 @@
DataFlowContext dataFlowContext = event.getDataFlowContext();
AppService service = event.getAppService();
JSONObject data = dataFlowContext.getReqJson();
- Assert.hasKeyAndValue(data, "resource", "璇锋眰鎶ユ枃涓湭鍖呭惈璧勬簮璺緞");
logger.debug("璇锋眰淇℃伅锛歿}", data);
- //Assert.hasKeyAndValue(data, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId鑺傜偣");
ResponseEntity<String> responseEntity = null;
-
- //鍒ゆ柇璧勬簮璺緞鏄惁閰嶇疆鏉冮檺 锛屾病鏈夐厤缃潈闄愬垯閮借兘璁块棶
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
basePrivilegeDto.setResource(data.getString("resource"));
- int count = menuInnerServiceSMOImpl.queryBasePrivilegesCount(basePrivilegeDto);
- //娌℃湁閰嶇疆鏉冮檺锛岄兘鑳借闂�
- if (count < 1) {
- responseEntity = new ResponseEntity<String>("鏍￠獙鎴愬姛锛岃璧勬簮璺緞鏈厤缃潈闄愶紝寤鸿寮�鍙戣�呰处鎴烽厤缃潈闄�", HttpStatus.OK);
- dataFlowContext.setResponseEntity(responseEntity);
- return;
- }
basePrivilegeDto.setUserId(data.getString("userId"));
- boolean checkFlag = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- if (!checkFlag) {
- responseEntity = new ResponseEntity<String>("娌℃湁鏉冮檺鎿嶄綔", HttpStatus.UNAUTHORIZED);
- } else {
-
- responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
-
- }
-
+ data = new JSONObject();
+ data.put("privileges", privileges);
+ responseEntity = new ResponseEntity<String>(data.toJSONString(), HttpStatus.OK);
dataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0