zhc077
/
projectManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
YTD 2 years ago
parent c119398f54 a6715ab942
commit efe6d3134c
8 changed files with 91 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
  2. 28
      ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue
  3. 22
      ant-design-vue-jeecg/src/views/tablex/TablexList.vue
  4. 40
      ant-design-vue-jeecg/src/views/tablex/modules/TablexForm.vue
  5. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java
  6. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java
  7. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
  8. 10
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/entity/Tablex.java

2
ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
Unescape View File

@ -125,7 +125,7 @@
{
title:'对应实体id',
align:"center",
dataIndex: 'tableId'
dataIndex: 'tableId_dictText'
},
{
title:'中文名称',

28
ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue
Unescape View File

@ -4,8 +4,8 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="对应实体id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableId">
<a-input v-model="model.tableId" placeholder="请输入对应实体id" ></a-input>
<a-form-model-item label="对应实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableId">
<j-search-select-tag v-model="model.tableId" dict="tablex,table_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -50,12 +50,12 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="关联实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateTable">
<a-input v-model="model.associateTable" placeholder="请输入关联实体" ></a-input>
<j-search-select-tag v-model="model.associateTable" dict="tablex,table_name,id" ></j-search-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateField">
<a-input v-model="model.associateField" placeholder="请输入关联字段" ></a-input>
<j-search-select-tag v-model="model.associateField" placeholder="请输入关联字段" dict="fieldx,field_name,id"></j-search-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -75,19 +75,19 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="字段状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<j-search-select-tag v-model="model.status" placeholder="请输入字段状态" dict="yn" style="width: 100%" />
<j-search-select-tag v-model="model.status" placeholder="请输入字段状态" dict="a_status" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="版本状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verisonStatus">
<j-search-select-tag v-model="model.verisonStatus" placeholder="请输入版本状态" dict="yn" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="版本号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verison">
<a-input-number v-model="model.verison" placeholder="请输入版本号" style="width: 100%" />
<j-search-select-tag v-model="model.verisonStatus" placeholder="请输入版本状态" dict="verison_status" style="width: 100%" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="版本号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verison">-->
<!-- <a-input-number v-model="model.verison" placeholder="请输入版本号" style="width: 100%" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
</a-row>
</a-form-model>
</j-form-container>
@ -114,6 +114,12 @@
data () {
return {
model:{
isPk:'0',
isFk:'0',
isNull:'0',
isUniqueness:'0',
status:'1',
verisonStatus:'1',
},
labelCol: {
xs: { span: 24 },

22
ant-design-vue-jeecg/src/views/tablex/TablexList.vue
Unescape View File

@ -123,7 +123,7 @@
}
},
{
title:'对应模块id',
title:'对应模块',
align:"center",
dataIndex: 'moduleId_dictText'
},
@ -147,6 +147,26 @@
align:"center",
dataIndex: 'structuralDiagram'
},
{
title:'创建人',
align:"center",
dataIndex: 'createBy'
},
{
title:'创建时间',
align:"center",
dataIndex: 'createTime'
},
{
title:'修改人',
align:"center",
dataIndex: 'updateBy'
},
{
title:'修改时间',
align:"center",
dataIndex: 'updateTime'
},
{
title:'实体状态',
align:"center",

40
ant-design-vue-jeecg/src/views/tablex/modules/TablexForm.vue
Unescape View File

@ -4,38 +4,38 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="对应模块id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
<a-form-model-item label="对应模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
<j-search-select-tag v-model="model.moduleId" dict="modulex,module_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableName">
<a-input v-model="model.tableName" placeholder="请输入中文名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableEnName">
<a-input v-model="model.tableEnName" placeholder="请输入英文名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="表结构SQL" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableStructure">
<a-input v-model="model.tableStructure" placeholder="请输入表结构SQL" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableName">-->
<!-- <a-input v-model="model.tableName" placeholder="请输入中文名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableEnName">-->
<!-- <a-input v-model="model.tableEnName" placeholder="请输入英文名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="表结构SQL" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableStructure">-->
<!-- <a-input v-model="model.tableStructure" placeholder="请输入表结构SQL" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="结构图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structuralDiagram">
<j-image-upload v-model="model.structuralDiagram" placeholder="请输入结构图" ></j-image-upload>
<j-image-upload v-model="model.structuralDiagram" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="实体状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<j-search-select-tag v-model="model.status" placeholder="请输入实体状态" dict="yn" style="width: 100%" />
<j-search-select-tag v-model="model.status" dict="a_status" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="版本状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verisonStatus">
<j-search-select-tag v-model="model.verisonStatus" placeholder="请输入版本状态" dict="yn" style="width: 100%" />
<j-search-select-tag v-model="model.verisonStatus" dict="verison_status" style="width: 100%" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
@ -69,6 +69,8 @@
data () {
return {
model:{
status:1,
verisonStatus:1,
},
labelCol: {
xs: { span: 24 },

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java
Unescape View File

@ -82,6 +82,8 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
@ApiOperation(value="字段管理-添加", notes="字段管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody Fieldx fieldx) {
fieldx.setVerison(1);
fieldxService.save(fieldx);
return Result.OK("添加成功！");
}

15
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java
Unescape View File

@ -36,8 +36,9 @@ public class Fieldx implements Serializable {
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**对应实体id*/
@Excel(name = "对应实体id", width = 15)
@ApiModelProperty(value = "对应实体id")
@Excel(name = "对应实体id", width = 15,dictTable="tablex",dicText = "table_name",dicCode = "id")
@ApiModelProperty(value = "对应实体")
@Dict(dictTable="tablex",dicText = "table_name",dicCode = "id")
private java.lang.String tableId;
/**中文名称*/
@Excel(name = "中文名称", width = 15)
@ -98,6 +99,7 @@ public class Fieldx implements Serializable {
private java.lang.String rule;
/**创建人*/
@ApiModelProperty(value = "创建人")
@Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@ -106,6 +108,7 @@ public class Fieldx implements Serializable {
private java.util.Date createTime;
/**修改人*/
@ApiModelProperty(value = "修改人")
@Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
private java.lang.String updateBy;
/**修改时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@ -113,13 +116,13 @@ public class Fieldx implements Serializable {
@ApiModelProperty(value = "修改时间")
private java.util.Date updateTime;
/**字段状态*/
@Excel(name = "字段状态", width = 15,dicCode = "yn")
@Dict(dicCode = "yn")
@Excel(name = "字段状态", width = 15,dicCode = "a_status")
@Dict(dicCode = "a_status")
@ApiModelProperty(value = "字段状态")
private java.lang.Integer status;
/**版本状态*/
@Excel(name = "版本状态", width = 15 ,dicCode = "yn")
@Dict(dicCode = "yn")
@Excel(name = "版本状态", width = 15 ,dicCode = "verison_status")
@Dict(dicCode = "verison_status")
@ApiModelProperty(value = "版本状态")
private java.lang.Integer verisonStatus;
/**版本号*/

16
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
Unescape View File

@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.modulex.entity.Modulex;
import org.jeecg.modules.modulex.service.IModulexService;
import org.jeecg.modules.tablex.entity.Tablex;
import org.jeecg.modules.tablex.service.ITablexService;
@ -49,6 +51,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class TablexController extends JeecgController<Tablex, ITablexService> {
@Autowired
private ITablexService tablexService;
@Autowired
private IModulexService modulexService;
/**
* 分页列表查询
@ -82,6 +87,12 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
@ApiOperation(value="实体表-添加", notes="实体表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody Tablex tablex) {
if (tablex.getModuleId() != null){
Modulex modulex = modulexService.getById(tablex.getModuleId());
tablex.setTableName(modulex.getModuleName());
tablex.setTableEnName(modulex.getModuleEnName());
}
tablex.setVerison(1);
tablexService.save(tablex);
return Result.OK("添加成功！");
}
@ -99,7 +110,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
tablexService.updateById(tablex);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@ -113,7 +124,8 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
tablexService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*

10
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/entity/Tablex.java
Unescape View File

@ -58,6 +58,7 @@ public class Tablex implements Serializable {
private java.lang.String structuralDiagram;
/**创建人*/
@ApiModelProperty(value = "创建人")
@Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
private java.lang.String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@ -66,6 +67,7 @@ public class Tablex implements Serializable {
private java.util.Date createTime;
/**修改人*/
@ApiModelProperty(value = "修改人")
@Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
private java.lang.String updateBy;
/**修改时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@ -73,13 +75,13 @@ public class Tablex implements Serializable {
@ApiModelProperty(value = "修改时间")
private java.util.Date updateTime;
/**实体状态*/
@Excel(name = "实体状态", width = 15,dicCode = "yn")
@Dict(dicCode = "yn")
@Excel(name = "实体状态", width = 15,dicCode = "a_status")
@Dict(dicCode = "a_status")
@ApiModelProperty(value = "实体状态")
private java.lang.Integer status;
/**版本状态*/
@Excel(name = "版本状态", width = 15,dicCode = "yn")
@Dict(dicCode = "yn")
@Excel(name = "版本状态", width = 15,dicCode = "verison_status")
@Dict(dicCode = "verison_status")
@ApiModelProperty(value = "版本状态")
private java.lang.Integer verisonStatus;
/**版本号*/

Write Preview
Loading…
Cancel
Save