Skip to content

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

add: 数据库，redis配置

parent 388efcf1
Showing with 271 additions and 22 deletions
yanxuan-qc-change-system-biz/src/main/resources/applicationContext.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
<!-- scan dschedule config package -->
<!-- <context:component-scan base-package="com.netease.mail.yanxuan.dschedule.core.config">-->
<!-- </context:component-scan>-->
<!-- dschedule执行器 -->
<!-- <bean id="dscheduleExecutor"-->
<!-- class="com.netease.mail.yanxuan.dschedule.core.executor.DscheduleExecutor"-->
<!-- init-method="start" destroy-method="destroy"/>-->
</beans>
\ No newline at end of file
yanxuan-qc-change-system-biz/src/main/resources/config/online/application.properties
......@@ -9,9 +9,38 @@ dschedule.adminAddresses=http://10.200.169.73:8080,http://10.200.169.74:8080,htt
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.130.72.182:4306/hd_qc_ecr?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
spring.datasource.username=hd_qc_ecr
spring.datasource.password=hd_qc_ecr
spring.datasource.tomcat.time-between-eviction-runs-millis=180000
spring.datasource.tomcat.max-active=50
spring.datasource.tomcat.max-idle=10
spring.datasource.tomcat.max-wait=10000
spring.datasource.tomcat.remove-abandoned=true
spring.datasource.tomcat.remove-abandoned-timeout=10
spring.datasource.tomcat.validation-query=select 1
spring.datasource.tomcat.num-tests-per-eviction-run=10
spring.datasource.tomcat.min-evictable-idle-time-millis=300000
spring.datasource.tomcat.log-abandoned=true
mybatis.mapperLocations=classpath*:/mapper/*.xml
mapper.style=normal
mapper.enum-as-simple-type=true
# mybatis
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
mybatis.configuration.cache-enabled=true
# redis
spring.redis.password=BC6AYgWOXuJetuJG
spring.redis.timeout=20000
spring.redis.sentinel.master=paas-redis/yx-sc-ehc-onl
spring.redis.sentinel.nodes=yx-cust23-online.ncr.cn-east-p1.internal.:32427
spring.redis.pool.max-active=50
spring.redis.pool.max-idle=20
spring.redis.pool.max-wait=10000
spring.redis.host=yx-cust23-online.ncr.cn-east-p1.internal.
spring.redis.port=32427
yanxuan-qc-change-system-biz/src/main/resources/config/test/application.properties
......@@ -9,7 +9,34 @@ dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.servic
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
spring.datasource.tomcat.time-between-eviction-runs-millis=180000
spring.datasource.tomcat.max-active=50
spring.datasource.tomcat.max-idle=10
spring.datasource.tomcat.max-wait=10000
spring.datasource.tomcat.remove-abandoned=true
spring.datasource.tomcat.remove-abandoned-timeout=10
spring.datasource.tomcat.validation-query=select 1
spring.datasource.tomcat.num-tests-per-eviction-run=10
spring.datasource.tomcat.min-evictable-idle-time-millis=300000
spring.datasource.tomcat.log-abandoned=true
# mybatis
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
mybatis.configuration.cache-enabled=true
\ No newline at end of file
mybatis.configuration.cache-enabled=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
\ No newline at end of file
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/FileTypeEnum.java 0 → 100644
/**
* @(#)FileTypeEnum.java, 2022/11/14.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.common.enums;
/**
* @Author zcwang
* @Date 2022/11/14
*/
public enum FileTypeEnum {
IMAGE(1, "基础信息图片"),
VIDEO(2, "供应商变更"),
NORMAL_INFO(3, "基础信息资料"),
CHANGE_RESULT_INFO(4, "变更结果资料");
private Integer type;
private String desc;
FileTypeEnum(Integer type, String desc) {
this.type = type;
this.desc = desc;
}
public Integer getType() {
return type;
}
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeExecProject.java 0 → 100644
/**
* @(#)ChangeExecProject.java, 2022/11/14.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.dal.meta.model.req;
import lombok.Data;
/**
* @Author zcwang
* @Date 2022/11/14
*/
@Data
public class ChangeExecProject {
/**
* 变更类型配置记录id
*/
private Long changeTemplateId;
/**
* 变更执行部门名
*/
private String changeExecDepartment;
/**
* 变更行动人类型
*/
private Integer changeExecUserType;
/**
* 变更行动人（不同类型存储不同内容）
*/
private String changeExecUser;
/**
* 变更风险描述
*/
private String changeRiskDesc;
/**
* 行动项
*/
private String changeExecProject;
/**
* 变更验证措施
*/
private String changeChecking;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowFile.java 0 → 100644
/**
* @(#)ChangeFlowFile.java, 2022/11/14.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.dal.meta.model.req;
import lombok.Data;
/**
* @Author zcwang
* @Date 2022/11/14
*/
@Data
public class ChangeFlowFile {
/**
* 文件名
*/
private String fileName;
/**
* 文件链接
*/
private String fileUrl;
/**
* 文件类型（基础信息图片/基础信息视频/基础信息资料/变更结果资料）
* @see com.netease.mail.yanxuan.change.common.enums.FileTypeEnum
*/
private Integer fileType;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowReq.java 0 → 100644
/**
* @(#)ChangeFlowReq.java, 2022/11/14.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.dal.meta.model.req;
import java.util.List;
import lombok.Data;
/**
* @Author zcwang
* @Date 2022/11/14
*/
@Data
public class ChangeFlowReq {
/**
* 工单id
*/
private long flowId;
/**
* 一级类型id
*/
private int parentChangeClassId;
/**
* 二级类型id
*/
private int sonChangeClassId;
/**
* 变更商品
*/
private String changeItems;
/**
* 变更供应商
*/
private String changeSupplier;
/**
* 变更原因
*/
private String changeReason;
/**
* 变更内容
*/
private String changeContent;
/**
* 变更工单附件
*/
private List<ChangeFlowFile> files;
/**
* 变更潜在风险
*/
private String changeRiskDesc;
/**
* 变更验证措施
*/
private String changeChecking;
/**
* 变更收益类型
*/
private String changeProfit;
/**
* 变更收益说明
*/
private String changeProfitDesc;
/**
* 变更结果确认时间，时间戳
*/
private long changeConfirmResultTime;
/**
* 变更行动项
*/
private List<ChangeExecProject> changeExecProjectList;
/**
* 变更结论
*/
private Long changeResult;
/**
* 原因说明（取消时存在）
*/
private String changeResultDesc;
/**
* 备注
*/
private String remark;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.java
......@@ -8,6 +8,9 @@ package com.netease.mail.yanxuan.change.dal.meta.model.vo;
import java.util.List;
import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
import lombok.Builder;
import lombok.Data;
......@@ -28,7 +31,7 @@ public class ChangeFlowVO {
private Long flowId;
/**
* 变更主体
* com.netease.mail.yanxuan.change.biz.meta.enums.ChangeSubjectEnum
* @see ChangeSubjectEnum
*/
private Integer changeSubject;
/**
......@@ -53,7 +56,7 @@ public class ChangeFlowVO {
private String supplier;
/**
* 变更状态
* com.netease.mail.yanxuan.change.biz.meta.enums.ChangeStatusEnum
* @see ChangeStatusEnum
*/
private Integer changeState;
/**
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java
......@@ -9,12 +9,14 @@ package com.netease.mail.yanxuan.change.web.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
import com.netease.mail.yanxuan.change.biz.meta.AjaxResult;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowReq;
/**
* @Author zcwang
......@@ -69,7 +71,8 @@ public class ChangeFlowController {
* @return
*/
@PostMapping("/submit")
public AjaxResult<Boolean> submit() {
public AjaxResult<Boolean> submit(@RequestBody ChangeFlowReq changeFlowReq) {
return AjaxResult.success();
}
......
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