From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
index d37ed1f..5077c01 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
@@ -9,6 +9,7 @@
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.intf.user.IPrivilegeGroupV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.service.context.DataQuery;
import com.java110.service.smo.IQueryServiceSMO;
@@ -33,11 +34,8 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
-
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
}
@Override
@@ -45,8 +43,7 @@
String userId = context.getReqHeaders().get("user-id");
String storeId = context.getReqHeaders().get("store-id");
String communityId = context.getReqHeaders().get("communityId");
-
- if(StringUtil.isEmpty(userId)){
+ if (StringUtil.isEmpty(userId)) {
userId = reqJson.getString("userId");
}
// 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
@@ -57,7 +54,7 @@
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
String storeTypeCd = "";
- if(!reqJson.containsKey("storeTypeCd") || StringUtil.isEmpty(reqJson.getString("storeTypeCd"))) {
+ if (!reqJson.containsKey("storeTypeCd") || StringUtil.isEmpty(reqJson.getString("storeTypeCd"))) {
StoreDto storeDto = new StoreDto();
storeDto.setStoreId(storeId);
storeDto.setPage(1);
@@ -65,10 +62,9 @@
List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
storeTypeCd = storeDtos.get(0).getStoreTypeCd();
- }else{
+ } else {
storeTypeCd = reqJson.getString("storeTypeCd");
}
-
DataQuery dataQuery = new DataQuery();
dataQuery.setServiceCode("query.store.privilegeGroup");
JSONObject param = new JSONObject();
@@ -84,15 +80,11 @@
ResponseEntity<String> privilegeGroup = dataQuery.getResponseEntity();
if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
context.setResponseEntity(privilegeGroup);
- return ;
+ return;
}
-
JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
-
Assert.jsonObjectHaveKey(privilegeGroupObj, "privilegeGroups", "鏌ヨ鑿滃崟鏈繑鍥瀙rivilegeGroups鑺傜偣");
-
JSONArray privilegeGroups = privilegeGroupObj.getJSONArray("privilegeGroups");
-
context.setResponseEntity(new ResponseEntity<String>(privilegeGroups.toJSONString(), HttpStatus.OK));
}
}
--
Gitblit v1.8.0