From ffbd3623328201512baac3f87c7a9864c322bfec Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 02 九月 2022 11:29:49 +0800
Subject: [PATCH] 开启开发者模式
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java | 199 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 169 insertions(+), 30 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
index 1f242d5..6b686eb 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java
@@ -5,13 +5,18 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.org.OrgDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -25,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Java110Cmd(serviceCode = "query.staff.infos")
public class QueryStaffInfosCmd extends Cmd {
@@ -38,29 +44,91 @@
@Autowired
private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+ @Autowired
+ private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
+
+
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- Assert.hasKeyAndValue(reqJson,"page","璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
- Assert.hasKeyAndValue(reqJson,"row","璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
+ Assert.hasKeyAndValue(reqJson, "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
+ Assert.hasKeyAndValue(reqJson, "row", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
if (!reqJson.containsKey("storeId")) {
String storeId = context.getReqHeaders().get("store-id");
reqJson.put("storeId", storeId);
}
- Assert.hasKeyAndValue(reqJson,"storeId","璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
UserDto userDto = BeanConvertUtil.covertBean(reqJson, UserDto.class);
+ String userId = context.getReqHeaders().get("user-id");
+
+
+ // 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
+ UserDto userDto1 = new UserDto();
+ userDto1.setUserId(userId);
+ userDto1.setPage(1);
+ userDto1.setRow(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto1);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ if (!UserDto.LEVEL_CD_ADMIN.equals(userDtos.get(0).getLevelCd())) {
+ //榛樿鍙煡鐪嬪綋鍓嶅綊灞炵粍缁囨灦鏋�
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/viewAllOrganization");
+ basePrivilegeDto.setUserId(reqJson.getString("userId"));
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ if (privileges.size() == 0) {
+ //鏌ヨ鍛樺伐鎵�灞炰簩绾х粍缁囨灦鏋�
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(reqJson.getString("userId"));
+ List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIdsNew(orgStaffRelDto);
+ if (orgStaffRelDtos.size() > 0) {
+ List<String> haveOrgList = new ArrayList<String>();
+ for (OrgStaffRelDto orgStaffRelDto1 : orgStaffRelDtos) {
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgStaffRelDto1.getOrgId());
+ List<OrgDto> orgDtoList = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ findCompany(haveOrgList, orgDtoList);
+ }
+ userDto.setOrgIds(haveOrgList.toArray(new String[haveOrgList.size()]));//褰撳墠浜鸿櫧褰掑睘鐨勪簩绾х粍缁囦俊鎭�
+ }
+ }
+ }
int count = userInnerServiceSMOImpl.getStaffCount(userDto);
- List<ApiStaffDataVo> staffs = null;
+ List<ApiStaffDataVo> staffs = new ArrayList<>();
if (count > 0) {
- staffs = BeanConvertUtil.covertBeanList(userInnerServiceSMOImpl.getStaffs(userDto), ApiStaffDataVo.class);
+ List<ApiStaffDataVo> staffList = BeanConvertUtil.covertBeanList(userInnerServiceSMOImpl.getStaffs(userDto), ApiStaffDataVo.class);
+ for (ApiStaffDataVo apiStaffDataVo : staffList) {
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(apiStaffDataVo.getUserId());
+ fileRelDto.setRelTypeCd("12000"); //鍛樺伐鍥剧墖
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ List<String> urls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ urls.add(fileRel.getFileRealName());
+ }
+ apiStaffDataVo.setUrls(urls);
+ }
+ staffs.add(apiStaffDataVo);
+ }
refreshInitials(staffs);
- refreshOrgs(staffs,reqJson.getString("storeId"));
+ refreshOrgs(staffs, reqJson.getString("storeId"));
} else {
staffs = new ArrayList<>();
}
@@ -76,13 +144,13 @@
context.setResponseEntity(responseEntity);
}
- private void refreshOrgs(List<ApiStaffDataVo> staffs,String storeId) {
- if(staffs == null || staffs.size()<1){
- return ;
+ private void refreshOrgs(List<ApiStaffDataVo> staffs, String storeId) {
+ if (staffs == null || staffs.size() < 1) {
+ return;
}
- List<String> staffIds = new ArrayList<>();
- for(ApiStaffDataVo apiStaffDataVo : staffs){
+ List<String> staffIds = new ArrayList<>();
+ for (ApiStaffDataVo apiStaffDataVo : staffs) {
staffIds.add(apiStaffDataVo.getUserId());
}
@@ -101,33 +169,53 @@
return;
}
-
- for(ApiStaffDataVo apiStaffDataVo : staffs){
- for(OrgStaffRelDto tmpOrgStaffRelDto : orgStaffRels){
- if(!apiStaffDataVo.getUserId().equals(tmpOrgStaffRelDto.getStaffId())){
+ for (ApiStaffDataVo apiStaffDataVo : staffs) {
+ for (OrgStaffRelDto tmpOrgStaffRelDto : orgStaffRels) {
+ if (!apiStaffDataVo.getUserId().equals(tmpOrgStaffRelDto.getStaffId())) {
continue;
}
- tmpOrgStaffRelDto.setParentOrgId(tmpOrgStaffRelDto.getOrgId());
- findParents(tmpOrgStaffRelDto, orgDtos, null);
- apiStaffDataVo.setOrgName(tmpOrgStaffRelDto.getOrgName());
+ OrgDto org = new OrgDto();
+ org.setOrgId(tmpOrgStaffRelDto.getOrgId());
+ List<OrgDto> orgs = orgV1InnerServiceSMOImpl.queryOrgs(org);
+ Assert.listOnlyOne(orgs, "鏌ヨ缁勭粐琛ㄩ敊璇紒");
+ apiStaffDataVo.setOrgId(tmpOrgStaffRelDto.getOrgId());
+ apiStaffDataVo.setParentTwoOrgId(orgs.get(0).getParentOrgId());
}
+ }
+
+ for (ApiStaffDataVo apiStaffDataVo : staffs) {
+ if (StringUtil.isEmpty(apiStaffDataVo.getOrgId())) {
+ continue;
+ }
+ apiStaffDataVo.setParentOrgId(apiStaffDataVo.getOrgId());
+
+ findParents(apiStaffDataVo, orgDtos, null, 0);
+
}
}
- private void findParents(OrgStaffRelDto orgStaffRelDto, List<OrgDto> orgDtos, OrgDto curOrgDto) {
+ private void findParents(ApiStaffDataVo apiStaffDataVo, List<OrgDto> orgDtos, OrgDto curOrgDto, int orgDeep) {
for (OrgDto orgDto : orgDtos) {
- if (!orgStaffRelDto.getParentOrgId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
- continue;
- }
- orgStaffRelDto.setParentOrgId(orgDto.getParentOrgId());
curOrgDto = orgDto;
- if (StringUtil.isEmpty(orgStaffRelDto.getOrgName())) {
- orgStaffRelDto.setOrgName(orgDto.getOrgName() );
+ if (!apiStaffDataVo.getParentOrgId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
continue;
}
- orgStaffRelDto.setOrgName(orgDto.getOrgName() + " / " + orgStaffRelDto.getOrgName());
+
+ //濡傛灉鍒颁竴绾� 灏辩粨鏉�
+ if (OrgDto.ORG_LEVEL_STORE.equals(apiStaffDataVo.getOrgLevel())) {
+ continue;
+ }
+
+ apiStaffDataVo.setParentOrgId(orgDto.getParentOrgId());
+
+ if (StringUtil.isEmpty(apiStaffDataVo.getOrgName())) {
+ apiStaffDataVo.setOrgName(orgDto.getOrgName());
+ continue;
+ }
+ apiStaffDataVo.setOrgName(orgDto.getOrgName() + " / " + apiStaffDataVo.getOrgName());
+ apiStaffDataVo.setOrgLevel(orgDto.getOrgLevel());
}
if (curOrgDto != null && OrgDto.ORG_LEVEL_STORE.equals(curOrgDto.getOrgLevel())) {
@@ -142,20 +230,71 @@
return;
}
- findParents(orgStaffRelDto, orgDtos, curOrgDto);
+ orgDeep += 1;
+
+ if (orgDeep > 20) {
+ return;
+ }
+
+ findParents(apiStaffDataVo, orgDtos, curOrgDto, orgDeep);
}
/**
* 鍒峰叆棣栧瓧姣�
+ *
* @param staffs
*/
private void refreshInitials(List<ApiStaffDataVo> staffs) {
- for(ApiStaffDataVo staffDataVo : staffs){
- if(StringUtil.isEmpty(staffDataVo.getName())){
+ for (ApiStaffDataVo staffDataVo : staffs) {
+ if (StringUtil.isEmpty(staffDataVo.getName())) {
continue;
}
- staffDataVo.setInitials(PinYinUtil.getFirstSpell(staffDataVo.getName()).toUpperCase().charAt(0)+"");
+ staffDataVo.setInitials(PinYinUtil.getFirstSpell(staffDataVo.getName()).toUpperCase().charAt(0) + "");
}
}
+
+ private void findCompany(List<String> haveOrgList, List<OrgDto> orgDtoList) {
+ for (OrgDto orgDto : orgDtoList) {
+ haveOrgList.add(orgDto.getOrgId());
+ if (!"1".equals(orgDto.getOrgLevel())) {
+ if ("2".equals(orgDto.getOrgLevel())) {
+ //涓婄骇鍒�
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgDto.getParentOrgId());
+ List<OrgDto> orgDtoList1 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ for (OrgDto orgDto2 : orgDtoList1) {
+ haveOrgList.add(orgDto2.getOrgId());
+ }
+ //鍚岀骇鍒�
+ OrgDto orgDto2 = new OrgDto();
+ orgDto2.setParentOrgId(orgDto.getOrgId());
+ List<OrgDto> orgDtoList2 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto2);
+ for (OrgDto orgDto3 : orgDtoList2) {
+ haveOrgList.add(orgDto3.getOrgId());
+ }
+ } else {
+ OrgDto orgDto1 = new OrgDto();
+ orgDto1.setOrgId(orgDto.getParentOrgId());
+ List<OrgDto> orgDtoList1 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto1);
+ findCompany(haveOrgList, orgDtoList1);
+
+ //涓嬩竴涓骇鍒�
+ if (!"2".equals(orgDto.getOrgLevel())) {
+ OrgDto orgDto3 = new OrgDto();
+ orgDto3.setParentOrgId(orgDto.getOrgId());
+ List<OrgDto> orgDtoList2 = orgV1InnerServiceSMOImpl.queryOrgs(orgDto3);
+ for (OrgDto orgDto4 : orgDtoList2) {
+ haveOrgList.add(orgDto4.getOrgId());
+ }
+ }
+
+ }
+
+ }
+ }
+
+
+ }
+
}
--
Gitblit v1.8.0