Commit 8ea203a1 by 王志超

add:查询负责人,添加日志定位邮箱

parent 22b650b7
Pipeline #88961 passed with stages
in 1 minute 32 seconds
...@@ -89,19 +89,27 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -89,19 +89,27 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
*/ */
@Override @Override
public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander, String commander) { public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander, String commander) {
log.info("[queryCommanderInfo] entry, parentChangeClassId:{}, sonChangeClassId:{}, createSource:{}, supplier:{}, changeSupplierId:{}, flowCreator:{}, commander:{}",
changeCommander.getParentChangeClassId(), changeCommander.getSonChangeClassId(), changeCommander.getCreateSource(),
changeCommander.getSupplier(), changeCommander.getChangeSupplierId(), changeCommander.getFlowCreator(), commander);
GoodsResponseRpc rpc = new GoodsResponseRpc(); GoodsResponseRpc rpc = new GoodsResponseRpc();
//获取模板名称 通过一级变更类型 二级变更类型ID 定位模板 //获取模板名称 通过一级变更类型 二级变更类型ID 定位模板
ChangeConfig changeConfig = changeConfigService.queryChangeType(changeCommander.getParentChangeClassId(), ChangeConfig changeConfig = changeConfigService.queryChangeType(changeCommander.getParentChangeClassId(),
changeCommander.getSonChangeClassId()); changeCommander.getSonChangeClassId());
if (changeConfig == null) { if (changeConfig == null) {
log.warn("[queryCommanderInfo] changeConfig is null, parentChangeClassId:{}, sonChangeClassId:{}",
changeCommander.getParentChangeClassId(), changeCommander.getSonChangeClassId());
return null; return null;
} }
//查询出当前模板配置中选择的 角色 //查询出当前模板配置中选择的 角色
ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum
.getChangeCommanderEnum(changeConfig.getChangeCommanderType()); .getChangeCommanderEnum(changeConfig.getChangeCommanderType());
if (changeCommanderEnum == null) { if (changeCommanderEnum == null) {
log.warn("[queryCommanderInfo] changeCommanderEnum is null, changeCommanderType:{}", changeConfig.getChangeCommanderType());
return null; return null;
} }
log.info("[queryCommanderInfo] changeConfig found, changeSubject:{}, changeCommanderType:{}, changeCommanderEnum:{}",
changeConfig.getChangeSubject(), changeConfig.getChangeCommanderType(), changeCommanderEnum.name());
//直接排除 选项为固定人 或者发起人 //直接排除 选项为固定人 或者发起人
if (Objects.equals(changeConfig.getChangeCommanderType(), ChangeCommanderEnum.COMMANDER_ORIGINATOR.getId())) { if (Objects.equals(changeConfig.getChangeCommanderType(), ChangeCommanderEnum.COMMANDER_ORIGINATOR.getId())) {
//发起人; //发起人;
...@@ -110,14 +118,19 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -110,14 +118,19 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
List<GoodsResponseRpc> goodsResponseRpcList = queryChangeSupplier( List<GoodsResponseRpc> goodsResponseRpcList = queryChangeSupplier(
ChangeCommanderEnum.SUPPLIERS_ASSOCIATED, changeCommander.getSupplier(), ChangeCommanderEnum.SUPPLIERS_ASSOCIATED, changeCommander.getSupplier(),
SupplierChangePrincipalEnum.GOODS_BU.getName()); SupplierChangePrincipalEnum.GOODS_BU.getName());
return goodsResponseRpcList.get(0); GoodsResponseRpc result = goodsResponseRpcList != null && !goodsResponseRpcList.isEmpty() ? goodsResponseRpcList.get(0) : null;
log.info("[queryCommanderInfo] branch=COMMANDER_ORIGINATOR+TONG_ZHOU, result email:{}, name:{}",
result != null ? result.getEmail() : null, result != null ? result.getName() : null);
return result;
} }
rpc.setEmail(changeCommander.getFlowCreator()); rpc.setEmail(changeCommander.getFlowCreator());
log.info("[queryCommanderInfo] branch=COMMANDER_ORIGINATOR, result email:{}", rpc.getEmail());
return rpc; return rpc;
} }
if (Objects.equals(changeConfig.getChangeCommanderType(), ChangeCommanderEnum.FIXED_PERSON.getId())) { if (Objects.equals(changeConfig.getChangeCommanderType(), ChangeCommanderEnum.FIXED_PERSON.getId())) {
//固定人; //固定人;
rpc.setEmail(changeConfig.getChangeCommander()); rpc.setEmail(changeConfig.getChangeCommander());
log.info("[queryCommanderInfo] branch=FIXED_PERSON, result email:{}, from changeConfig.changeCommander", rpc.getEmail());
return rpc; return rpc;
} }
if (Objects.equals(ChangeSubjectEnum.PRODUCT.getType(), changeConfig.getChangeSubject())) { if (Objects.equals(ChangeSubjectEnum.PRODUCT.getType(), changeConfig.getChangeSubject())) {
...@@ -125,25 +138,34 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -125,25 +138,34 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
&& SupplierChangePrincipalEnum.PURCHASE.getName().equals(changeConfig.getChangeCommander())) { && SupplierChangePrincipalEnum.PURCHASE.getName().equals(changeConfig.getChangeCommander())) {
GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc(); GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
goodsResponseRpc.setEmail(commander); goodsResponseRpc.setEmail(commander);
log.info("[queryCommanderInfo] branch=PRODUCT+GOODS_ASSOCIATED+PURCHASE, result email:{}", commander);
return goodsResponseRpc; return goodsResponseRpc;
} }
//商品变更 //商品变更
List<GoodsResponseRpc> goodsResponseRpcList = queryGoodsCommander(changeCommanderEnum, changeCommander.getGoodsInfos(), List<GoodsResponseRpc> goodsResponseRpcList = queryGoodsCommander(changeCommanderEnum, changeCommander.getGoodsInfos(),
changeConfig.getChangeCommander()); changeConfig.getChangeCommander());
return goodsResponseRpcList.get(0); GoodsResponseRpc productResult = goodsResponseRpcList != null && !goodsResponseRpcList.isEmpty() ? goodsResponseRpcList.get(0) : null;
log.info("[queryCommanderInfo] branch=PRODUCT+queryGoodsCommander, result email:{}, name:{}",
productResult != null ? productResult.getEmail() : null, productResult != null ? productResult.getName() : null);
return productResult;
} else if (Objects.equals(ChangeSubjectEnum.SUPPLIER.getType(), changeConfig.getChangeSubject())) { } else if (Objects.equals(ChangeSubjectEnum.SUPPLIER.getType(), changeConfig.getChangeSubject())) {
if (ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.equals(changeCommanderEnum) if (ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.equals(changeCommanderEnum)
&& SupplierChangePrincipalEnum.PURCHASE.getName().equals(changeConfig.getChangeCommander())) { && SupplierChangePrincipalEnum.PURCHASE.getName().equals(changeConfig.getChangeCommander())) {
GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc(); GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
goodsResponseRpc.setEmail(commander); goodsResponseRpc.setEmail(commander);
log.info("[queryCommanderInfo] branch=SUPPLIER+SUPPLIERS_ASSOCIATED+PURCHASE, result email:{}", commander);
return goodsResponseRpc; return goodsResponseRpc;
} }
//供应商 采购 计划 SQE //供应商 采购 计划 SQE
List<GoodsResponseRpc> goodsResponseRpcList = queryChangeSupplier(changeCommanderEnum, changeCommander.getChangeSupplierId(), List<GoodsResponseRpc> goodsResponseRpcList = queryChangeSupplier(changeCommanderEnum, changeCommander.getChangeSupplierId(),
changeConfig.getChangeCommander()); changeConfig.getChangeCommander());
return goodsResponseRpcList.get(0); GoodsResponseRpc supplierResult = goodsResponseRpcList != null && !goodsResponseRpcList.isEmpty() ? goodsResponseRpcList.get(0) : null;
log.info("[queryCommanderInfo] branch=SUPPLIER+queryChangeSupplier, result email:{}, name:{}",
supplierResult != null ? supplierResult.getEmail() : null, supplierResult != null ? supplierResult.getName() : null);
return supplierResult;
} }
//其他变更 备注 其他变更之后固定人 和发起人在上面判断会被排除掉 changeConfig.getChangeCommander(); //其他变更 备注 其他变更之后固定人 和发起人在上面判断会被排除掉 changeConfig.getChangeCommander();
log.warn("[queryCommanderInfo] no branch matched, return null, changeSubject:{}", changeConfig.getChangeSubject());
return null; return null;
} }
...@@ -275,12 +297,16 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -275,12 +297,16 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
req.setSupplierIdList(supplierIdList); req.setSupplierIdList(supplierIdList);
//进行参数解析 //进行参数解析
List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req); List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req);
log.info("[queryChangeSupplier] changeSupplierId:{}, commander:{}, searchType:{}, supplierUserCount:{}",
changeSupplierId, commander, req.getSearchType(), listAjaxResponse != null ? listAjaxResponse.size() : 0);
log.debug("[querySupplierRelatedUser] response:{}", JSON.toJSONString(listAjaxResponse)); log.debug("[querySupplierRelatedUser] response:{}", JSON.toJSONString(listAjaxResponse));
if (!CollectionUtils.isEmpty(listAjaxResponse)) { if (!CollectionUtils.isEmpty(listAjaxResponse)) {
Optional<SupplierUserRsp> anySupplierUser = listAjaxResponse.stream() Optional<SupplierUserRsp> anySupplierUser = listAjaxResponse.stream()
.filter(i -> i.getSupplierId().equals(changeSupplierId)).findAny(); .filter(i -> i.getSupplierId().equals(changeSupplierId)).findAny();
if (anySupplierUser.isPresent()) { if (anySupplierUser.isPresent()) {
Map<String, String> uid2NameMap = anySupplierUser.get().getUid2NameMap(); Map<String, String> uid2NameMap = anySupplierUser.get().getUid2NameMap();
log.info("[queryChangeSupplier] uid2NameMap from supplier, changeSupplierId:{}, uid2NameMapKeys:{}",
changeSupplierId, uid2NameMap != null ? uid2NameMap.keySet() : null);
for (String key: uid2NameMap.keySet()) { for (String key: uid2NameMap.keySet()) {
GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc(); GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
goodsResponseRpc.setName(uid2NameMap.get(key)); goodsResponseRpc.setName(uid2NameMap.get(key));
...@@ -293,6 +319,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ ...@@ -293,6 +319,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc(); GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
this.getEmail(goodsResponseRpc, req.getSearchType()); this.getEmail(goodsResponseRpc, req.getSearchType());
goodsResponseRpcList.add(goodsResponseRpc); goodsResponseRpcList.add(goodsResponseRpc);
log.info("[queryChangeSupplier] fallback to getEmail, searchType:{}, result email:{}", req.getSearchType(), goodsResponseRpc.getEmail());
} }
return goodsResponseRpcList; return goodsResponseRpcList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment