end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加环境变量

master
陈裕财 3 years ago
parent
69d93c4b1a
commit
d000f1a1c6
4 changed files with 31 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      xm-core/src/main/java/com/xm/core/entity/XmTestCasedb.java
  2. 11
      xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
  3. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml
  4. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml

5
xm-core/src/main/java/com/xm/core/entity/XmTestCasedb.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTestCasedb所有属性名: <br> * 实体 XmTestCasedb所有属性名: <br>
* "id","主键","name","用例库名称","cuserid","创建人","cusername","创建人姓名","ctime","创建日期","cbranchId","归属机构编号","productId","产品编号","productName","产品名称","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","testPlans","测试计划数","menus","需求数目","funcs","功能模块数","status","状态0初始，1-启用，2关闭","budgetWorkload","预算工时","actWorkload","实际工时","pbranchId","产品归属企业";<br>
* "id","主键","name","用例库名称","cuserid","创建人","cusername","创建人姓名","ctime","创建日期","cbranchId","归属机构编号","productId","产品编号","productName","产品名称","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","testPlans","测试计划数","menus","需求数目","funcs","功能模块数","status","状态0初始，1-启用，2关闭","budgetWorkload","预算工时","actWorkload","实际工时","pbranchId","产品归属企业","envJson","环境变量列表";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -95,6 +95,9 @@ public class XmTestCasedb implements java.io.Serializable {
@ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="")
String pbranchId; String pbranchId;
@ApiModelProperty(notes="环境变量列表",allowEmptyValue=true,example="",allowableValues="")
String envJson;
/** /**
*主键 *主键
**/ **/

