Skip to content

Y
yanxuan-qc-change-system
Commit 7bdf06be by yxdubhe_bot
Options

merge:feature-changeFlow-221110:operator:hzhuyuanyuan@corp.netease.com:auto_bran… 

merge:feature-changeFlow-221110:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end
parents 18a2cf91 aecec222
Pipeline #44467 failed with stages
in 1 minute 1 second
Showing with 328 additions and 81 deletions
.gitlab-ci.yml
......@@ -130,3 +130,52 @@ online_image_upload:
- master
dependencies:
- online_package
################
# Regression
################
regression_package:
stage: package
script:
- mvn clean -U package -Ponline -Dmaven.test.skip=true -Dencoding=UTF-8
- mv $TARGET_FILE_PATH/$TARGET_FILE_NAME $ARTIFACT_NAME
- mv $REGRESSION_SETENV_FILE_PATH ./setenv.sh
- zip $CI_PROJECT_NAME.zip ./setenv.sh $ARTIFACT_NAME
tags:
- ci-backend
artifacts:
paths:
- $CI_PROJECT_NAME.zip
- swagger/
expire_in: 1d
only:
- /^(release|hotfix).*$/
regression_upload_bee:
stage: upload-bee
script:
- cd swagger
- beeUpload $SERVICE_CODE $CI_BUILD_REF_NAME $GITLAB_USER_NAME $GITLAB_USER_EMAIL
tags:
- ci-backend
only:
- master
dependencies:
- regression_package
regression_image_upload:
stage: upload
script:
- version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
- version_tools version && PROJECT_VERSION=$(version_tools result)
- IMAGE_TAG="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
- IMAGE_NAME="${HARBOR_URL}/${HARBOR_APP_DIRECTOR}/${SERVICE_CODE}:${IMAGE_TAG}"
- unzip -o -q $CI_PROJECT_NAME.zip -d .
- docker build -t ${IMAGE_NAME} .
- eval opera docker $OPERA_ARGS --env=regression --imageName=${IMAGE_NAME} --imageTag=${IMAGE_TAG}
tags:
- ci-backend
only:
- /^(release|hotfix).*$/
dependencies:
- regression_package
yanxuan-qc-change-system-assembly/src/main/resources/config/dev/setenv.sh
jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
jvm_opts_property="-Dspring.profiles.active=test -Denv=test -Dserver.port=8080"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
consul_service_tags=test
consul_service_port=8080
consul_health_url="/i/health"
consul_service_name="yanxuan-sc-ehc"
consul_service_name="yanxuan-qc-change-system"
yanxuan-qc-change-system-assembly/src/main/resources/config/online/application.properties
......@@ -45,7 +45,7 @@ spring.redis.host=yx-cust23-online.ncr.cn-east-p1.internal.
spring.redis.port=32427
# supplier
supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas
supplier.url=http://127.0.0.1:8550/proxy/online.yanxuan-supplier-ms.service.mailsaas
### des\u914D\u7F6E
# \u5BFC\u51FA\u6587\u4EF6\u4E0A\u4F20\u5230\u54EA\u4E2A\u670D\u52A1\u5668\uFF0C\u6709test\u548Conline\u53EF\u9009
......
yanxuan-qc-change-system-assembly/src/main/resources/config/online/setenv.sh
jvm_opts_base="-cp . -ea -Xms8192m -Xmx8192m"
jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
jvm_opts_property="-Dspring.profiles.active=online -Denv=online -Dserver.port=8080"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
consul_service_tags=online
consul_service_port=8080
consul_service_name="yanxuan-sc-ehc"
consul_service_name="yanxuan-qc-change-system"
consul_health_url="/i/health"
yanxuan-qc-change-system-assembly/src/main/resources/config/regression/application.properties 0 → 100644
env=regression
dschedule.enable=true
dschedule.env=regression
dschedule.app-id=yanxuan-qc-change-system
dschedule.job-group=736
dschedule.enable-auto-register=true
dschedule.executor-fail-strategy=fail_alarm
dschedule.alarm-email=wb.tanglongwei@mesg.corp.netease.com
dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.service.mailsaas/
spring.http.multipart.max-file-size=100MB
spring.http.multipart.max-request-size=100MB
# mysql
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://10.170.155.148:4306/qc_ecr_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
spring.datasource.username=qc_ecr_system
spring.datasource.password=qc_ecr_system
#tomcat
server.tomcat.max-threads=600
server.tomcat.uri-encoding=UTF-8
server.tomcat.basedir=/home/logs/access
server.tomcat.accesslog.enabled=true
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c %{Referer}i %{User-Agent}i %{Host}i
# mybatis
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
mybatis.configuration.cache-enabled=true
mybatis.configuration.map-underscore-to-camel-case=true
# redis
spring.redis.password=xc0CdqWMzMj6hBvpIY5HrciHX85txmftyXukMnyKdK8X
spring.redis.timeout=20000
spring.redis.sentinel.master=paas-redis/yx-common-repl-1-test
spring.redis.sentinel.nodes=yx-cust23-test.ncr.cn-east-p1.internal:31461
spring.redis.pool.max-active=50
spring.redis.pool.max-idle=20
spring.redis.pool.max-wait=10000
spring.redis.host=yx-cust23-test.ncr.cn-east-p1.internal
spring.redis.port=31461
# supplier
supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas
### des\u914D\u7F6E
# \u5BFC\u51FA\u6587\u4EF6\u4E0A\u4F20\u5230\u54EA\u4E2A\u670D\u52A1\u5668\uFF0C\u6709test\u548Conline\u53EF\u9009
des.prop.env=test
\ No newline at end of file
yanxuan-qc-change-system-assembly/src/main/resources/config/regression/logback-spring.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="true" scan="true" scanPeriod="60 seconds">
<contextName>yanxuan-sc-ehc</contextName>
<include resource="logback-missa.xml"/>
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="log.productName" value="yanxuan-qc-change-system"/>
<property name="log.path" value="/home/logs"/>
<property name="log.path.holmes" value="/home/logs/holmes"/>
<property name="log.level" value="debug"/>
<property name="log.pattern"
value="{time=%d{yyyy-MM-dd HH:mm:ss.SSS}, traceId=%X{XTraceId}, level=%p} [%c{0}] %m%n"/>
<!-- custom coloring conversion -->
<conversionRule conversionWord="highlightex"
converterClass="com.netease.mail.yanxuan.qc.api.common.common.HighlightingCompositeConverterEx"/>
<!--appender-->
<appender name="query-internal" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${log.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/query.log.%d{yyyy-MM-dd}</fileNamePattern>
<maxHistory>90</maxHistory>
<!-- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
<!-- &lt;!&ndash; maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 &ndash;&gt;-->
<!-- <maxFileSize>500MB</maxFileSize>-->
<!-- </timeBasedFileNamingAndTriggeringPolicy>-->
</rollingPolicy>
</appender>
<appender name="query" class="ch.qos.logback.classic.AsyncAppender">
<queueSize>512</queueSize>
<discardingThreshold>0</discardingThreshold>
<includeCallerData>true</includeCallerData>
<appender-ref ref="query-internal"/>
</appender>
<appender name="stdout-internal"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${log.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/stdout.log.%d{yyyy-MM-dd}</fileNamePattern>
<maxHistory>14</maxHistory>
</rollingPolicy>
</appender>
<appender name="stdout" class="ch.qos.logback.classic.AsyncAppender">
<queueSize>512</queueSize>
<discardingThreshold>0</discardingThreshold>
<includeCallerData>true</includeCallerData>
<appender-ref ref="stdout-internal"/>
</appender>
<appender name="holmes-appender"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>%msg</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path.holmes}/${log.productName}/yanxuan.${log.productName}.%d{yyyy-MM-dd}.log
</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
</appender>
<appender name="rpc" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${log.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/rpc.log.%d{yyyy-MM-dd}</fileNamePattern>
<maxHistory>60</maxHistory>
</rollingPolicy>
</appender>
<appender name="task" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${log.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/task.log.%d{yyyy-MM-dd}
</fileNamePattern>
</rollingPolicy>
</appender>
<appender name="stderr"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${log.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/stderr.log.%d{yyyy-MM-dd}
</fileNamePattern>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 定时任务 -->
<appender name="dschedule"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%c{0}] %m%n</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/dschedule.log.%d{yyyy-MM-dd}.gz
</fileNamePattern>
</rollingPolicy>
</appender>
<logger name="com.netease.mail.yanxuan.change.integration" additivity="false" level="${log.level}">
<appender-ref ref="rpc"/>
<appender-ref ref="stderr"/>
</logger>
<logger name="com.netease.mail.yanxuan.change" additivity="false" level="${log.level}">
<appender-ref ref="query"/>
<appender-ref ref="stderr"/>
</logger>
<!-- 日志输出级别 -->
<root level="${log.level}">
<appender-ref ref="stdout"/>
<appender-ref ref="stderr"/>
</root>
</configuration>
yanxuan-qc-change-system-assembly/src/main/resources/config/regression/setenv.sh 0 → 100644
jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
jvm_opts_property="-Dspring.profiles.active=regression -Denv=regression -Dserver.port=8080"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
consul_service_tags=test
consul_service_port=8080
consul_health_url="/i/health"
consul_service_name="yanxuan-qc-change-system"
yanxuan-qc-change-system-assembly/src/main/resources/config/test/setenv.sh
jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
jvm_opts_property="-Dspring.profiles.active=test -Denv=test -Dserver.port=8080"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
consul_service_tags=test
consul_service_port=8080
consul_health_url="/i/health"
consul_service_name="yanxuan-sc-ehc"
consul_service_name="yanxuan-qc-change-system"
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
......@@ -1002,9 +1002,10 @@ public class ChangeFlowBiz {
if (StringUtils.isNotBlank(itemJsonStr)) {
List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class);
changeFlowVO.setChangeItems(itemList);
// 变更结果确认节点，展示变更商品基础信息
// 变更执行/结果确认/完结节点，展示变更商品基础信息
String flowNode = changeRecord.getFlowNode();
if (ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)
if (ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId().equals(flowNode)
|| ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)
|| ChangeFlowEnum.END.getNodeId().equals(flowNode)) {
List<Long> itemIds = itemList.stream().map(ItemVO::getItemId).collect(Collectors.toList());
// 批量查询spu信息
......@@ -1110,7 +1111,8 @@ public class ChangeFlowBiz {
}
changeFlowVO.setChangeCommanderView(commander.get(0).getUserName() + "(" + orgName + ")");
}
if (!CollectionUtils.isEmpty(creator)) {
// 非同舟端展示人名及三级部门名称
if (!CreateSourceEnum.TONG_ZHOU.getType().equals(changeRecord.getCreateSource()) && !CollectionUtils.isEmpty(creator)) {
Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
String orgName = "无三级部门";
if (anyOrg.isPresent()) {
......@@ -1118,6 +1120,10 @@ public class ChangeFlowBiz {
}
changeFlowVO.setChangeCreatorView(creator.get(0).getUserName() + "(" + orgName + ")");
}
// 同舟端发起变更，发起人展示供应商id
if (CreateSourceEnum.TONG_ZHOU.getType().equals(changeRecord.getCreateSource())) {
changeFlowVO.setChangeCreatorView(changeRecord.getCreateSupplier());
}
} catch (Exception ex) {
log.error("add org has ex", ex);
}
......
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-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSendService.java
......@@ -45,12 +45,6 @@ public interface FlowRpcSupplierSendService {
AjaxResult<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestBody SupplierSearchRemoteReq req);
/**
* 查询供应商+商品对应的跟进采购 ?有存疑参数不对
*/
@PostMapping("/api/initiateProject/source/batchGetRelatedSupplier.json")
String batchGetRelatedSupplier(@RequestBody List<Integer> req);
/**
* 跟进供应商ID 互殴去供应商的商品
* @return
*/
......
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