From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
index 7fa11a6..49a70f6 100644
--- a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
+++ b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
@@ -11,6 +11,7 @@
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.component.ComponentValidateResult;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
@@ -50,6 +51,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
+
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
// 寰俊鏈嶅姟鍟嗘敮浠樺紑鍏�
@@ -60,6 +64,10 @@
private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
+
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
/**
@@ -334,7 +342,6 @@
if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
return;
}
- String tmpResource = null;
boolean hasPrivilege = false;
for (BasePrivilegeDto privilegeDto : basePrivilegeDtos) {
if (resource.equals(privilegeDto.getResource())) {
@@ -345,20 +352,18 @@
return;
}
- ResultVo resultVo = null;
- if (resultVo == null ||
- resultVo.getCode() != ResultVo.CODE_OK) {
- throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
- }
- JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource(resource);
+ basePrivilegeDto.setUserId(pd.getUserId());
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- hasPrivilege = false;
if (privileges == null || privileges.size() < 1) {
throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
}
+
+ hasPrivilege = false;
for (int privilegeIndex = 0; privilegeIndex < privileges.size(); privilegeIndex++) {
- tmpResource = privileges.getJSONObject(privilegeIndex).getString("resource");
- if (resource.equals(tmpResource)) {
+ if (resource.equals(privileges.get(privilegeIndex).get("resource"))) {
hasPrivilege = true;
break;
}
@@ -377,13 +382,13 @@
protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResultVo resultVo = null;
-
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
+ logger.debug("鏌ヨ鍟嗘埛淇℃伅 getStoreInfo 锛歿}",resultVo.toString());
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
private ResponseEntity<String> getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
- ResultVo resultVo = null;
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
--
Gitblit v1.8.0