11
xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTestPlan所有属性名: <br> * 实体 XmTestPlan所有属性名: <br>
* "id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","toTestCases","未测用例数","pbranchId","产品归属企业","ptype","计划类型0-普通测试，2-迭代测试，1-发布测试，";<br>
* "id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","toTestCases","未测用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","pbranchId","产品归属企业","ptype","计划类型0-普通测试，2-迭代测试，1-发布测试，","envJson","环境变量列表";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -74,6 +74,9 @@ public class XmTestPlan implements java.io.Serializable {
@ApiModelProperty(notes="阻塞用例数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="阻塞用例数",allowEmptyValue=true,example="",allowableValues="")
Integer blCases; Integer blCases;
@ApiModelProperty(notes="未测用例数",allowEmptyValue=true,example="",allowableValues="")
Integer toTestCases;
@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
String productId; String productId;
@ -116,15 +119,15 @@ public class XmTestPlan implements java.io.Serializable {
@ApiModelProperty(notes="创建机构编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="创建机构编号",allowEmptyValue=true,example="",allowableValues="")
String cbranchId; String cbranchId;
@ApiModelProperty(notes="未测用例数",allowEmptyValue=true,example="",allowableValues="")
Integer toTestCases;
@ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="")
String pbranchId; String pbranchId;
@ApiModelProperty(notes="计划类型0-普通测试，2-迭代测试，1-发布测试，",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="计划类型0-普通测试，2-迭代测试，1-发布测试，",allowEmptyValue=true,example="",allowableValues="")
String ptype; String ptype;
@ApiModelProperty(notes="环境变量列表",allowEmptyValue=true,example="",allowableValues="")
String envJson;
/** /**
*测试计划编号 *测试计划编号
**/ **/

12
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml
View File

@ -67,7 +67,7 @@
insert into xm_test_casedb( insert into xm_test_casedb(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{productId},#{productName},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{testPlans},#{menus},#{funcs},#{status},#{budgetWorkload},#{actWorkload},#{pbranchId}
#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{productId},#{productName},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{testPlans},#{menus},#{funcs},#{status},#{budgetWorkload},#{actWorkload},#{pbranchId},#{envJson}
) )
</insert> </insert>
@ -142,7 +142,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,name,cuserid,cusername,ctime,cbranch_id,product_id,product_name,total_cases,ok_cases,err_cases,ig_cases,bl_cases,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,test_plans,menus,funcs,status,budget_workload,act_workload,pbranch_id
id,name,cuserid,cusername,ctime,cbranch_id,product_id,product_name,total_cases,ok_cases,err_cases,ig_cases,bl_cases,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,test_plans,menus,funcs,status,budget_workload,act_workload,pbranch_id,env_json
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -172,6 +172,7 @@
<if test="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if> <if test="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if> <if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="pbranchId != null and pbranchId != ''"> and res.pbranch_id = #{pbranchId} </if> <if test="pbranchId != null and pbranchId != ''"> and res.pbranch_id = #{pbranchId} </if>
<if test="envJson != null and envJson != ''"> and res.env_json = #{envJson} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -198,7 +199,8 @@
status = #{status}, status = #{status},
budget_workload = #{budgetWorkload}, budget_workload = #{budgetWorkload},
act_workload = #{actWorkload}, act_workload = #{actWorkload},
pbranch_id = #{pbranchId}
pbranch_id = #{pbranchId},
env_json = #{envJson}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
@ -225,6 +227,7 @@
<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if> <if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if>
<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if> <if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if>
<if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId}, </if> <if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId}, </if>
<if test="envJson != null and envJson != ''"> env_json = #{envJson}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -251,6 +254,7 @@
status = #{item.status}, status = #{item.status},
budget_workload = #{item.budgetWorkload}, budget_workload = #{item.budgetWorkload},
act_workload = #{item.actWorkload}, act_workload = #{item.actWorkload},
pbranch_id = #{item.pbranchId}
pbranch_id = #{item.pbranchId},
env_json = #{item.envJson}
</sql> </sql>
</mapper> </mapper>

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml
View File

@ -132,7 +132,7 @@
insert into xm_test_plan( insert into xm_test_plan(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{toTestCases},#{pbranchId},#{ptype}
#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{toTestCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{pbranchId},#{ptype},#{envJson}
) )
</insert> </insert>
@ -207,7 +207,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark,cbranch_id,to_test_cases,pbranch_id,ptype
id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,to_test_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark,cbranch_id,pbranch_id,ptype,env_json
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -230,6 +230,7 @@
<if test="errCases != null and errCases != ''"> and res.err_cases = #{errCases} </if> <if test="errCases != null and errCases != ''"> and res.err_cases = #{errCases} </if>
<if test="igCases != null and igCases != ''"> and res.ig_cases = #{igCases} </if> <if test="igCases != null and igCases != ''"> and res.ig_cases = #{igCases} </if>
<if test="blCases != null and blCases != ''"> and res.bl_cases = #{blCases} </if> <if test="blCases != null and blCases != ''"> and res.bl_cases = #{blCases} </if>
<if test="toTestCases != null and toTestCases != ''"> and res.to_test_cases = #{toTestCases} </if>
<if test="productId != null and productId != ''"> and res.product_id = #{productId} </if> <if test="productId != null and productId != ''"> and res.product_id = #{productId} </if>
<if test="productName != null and productName != ''"> and res.product_name = #{productName} </if> <if test="productName != null and productName != ''"> and res.product_name = #{productName} </if>
<if test="flowState != null and flowState != ''"> and res.flow_state = #{flowState} </if> <if test="flowState != null and flowState != ''"> and res.flow_state = #{flowState} </if>
@ -244,9 +245,9 @@
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if> <if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="summaryRemark != null and summaryRemark != ''"> and res.summary_remark = #{summaryRemark} </if> <if test="summaryRemark != null and summaryRemark != ''"> and res.summary_remark = #{summaryRemark} </if>
<if test="cbranchId != null and cbranchId != ''"> and res.cbranch_id = #{cbranchId} </if> <if test="cbranchId != null and cbranchId != ''"> and res.cbranch_id = #{cbranchId} </if>
<if test="toTestCases != null and toTestCases != ''"> and res.to_test_cases = #{toTestCases} </if>
<if test="pbranchId != null and pbranchId != ''"> and res.pbranch_id = #{pbranchId} </if> <if test="pbranchId != null and pbranchId != ''"> and res.pbranch_id = #{pbranchId} </if>
<if test="ptype != null and ptype != ''"> and res.ptype = #{ptype} </if> <if test="ptype != null and ptype != ''"> and res.ptype = #{ptype} </if>
<if test="envJson != null and envJson != ''"> and res.env_json = #{envJson} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -267,6 +268,7 @@
err_cases = #{errCases}, err_cases = #{errCases},
ig_cases = #{igCases}, ig_cases = #{igCases},
bl_cases = #{blCases}, bl_cases = #{blCases},
to_test_cases = #{toTestCases},
product_id = #{productId}, product_id = #{productId},
product_name = #{productName}, product_name = #{productName},
flow_state = #{flowState}, flow_state = #{flowState},
@ -281,9 +283,9 @@
act_workload = #{actWorkload}, act_workload = #{actWorkload},
summary_remark = #{summaryRemark}, summary_remark = #{summaryRemark},
cbranch_id = #{cbranchId}, cbranch_id = #{cbranchId},
to_test_cases = #{toTestCases},
pbranch_id = #{pbranchId}, pbranch_id = #{pbranchId},
ptype = #{ptype}
ptype = #{ptype},
env_json = #{envJson}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
@ -303,6 +305,7 @@
<if test="errCases != null and errCases != ''"> err_cases = #{errCases}, </if> <if test="errCases != null and errCases != ''"> err_cases = #{errCases}, </if>
<if test="igCases != null and igCases != ''"> ig_cases = #{igCases}, </if> <if test="igCases != null and igCases != ''"> ig_cases = #{igCases}, </if>
<if test="blCases != null and blCases != ''"> bl_cases = #{blCases}, </if> <if test="blCases != null and blCases != ''"> bl_cases = #{blCases}, </if>
<if test="toTestCases != null and toTestCases != ''"> to_test_cases = #{toTestCases}, </if>
<if test="productId != null and productId != ''"> product_id = #{productId}, </if> <if test="productId != null and productId != ''"> product_id = #{productId}, </if>
<if test="productName != null and productName != ''"> product_name = #{productName}, </if> <if test="productName != null and productName != ''"> product_name = #{productName}, </if>
<if test="flowState != null and flowState != ''"> flow_state = #{flowState}, </if> <if test="flowState != null and flowState != ''"> flow_state = #{flowState}, </if>
@ -317,9 +320,9 @@
<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if> <if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if>
<if test="summaryRemark != null and summaryRemark != ''"> summary_remark = #{summaryRemark}, </if> <if test="summaryRemark != null and summaryRemark != ''"> summary_remark = #{summaryRemark}, </if>
<if test="cbranchId != null and cbranchId != ''"> cbranch_id = #{cbranchId}, </if> <if test="cbranchId != null and cbranchId != ''"> cbranch_id = #{cbranchId}, </if>
<if test="toTestCases != null and toTestCases != ''"> to_test_cases = #{toTestCases}, </if>
<if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId}, </if> <if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId}, </if>
<if test="ptype != null and ptype != ''"> ptype = #{ptype}, </if> <if test="ptype != null and ptype != ''"> ptype = #{ptype}, </if>
<if test="envJson != null and envJson != ''"> env_json = #{envJson}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -340,6 +343,7 @@
err_cases = #{item.errCases}, err_cases = #{item.errCases},
ig_cases = #{item.igCases}, ig_cases = #{item.igCases},
bl_cases = #{item.blCases}, bl_cases = #{item.blCases},
to_test_cases = #{item.toTestCases},
product_id = #{item.productId}, product_id = #{item.productId},
product_name = #{item.productName}, product_name = #{item.productName},
flow_state = #{item.flowState}, flow_state = #{item.flowState},
@ -354,8 +358,8 @@
act_workload = #{item.actWorkload}, act_workload = #{item.actWorkload},
summary_remark = #{item.summaryRemark}, summary_remark = #{item.summaryRemark},
cbranch_id = #{item.cbranchId}, cbranch_id = #{item.cbranchId},
to_test_cases = #{item.toTestCases},
pbranch_id = #{item.pbranchId}, pbranch_id = #{item.pbranchId},
ptype = #{item.ptype}
ptype = #{item.ptype},
env_json = #{item.envJson}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save