Skip to content

Y
yanxuan-qc-change-system
Commit f8d93fb2 by jx-art
Options

Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

parents d9054389 c144fe8c
Showing with 31 additions and 217 deletions
yanxuan-qc-change-system-assembly/src/main/resources/config/test/logback-spring.xml
...@@ -86,28 +86,6 @@ ...@@ -86,28 +86,6 @@
</rollingPolicy> </rollingPolicy>
</appender> </appender>
<!-- <appender name="admin" 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}/admin.log.%d{yyyy-MM-dd}-->
<!-- </fileNamePattern>-->
<!-- </rollingPolicy>-->
<!-- </appender>-->
<!-- <appender name="core" 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}/core.log.%d{yyyy-MM-dd}-->
<!-- </fileNamePattern>-->
<!-- </rollingPolicy>-->
<!-- </appender>-->
<appender name="stderr" <appender name="stderr"
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <encoder>
...@@ -125,137 +103,29 @@ ...@@ -125,137 +103,29 @@
</filter> </filter>
</appender> </appender>
<!-- <logger name="com.netease.mail.yanxuan.ehc.admin" additivity="false" level="${log.level}">--> <!-- 定时任务 -->
<!-- <appender-ref ref="admin"/>--> <appender name="dschedule"
<!-- </logger>-->
<!-- <logger name="com.netease.mail.yanxuan.ehc.core" additivity="false" level="${log.level}">-->
<!-- <appender-ref ref="core"/>-->
<!-- </logger>-->
<appender name="HELIOS-COMMON-APPENDER"
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}/${log.productName}/helios-common.log.%d{yyyy-MM-dd}.gz
</fileNamePattern>
</rollingPolicy>
</appender>
<appender name="HELIOS-STATS-APPENDER"
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%c{0}] %m%n</pattern> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%c{0}] %m%n</pattern>
<charset>UTF-8</charset> <charset>UTF-8</charset>
</encoder> </encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/helios-stats.log.%d{yyyy-MM-dd}.gz <fileNamePattern>${log.path}/dschedule.log.%d{yyyy-MM-dd}.gz
</fileNamePattern> </fileNamePattern>
</rollingPolicy> </rollingPolicy>
</appender> </appender>
<appender name="HELIOS-PROFILER-APPENDER" <logger name="com.netease.mail.yanxuan.change.integration" additivity="false" level="info">
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}/${log.productName}/helios-profile.log.%d{yyyy-MM-dd}.gz
</fileNamePattern>
</rollingPolicy>
</appender>
<appender name="HELIOS-SCHEDULE-JOB"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%t] [%c{0}] [%X{PtxId}] %m%n</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
<fileNamePattern>${log.path}/${log.productName}/helios-schedule.log.%d{yyyy-MM-dd}-%i.gz
</fileNamePattern>
<!-- each file should be at most 30MB, keep 60 days worth of history, but at most 2GB -->
<maxFileSize>30MB</maxFileSize>
<maxHistory>60</maxHistory>
<totalSizeCap>2GB</totalSizeCap>
</rollingPolicy>
</appender>
<appender name="helios-biz-appender"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<charset>UTF-8</charset>
<pattern>%msg</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/${log.productName}/biz.helios.log.%d{yyyy-MM-dd}.gz
</fileNamePattern>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
<maxHistory>21</maxHistory>
</rollingPolicy>
</appender>
<appender name="async-helios-biz-appender"
class="ch.qos.logback.classic.AsyncAppender">
<queueSize>1024</queueSize>
<appender-ref ref="helios-biz-appender"/>
</appender>
<logger name="helios-biz-logger" additivity="false" level="${log.level}">
<appender-ref ref="async-helios-biz-appender"/>
</logger>
<appender name="ASYNC-HELIOS-SCHEDULE-JOB"
class="ch.qos.logback.classic.AsyncAppender">
<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
<queueSize>512</queueSize>
<appender-ref ref="HELIOS-SCHEDULE-JOB"/>
</appender>
<logger name="HELIOS_SCHEDULE" additivity="false" level="info">
<appender-ref ref="ASYNC-HELIOS-SCHEDULE-JOB"/>
</logger>
<logger name="HELIOS_COMMON" level="${log.level}" additivity="false">
<appender-ref ref="HELIOS-COMMON-APPENDER"/>
</logger>
<logger name="HELIOS_STATS" level="${log.level}"
additivity="false">
<appender-ref ref="HELIOS-STATS-APPENDER"/>
</logger>
<logger name="HELIOS_PROFILER" level="${log.level}"
additivity="false">
<appender-ref ref="HELIOS-PROFILER-APPENDER"/>
</logger>
<logger name="net.sf.ehcache.pool.impl.DefaultSizeOfEngine" level="error"/>
<logger name="net.sf.ehcache.pool.sizeof.ObjectGraphWalker" level="error"/>
<logger name="com.netease.mail.yanxuan.ehc.core.meta.bean.rpc" additivity="false" level="info">
<appender-ref ref="rpc"/> <appender-ref ref="rpc"/>
<appender-ref ref="stderr"/> <appender-ref ref="stderr"/>
</logger> </logger>
<logger name="com.netease.mail.yanxuan.ehc.admin.task" additivity="false" level="info"> <logger name="com.netease.mail.yanxuan.change" additivity="false" level="${log.level}">
<appender-ref ref="task"/>
<appender-ref ref="stderr"/>
</logger>
<logger name="com.netease" additivity="false" level="${log.level}">
<appender-ref ref="query"/> <appender-ref ref="query"/>
<appender-ref ref="stderr"/> <appender-ref ref="stderr"/>
</logger> </logger>
<logger name="holmes-logger" level="info">
<appender-ref ref="holmes-appender"/>
</logger>
<!-- 日志输出级别 --> <!-- 日志输出级别 -->
<root level="${log.level}"> <root level="${log.level}">
<appender-ref ref="stdout"/> <appender-ref ref="stdout"/>
......
yanxuan-qc-change-system-assembly/src/main/resources/logback-spring.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false" scan="true" scanPeriod="60 seconds">
<contextName>yanxuan-qc-change-system</contextName>
<!--引入missa-->
<springProfile name="!dev">
<include resource="logback-missa.xml"/>
</springProfile>
<!-- 获取application配置文件中的配置 -->
<springProperty scope="context" name="log.level"
source="log.level"/>
<springProperty scope="context" name="log.path"
source="log.path"/>
<springProperty scope="context" name="log.maxHistory"
source="log.maxHistory"/>
<springProperty scope="context" name="log.maxSize"
source="log.maxSize"/>
<!--日志平台应用日志标准格式-->
<property name="patternValue"
value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%X{XTraceId}] %m%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${patternValue}</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<!--默认日志输出 -->
<appender name="default" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/default.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/default.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxHistory>${log.maxHistory}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${log.maxSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>${patternValue}</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<!--默认异步日志输出 -->
<appender name="default_ASYNC" class="ch.qos.logback.classic.AsyncAppender">
<!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
<discardingThreshold>0</discardingThreshold>
<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
<queueSize>512</queueSize>
<!-- 提取调用者数据 -->
<includeCallerData>true</includeCallerData>
<!-- 添加附加的appender,最多只能添加一个 -->
<appender-ref ref="default"/>
</appender>
<root level="${log.level}">
<appender-ref ref="console"/>
<appender-ref ref="default_ASYNC"/>
</root>
</configuration>
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
...@@ -111,10 +111,10 @@ public class ChangeFlowBiz { ...@@ -111,10 +111,10 @@ public class ChangeFlowBiz {
AjaxResponse<FlowDataDTO> flowDetailResponse = flowRpcService.getDetail(CommonConstants.FLOWX_PRODUCT, flowId); AjaxResponse<FlowDataDTO> flowDetailResponse = flowRpcService.getDetail(CommonConstants.FLOWX_PRODUCT, flowId);
if (ResponseCodeEnum.SUCCESS.getCode() == flowDetailResponse.getCode()) { if (ResponseCodeEnum.SUCCESS.getCode() == flowDetailResponse.getCode()) {
flowDataDTO = flowDetailResponse.getData(); flowDataDTO = flowDetailResponse.getData();
log.info("[createAndSubmitFlow] flowDataDTO={}", JSON.toJSONString(flowDataDTO)); log.info("[detailFlow] flowDataDTO={}", JSON.toJSONString(flowDataDTO));
} else { } else {
log.error("[createAndSubmitFlow] get flow detail failed, query={}, errMsg={}", JSON.toJSONString(flowId), log.error("[detailFlow] get flow detail failed, query={}, errMsg={}", JSON.toJSONString(flowId),
flowDetailResponse.getErrorMsg()); JSON.toJSONString(flowDetailResponse));
throw ExceptionFactory.createBiz(ResponseCode.DETAIL_FLOW_ERROR, flowDetailResponse.getErrorMsg()); throw ExceptionFactory.createBiz(ResponseCode.DETAIL_FLOW_ERROR, flowDetailResponse.getErrorMsg());
} }
return flowDataDTO; return flowDataDTO;
...@@ -147,10 +147,10 @@ public class ChangeFlowBiz { ...@@ -147,10 +147,10 @@ public class ChangeFlowBiz {
AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT, nodeSubmitReqDTO); AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT, nodeSubmitReqDTO);
if (ResponseCodeEnum.SUCCESS.getCode() == submitResponse.getCode()) { if (ResponseCodeEnum.SUCCESS.getCode() == submitResponse.getCode()) {
nextNodeIdList = submitResponse.getData(); nextNodeIdList = submitResponse.getData();
log.info("[createAndSubmitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList)); log.info("[submitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList));
} else { } else {
log.error("[createAndSubmitFlow] submit flow failed, query={}, errMsg={}", JSON.toJSONString(flowId), log.error("[submitFlow] submit flow failed, query={}, errMsg={}", JSON.toJSONString(flowId),
submitResponse.getErrorMsg()); JSON.toJSONString(submitResponse));
throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, submitResponse.getErrorMsg()); throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, submitResponse.getErrorMsg());
} }
return nextNodeIdList; return nextNodeIdList;
...@@ -158,15 +158,15 @@ public class ChangeFlowBiz { ...@@ -158,15 +158,15 @@ public class ChangeFlowBiz {
private String createFlow(FlowCreateReqDTO flowCreateReqDTO) { private String createFlow(FlowCreateReqDTO flowCreateReqDTO) {
// 先创建工单，创建完成后直接提交 // 先创建工单，创建完成后直接提交
log.info("[createAndSubmitFlow] flowCreateReqDTO={}", flowCreateReqDTO); log.info("[createFlow] flowCreateReqDTO={}", flowCreateReqDTO);
AjaxResponse<String> flowCreateResponse = flowRpcService.create(CommonConstants.FLOWX_PRODUCT, flowCreateReqDTO); AjaxResponse<String> flowCreateResponse = flowRpcService.create(CommonConstants.FLOWX_PRODUCT, flowCreateReqDTO);
String flowId; String flowId;
if (ResponseCodeEnum.SUCCESS.getCode() == flowCreateResponse.getCode()) { if (ResponseCodeEnum.SUCCESS.getCode() == flowCreateResponse.getCode()) {
flowId = flowCreateResponse.getData(); flowId = flowCreateResponse.getData();
log.info("[createAndSubmitFlow] flowId ={}", JSON.toJSONString(flowId)); log.info("[createFlow] flowId ={}", JSON.toJSONString(flowId));
} else { } else {
log.error("[createAndSubmitFlow] create flow failed, query={}, errMsg={}", JSON.toJSONString(flowCreateReqDTO), log.error("[createFlow] create flow failed, query={}, errMsg={}", JSON.toJSONString(flowCreateReqDTO),
flowCreateResponse.getErrorMsg()); JSON.toJSONString(flowCreateResponse));
throw ExceptionFactory.createBiz(ResponseCode.CREATE_FLOW_ERROR, flowCreateResponse.getErrorMsg()); throw ExceptionFactory.createBiz(ResponseCode.CREATE_FLOW_ERROR, flowCreateResponse.getErrorMsg());
} }
return flowId; return flowId;
...@@ -190,6 +190,7 @@ public class ChangeFlowBiz { ...@@ -190,6 +190,7 @@ public class ChangeFlowBiz {
changeRecord.setChangeSupplier(changeFlowCreateReq.getChangeSupplier()); changeRecord.setChangeSupplier(changeFlowCreateReq.getChangeSupplier());
changeRecord.setChangeReason(changeFlowCreateReq.getChangeReason()); changeRecord.setChangeReason(changeFlowCreateReq.getChangeReason());
changeRecord.setChangeContent(changeFlowCreateReq.getChangeContent()); changeRecord.setChangeContent(changeFlowCreateReq.getChangeContent());
changeRecord.setChangeChecking("");
changeRecord.setChangeRiskDesc(changeFlowCreateReq.getChangeRiskDesc()); changeRecord.setChangeRiskDesc(changeFlowCreateReq.getChangeRiskDesc());
changeRecord.setChangeProfit(changeFlowCreateReq.getChangeProfit()); changeRecord.setChangeProfit(changeFlowCreateReq.getChangeProfit());
changeRecord.setChangeProfitDesc(changeFlowCreateReq.getChangeProfitDesc()); changeRecord.setChangeProfitDesc(changeFlowCreateReq.getChangeProfitDesc());
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeFlowEnum.java
...@@ -14,12 +14,11 @@ import lombok.Getter; ...@@ -14,12 +14,11 @@ import lombok.Getter;
*/ */
public enum ChangeFlowEnum { public enum ChangeFlowEnum {
CHANGE_FLOW_START("79560500", "开始节点", "yanxuan-qc-change-flow"), CHANGE_FLOW_START("79560500", "开始节点", "qc-change-flow"),
CHANGE_FLOW_SUBMIT("79560501", "发起变更", "yanxuan-qc-change-flow"), CHANGE_FLOW_SUBMIT("79560501", "变更申请提交", "qc-change-flow"),
CHANGE_FLOW_EXE("79560502","变更执行", "yanxuan-qc-change-flow"), CHANGE_FLOW_EXE("79560502","变更执行", "qc-change-flow"),
CHANGE_FLOW_CONFIRM("79560503","变更结果确认", "yanxuan-qc-change-flow"), CHANGE_FLOW_CONFIRM("79560503","变更结果确认", "qc-change-flow"),
CHANGE_FLOW_CHANGE_SUBMIT("79560504","变更申请提交", "yanxuan-qc-change-flow"), END("9999", "结束", "qc-change-flow");
END("9999", "结束", "yanxuan-qc-change-flow");
@Getter @Getter
private final String nodeId; private final String nodeId;
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeRecord.java
...@@ -103,6 +103,11 @@ public class ChangeRecord { ...@@ -103,6 +103,11 @@ public class ChangeRecord {
private String changeRiskDesc; private String changeRiskDesc;
/** /**
* 变更验证措施
*/
private String changeChecking;
/**
* 变更收益类型 * 变更收益类型
*/ */
private Integer changeProfit; private Integer changeProfit;
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
...@@ -91,6 +91,11 @@ public class ChangeFlowCreateReq { ...@@ -91,6 +91,11 @@ public class ChangeFlowCreateReq {
private String changeRiskDesc; private String changeRiskDesc;
/** /**
* 变更验证措施
*/
private String changeChecking;
/**
* 变更收益类型 * 变更收益类型
*/ */
@NotNull(message = "变更收益类型不能为空") @NotNull(message = "变更收益类型不能为空")
......
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