Skip to content

Y
yanxuan-qc-change-system
Commit ed7e20fb by “zcwang”
Options

modify: 查询商品对应负责人兜底

parent 8e009370
Showing with 70 additions and 65 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/config/AppConfig.java
......@@ -6,14 +6,11 @@
*/
package com.netease.mail.yanxuan.change.biz.config;
import java.util.List;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.ctrip.framework.apollo.spring.annotation.EnableAutoUpdateApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ValueMapping;
import com.sun.org.apache.xpath.internal.operations.Bool;
import lombok.Data;
......@@ -32,23 +29,52 @@ public class AppConfig {
@Value("${changeExecLimit:20}")
private Integer changeExecLimit;
@Value("${testEmail:A@163.com}")
private String testEmail;
/**
* 商品关联开发兜底人名
*/
@Value("${change.goods.functionary.name:\"钱伟钰\"}")
private String functionaryName;
@Value("${sendEmail:[\"wb.wangzhichao01@mesg.corp.netease.com\"]}")
private List<String> receiver;
/**
* 商品关联开发兜底邮箱
*/
@Value("${change.goods.functionary.email:\"qianweiyu@corp.netease.com\"}")
private String functionaryEmail;
@Value("${change.goods.principal.name:aaa}")
private String defaultName;
/**
* 商品关联采购兜底人名
*/
@Value("${change.goods.purchase.name:\"陈金灿\"}")
private String purchaseName;
/**
* 商品关联采购兜底邮箱
*/
@Value("${change.goods.purchase.email:\"bjchenjincan@corp.netease.com\"}")
private String purchaseEmail;
/**
* 商品关联计划兜底人名
*/
@Value("${change.goods.project.name:\"王敏\"}")
private String goodsProjectName;
@Value("${change.goods.principal.email:grp.gyhtest1001@corp.netease.com}")
private String defaultEmail;
/**
* 商品关联计划兜底邮箱
*/
@Value("${change.goods.project.email:\"wangmin12@corp.netease.com\"}")
private String goodsProjectEmail;
@Value("${searchName:aa}")
private String searchName;
/**
* 商品关联SQE兜底邮箱
*/
@Value("${change.goods.sqe.name:\"崔亦仙\"}")
private String sqeName;
@Value("${searchUid:wb.mulongfei@mesg.corp.netease.com}")
private String searchUid;
/**
* 商品关联SQE兜底邮箱
*/
@Value("${change.goods.sqe.email:\"cuiyixian@corp.netease.com\"}")
private String sqeEmail;
/**
* 变更管理QM
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
......@@ -352,7 +352,6 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
commanderResponse.setEmail(goodsResponseRpc.getEmail());
} catch (Exception e) {
log.error("[queryGoodsCommander] error,e{}", e);
commanderResponse.setEmail(appConfig.getDefaultEmail());
}
return commanderResponse;
case SUPPLIERS_ASSOCIATED:
......@@ -388,14 +387,29 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
}
for (String rpc : rpcMap.keySet()) {
ChangeGoodsPrincipalPO goodsRpc = map.get(Long.parseLong(rpc));
String uid = null;
if (type.equals(ChangePrincipalEnum.GOODS_BU.getType())) {
goodsRpc.setFunctionaryName(rpcMap.get(rpc).get("name").toString());
goodsRpc.setFunctionaryEmail(rpcMap.get(rpc).get("uid").toString());
goodsRpc(ChangePrincipalEnum.GOODS_BU.getType(), rpcMap.get(rpc).get("uid").toString(), goodsRpc);
try {
uid = rpcMap.get(rpc).get("uid").toString();
goodsRpc.setFunctionaryName(rpcMap.get(rpc).get("name").toString());
goodsRpc.setFunctionaryEmail(uid);
} catch (Exception e) {
log.error("[getGoodsPrincipalNameEmail] query error, type:{},rpc:{}", type, rpc, e);
goodsRpc.setFunctionaryName(null);
goodsRpc.setFunctionaryEmail(null);
}
goodsRpc(ChangePrincipalEnum.GOODS_BU.getType(), uid, goodsRpc);
} else {
goodsRpc.setGoodsProjectName(rpcMap.get(rpc).get("name").toString());
goodsRpc.setGoodsProjectEmail(rpcMap.get(rpc).get("uid").toString());
goodsRpc(ChangePrincipalEnum.PROSPECTUS.getType(), rpcMap.get(rpc).get("uid").toString(), goodsRpc);
try {
uid = rpcMap.get(rpc).get("uid").toString();
goodsRpc.setGoodsProjectName(rpcMap.get(rpc).get("name").toString());
goodsRpc.setGoodsProjectEmail(uid);
} catch (Exception e) {
log.error("[getGoodsPrincipalNameEmail] query error, type:{},rpc:{}", type, rpc, e);
goodsRpc.setFunctionaryName(null);
goodsRpc.setFunctionaryEmail(null);
}
goodsRpc(ChangePrincipalEnum.PROSPECTUS.getType(), uid, goodsRpc);
}
}
}
......@@ -409,27 +423,24 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
* @param goodsRpc
*/
private void goodsRpc(Integer type, String uid, ChangeGoodsPrincipalPO goodsRpc) {
// todo:mock数据
String defaultName = appConfig.getDefaultName();
String defaultEmail = appConfig.getDefaultEmail();
if (uid == null) {
switch (type) {
case 1:
//BU
goodsRpc.setFunctionaryName(defaultName);
goodsRpc.setFunctionaryEmail(defaultEmail);
goodsRpc.setFunctionaryName(appConfig.getFunctionaryName());
goodsRpc.setFunctionaryEmail(appConfig.getFunctionaryEmail());
case 2:
//采购
goodsRpc.setPurchaseName(defaultName);
goodsRpc.setPurchaseEmail(defaultEmail);
goodsRpc.setPurchaseName(appConfig.getPurchaseName());
goodsRpc.setPurchaseEmail(appConfig.getPurchaseEmail());
case 3:
//计划
goodsRpc.setGoodsProjectName(defaultName);
goodsRpc.setGoodsProjectName(defaultEmail);
goodsRpc.setGoodsProjectName(appConfig.getGoodsProjectName());
goodsRpc.setGoodsProjectEmail(appConfig.getGoodsProjectEmail());
case 4:
//SQE
goodsRpc.setGoodsSqeName(defaultName);
goodsRpc.setGoodsSqeEmail(defaultEmail);
goodsRpc.setGoodsSqeName(appConfig.getSqeName());
goodsRpc.setGoodsSqeEmail(appConfig.getSqeEmail());
}
}
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/SupplierController.java
......@@ -49,12 +49,6 @@ public class SupplierController {
@RequestParam(name = "name", required = false) String name,
@RequestParam(name = "uid", required = false) String uid,
@RequestParam(name = "fuzzySearchText") String fuzzySearchText) {
if (name == null) {
name = appConfig.getSearchName();
}
if (uid == null) {
uid = appConfig.getSearchUid();
}
SupplierSearchRemoteReq req = new SupplierSearchRemoteReq();
req.setSearchText(fuzzySearchText);
AjaxResult<List<SupplierSimpleRsp>> supplierInfo = supplierSendService.queryByConditionForQc(req);
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java
......@@ -7,10 +7,8 @@
package com.netease.mail.yanxuan.change.web.controller;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -18,24 +16,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
import com.netease.mail.yanxuan.change.biz.config.AppConfig;
import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
import com.netease.mail.yanxuan.change.biz.service.rpc.QCService;
import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
import com.netease.mail.yanxuan.change.biz.task.AutoSubmit;
import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
import com.netease.mail.yanxuan.change.dal.meta.model.req.SendMailReq;
import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
......@@ -53,21 +39,9 @@ import lombok.extern.slf4j.Slf4j;
public class TestController {
@Autowired
private ChangeFlowService changeFlowService;
@Autowired
private AutoSubmit autoSubmit;
@Autowired
private ChangeFlowBiz changeFlowBiz;
@Autowired
private AppConfig appConfig;
@Autowired
private SupplierSendService sendSupplierEmail;
@Autowired
private ChangeConfigService changeConfigService;
@Autowired
......
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