Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
appbuild
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
appbuild
Commits
fd82c822
Commit
fd82c822
authored
May 23, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改数据库字段映射关键字转义问题
parent
57650cf6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
257 additions
and
69 deletions
+257
-69
appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
.../src/main/java/com/mortals/xhx/common/utils/GenUtils.java
+3
-0
appbuild-manager/src/main/resources/template/java/entity.java.ftl
...-manager/src/main/resources/template/java/entity.java.ftl
+15
-56
appbuild-manager/src/main/resources/template/java/entity.java.ftl.bak
...ager/src/main/resources/template/java/entity.java.ftl.bak
+185
-0
appbuild-manager/src/main/resources/template/java/service.java.ftl
...manager/src/main/resources/template/java/service.java.ftl
+2
-0
appbuild-manager/src/main/resources/template/java/serviceImpl.java.ftl
...ger/src/main/resources/template/java/serviceImpl.java.ftl
+7
-10
appbuild-manager/src/main/resources/template/java/vo.java.ftl
...uild-manager/src/main/resources/template/java/vo.java.ftl
+27
-0
appbuild-manager/src/main/resources/template/vue/VueDrawerShow.vue.ftl
...ger/src/main/resources/template/vue/VueDrawerShow.vue.ftl
+1
-1
appbuild-manager/src/main/resources/template/vue/webVueList.vue.ftl
...anager/src/main/resources/template/vue/webVueList.vue.ftl
+17
-2
No files found.
appbuild-manager/src/main/java/com/mortals/xhx/common/utils/GenUtils.java
View file @
fd82c822
...
@@ -264,6 +264,9 @@ public class GenUtils {
...
@@ -264,6 +264,9 @@ public class GenUtils {
businessName
=
StringUtils
.
substring
(
tableName
,
0
,
tableName
.
indexOf
(
"_"
));
businessName
=
StringUtils
.
substring
(
tableName
,
0
,
tableName
.
indexOf
(
"_"
));
}
}
//业务名称 保留两位
return
businessName
;
return
businessName
;
}
}
...
...
appbuild-manager/src/main/resources/template/java/entity.java.ftl
View file @
fd82c822
...
@@ -10,7 +10,6 @@ package ${packageName}.model;
...
@@ -10,7 +10,6 @@ package ${packageName}.model;
<#
else
>
<#
else
>
<#
assign
Entity
=
"BaseEntityLong"
>
<#
assign
Entity
=
"BaseEntityLong"
>
</#
if
>
</#
if
>
<#
elseif
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
<#
elseif
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
<#--
判断主键类型,设置继承实体类
-->
<#--
判断主键类型,设置继承实体类
-->
<#
if
pkColumn
??&&
pkColumn
.
javaType
==
"String"
>
<#
if
pkColumn
??&&
pkColumn
.
javaType
==
"String"
>
...
@@ -43,13 +42,14 @@ import ${packageName}.model.vo.${ClassName}Vo;
...
@@ -43,13 +42,14 @@ import ${packageName}.model.vo.${ClassName}Vo;
<#
if
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
<#
if
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
import
${
subPackageName
}.
model
.${
subClassName
}
Entity
;
import
${
subPackageName
}.
model
.${
subClassName
}
Entity
;
</#
if
>
</#
if
>
import
lombok
.
Data
;
/**
/**
*
${
functionName
}
实体对象
*
${
functionName
}
实体对象
*
*
*
@
author
${
author
}
*
@
author
${
author
}
*
@
date
${
datetime
}
*
@
date
${
datetime
}
*/
*/
@
Data
public
class
${
ClassName
}
Entity
extends
${
ClassName
}
Vo
{
public
class
${
ClassName
}
Entity
extends
${
ClassName
}
Vo
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -58,65 +58,24 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
...
@@ -58,65 +58,24 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
/**
/**
*
${
column
.
columnComment
}
*
${
column
.
columnComment
}
*/
*/
<#
if
column
.
isExport
==
1
>
<#
assign
comment
=
column
.
subComment
(
column
.
columnComment
)
/>
<#
assign
parentheseIndex
=
column
.
columnComment
?
index_of
(
"("
)>
<#
if
parentheseIndex
!= -1>
@
Excel
(
name
=
"${comment}"
,
readConverterExp
=
"${column.readConverterExp()}"
)
<#
elseif
column
.
javaType
==
"Date"
>
@
Excel
(
name
=
"${comment}"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
<#
else
>
@
Excel
(
name
=
"${comment}"
)
</#
if
>
</#
if
>
<#
if
column
.
isSerialize
==
1
>
<#
if
column
.
isSerialize
==
1
>
@
JSONField
(
serialize
=
false
)
@
JSONField
(
serialize
=
false
)
</#
if
>
</#
if
>
private
${
column
.
javaType
}
${
column
.
javaField
};
private
${
column
.
javaType
}
${
column
.
javaField
};
</#
if
>
</#
if
>
</#
list
>
</#
list
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"sub"
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"sub"
>
/**
/**
*
${
table
.
subTable
.
functionName
}
信息
*
${
table
.
subTable
.
functionName
}
信息
*/
*/
private
List
<${
subClassName
}
Entity
>
${
subclassName
}
List
=
new
ArrayList
<>();;
private
List
<${
subClassName
}
Entity
>
${
subclassName
}
List
=
new
ArrayList
<>();;
</#
if
>
</#
if
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"subone"
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"subone"
>
/**
/**
*
${
table
.
subTable
.
functionName
}
信息
*
${
table
.
subTable
.
functionName
}
信息
*/
*/
private
${
subClassName
}
Entity
${
subclassName
}
Entity
=
new
${
subClassName
}
Entity
();
private
${
subClassName
}
Entity
${
subclassName
}
Entity
=
new
${
subClassName
}
Entity
();
</#
if
>
</#
if
>
public
${
ClassName
}
Entity
(){}
<#--
get
set
属性
-->
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
<#
if
column
.
javaField
[
0..1
]?
matches
(
"[A-Z]"
)>
<#
assign
AttrName
=
column
.
javaField
>
<#
else
>
<#
assign
AttrName
=
column
.
javaField
?
cap_first
>
</#
if
>
/**
*
获取
${
column
.
columnComment
}
*
@
return
${
column
.
javaType
}
*/
public
${
column
.
javaType
}
get
${
AttrName
}(){
return
${
column
.
javaField
};
}
/**
*
设置
${
column
.
columnComment
}
*
@
param
${
column
.
javaField
}
*/
public
void
set
${
AttrName
}(${
column
.
javaType
}
${
column
.
javaField
}){
this
.${
column
.
javaField
}
=
${
column
.
javaField
};
}
</#
if
>
</#
list
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"sub"
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"sub"
>
public
List
<${
subClassName
}
Entity
>
get
${
subClassName
}
List
(){
public
List
<${
subClassName
}
Entity
>
get
${
subClassName
}
List
(){
return
${
subclassName
}
List
;
return
${
subclassName
}
List
;
...
@@ -126,7 +85,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
...
@@ -126,7 +85,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
this
.${
subclassName
}
List
=
${
subclassName
}
List
;
this
.${
subclassName
}
List
=
${
subclassName
}
List
;
}
}
</#
if
>
</#
if
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"subone"
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"subone"
>
public
${
subClassName
}
Entity
get
${
subClassName
}
Entity
(){
public
${
subClassName
}
Entity
get
${
subClassName
}
Entity
(){
return
${
subclassName
}
Entity
;
return
${
subclassName
}
Entity
;
...
@@ -136,7 +94,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
...
@@ -136,7 +94,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
this
.${
subclassName
}
Entity
=
${
subclassName
}
Entity
;
this
.${
subclassName
}
Entity
=
${
subclassName
}
Entity
;
}
}
</#
if
>
</#
if
>
@
Override
@
Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
...
@@ -153,16 +110,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
...
@@ -153,16 +110,6 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
return
false
;
return
false
;
}
}
public
String
toString
(){
StringBuilder
sb
=
new
StringBuilder
(
""
);
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
sb
.
append
(
",${column.javaField}:"
).
append
(
get
${
column
.
javaField
?
cap_first
}());
</#
if
>
</#
list
>
return
sb
.
toString
();
}
public
void
initAttrValue
(){
public
void
initAttrValue
(){
<#
list
columns
as
column
>
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
<#
if
!column.isSuperColumn(column.javaField)>
...
@@ -178,7 +125,19 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
...
@@ -178,7 +125,19 @@ public class ${ClassName}Entity extends ${ClassName}Vo {
<#
elseif
column
.
javaType
==
"Date"
>
<#
elseif
column
.
javaType
==
"Date"
>
<#
assign
Default
>
null
</#
assign
>
<#
assign
Default
>
null
</#
assign
>
<#
else
>
<#
else
>
<#
assign
Default
>
null
</#
assign
>
<#
if
column
.
javaType
==
"Long"
>
<#
assign
Default
>-
1L
</#
assign
>
<#
elseif
column
.
javaType
==
"Integer"
>
<#
assign
Default
>-
1
</#
assign
>
<#
elseif
column
.
javaType
==
"String"
>
<#
assign
Default
>
""
</#
assign
>
<#
elseif
column
.
javaType
==
"BigDecimal"
>
<#
assign
Default
>
new
BigDecimal
(
0
)</#
assign
>
<#
elseif
column
.
javaType
==
"Date"
>
<#
assign
Default
>
new
Date
()</#
assign
>
<#
else
>
<#
assign
Default
>
null
</#
assign
>
</#
if
>
</#
if
>
</#
if
>
this
.${
column
.
javaField
}
=
${
Default
};
this
.${
column
.
javaField
}
=
${
Default
};
</#
if
>
</#
if
>
...
...
appbuild-manager/src/main/resources/template/java/entity.java.ftl.bak
0 → 100644
View file @
fd82c822
package
${
packageName
}.
model
;
<#
if
table
.
tplCategory
==
"crud"
>
<#--
判断主键类型,设置继承实体类
-->
<#
if
pkColumn
??&&
pkColumn
.
javaType
==
"String"
>
<#
assign
Entity
=
"BaseEntityStr"
>
<#
elseif
pkColumn
??&&
pkColumn
.
javaType
==
"Integer"
>
<#
assign
Entity
=
"BaseEntityInt"
>
<#
elseif
pkColumn
??&&
pkColumn
.
javaType
==
"Long"
>
<#
assign
Entity
=
"BaseEntityLong"
>
<#
else
>
<#
assign
Entity
=
"BaseEntityLong"
>
</#
if
>
<#
elseif
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
<#--
判断主键类型,设置继承实体类
-->
<#
if
pkColumn
??&&
pkColumn
.
javaType
==
"String"
>
<#
assign
Entity
=
"BaseEntityStr"
>
<#
elseif
pkColumn
??&&
pkColumn
.
javaType
==
"Integer"
>
<#
assign
Entity
=
"BaseEntityInt"
>
<#
elseif
pkColumn
??&&
pkColumn
.
javaType
==
"Long"
>
<#
assign
Entity
=
"BaseEntityLong"
>
<#
else
>
<#
assign
Entity
=
"BaseEntityLong"
>
</#
if
>
<#
else
>
<#
assign
Entity
=
"BaseEntityLong"
>
</#
if
>
<#
list
importList
as
import
>
import
${
import
};
</#
list
>
<#
list
columns
as
column
>
<#
if
column
.
isSerialize
==
1
>
import
com
.
alibaba
.
fastjson
.
annotation
.
JSONField
;
<#
break
>
</#
if
>
</#
list
>
import
java
.
util
.
List
;
import
java
.
util
.
ArrayList
;
import
com
.
fasterxml
.
jackson
.
annotation
.
JsonFormat
;
import
com
.
mortals
.
framework
.
annotation
.
Excel
;
import
com
.
mortals
.
framework
.
model
.${
Entity
};
import
${
packageName
}.
model
.
vo
.${
ClassName
}
Vo
;
<#
if
table
.
tplCategory
==
"sub"
||
table
.
tplCategory
==
"subone"
>
import
${
subPackageName
}.
model
.${
subClassName
}
Entity
;
</#
if
>
/**
*
${
functionName
}
实体对象
*
*
@
author
${
author
}
*
@
date
${
datetime
}
*/
public
class
${
ClassName
}
Entity
extends
${
ClassName
}
Vo
{
private
static
final
long
serialVersionUID
=
1L
;
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
/**
*
${
column
.
columnComment
}
*/
<#
if
column
.
isExport
==
1
>
<#
assign
comment
=
column
.
subComment
(
column
.
columnComment
)
/>
<#
assign
parentheseIndex
=
column
.
columnComment
?
index_of
(
"("
)>
<#
if
parentheseIndex
!= -1>
@
Excel
(
name
=
"${comment}"
,
readConverterExp
=
"${column.readConverterExp()}"
)
<#
elseif
column
.
javaType
==
"Date"
>
@
Excel
(
name
=
"${comment}"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
<#
else
>
@
Excel
(
name
=
"${comment}"
)
</#
if
>
</#
if
>
<#
if
column
.
isSerialize
==
1
>
@
JSONField
(
serialize
=
false
)
</#
if
>
private
${
column
.
javaType
}
${
column
.
javaField
};
</#
if
>
</#
list
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"sub"
>
/**
*
${
table
.
subTable
.
functionName
}
信息
*/
private
List
<${
subClassName
}
Entity
>
${
subclassName
}
List
=
new
ArrayList
<>();;
</#
if
>
<#
if
table
.
subTable
??
&&
table
.
tplCategory
==
"subone"
>
/**
*
${
table
.
subTable
.
functionName
}
信息
*/
private
${
subClassName
}
Entity
${
subclassName
}
Entity
=
new
${
subClassName
}
Entity
();
</#
if
>
public
${
ClassName
}
Entity
(){}
<#--
get
set
属性
-->
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
<#
if
column
.
javaField
[
0..1
]?
matches
(
"[A-Z]"
)>
<#
assign
AttrName
=
column
.
javaField
>
<#
else
>
<#
assign
AttrName
=
column
.
javaField
?
cap_first
>
</#
if
>
/**
*
获取
${
column
.
columnComment
}
*
@
return
${
column
.
javaType
}
*/
public
${
column
.
javaType
}
get
${
AttrName
}(){
return
${
column
.
javaField
};
}
/**
*
设置
${
column
.
columnComment
}
*
@
param
${
column
.
javaField
}
*/
public
void
set
${
AttrName
}(${
column
.
javaType
}
${
column
.
javaField
}){
this
.${
column
.
javaField
}
=
${
column
.
javaField
};
}
</#
if
>
</#
list
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"sub"
>
public
List
<${
subClassName
}
Entity
>
get
${
subClassName
}
List
(){
return
${
subclassName
}
List
;
}
public
void
set
${
subClassName
}
List
(
List
<${
subClassName
}
Entity
>
${
subclassName
}
List
){
this
.${
subclassName
}
List
=
${
subclassName
}
List
;
}
</#
if
>
<#
if
subTable
??
&&
table
.
tplCategory
==
"subone"
>
public
${
subClassName
}
Entity
get
${
subClassName
}
Entity
(){
return
${
subclassName
}
Entity
;
}
public
void
set
${
subClassName
}
Entity
(${
subClassName
}
Entity
${
subclassName
}
Entity
){
this
.${
subclassName
}
Entity
=
${
subclassName
}
Entity
;
}
</#
if
>
@
Override
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
}
@
Override
public
boolean
equals
(
Object
obj
)
{
if
(
obj
==
null
)
return
false
;
if
(
obj
instanceof
${
ClassName
}
Entity
)
{
${
ClassName
}
Entity
tmp
=
(${
ClassName
}
Entity
)
obj
;
if
(
this
.
getId
()
==
tmp
.
getId
())
{
return
true
;
}
}
return
false
;
}
public
String
toString
(){
StringBuilder
sb
=
new
StringBuilder
(
""
);
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
sb
.
append
(
",${column.javaField}:"
).
append
(
get
${
column
.
javaField
?
cap_first
}());
</#
if
>
</#
list
>
return
sb
.
toString
();
}
public
void
initAttrValue
(){
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField)>
<#
if
column
.
javaType
==
"Long"
&&
column
.
defaultValue
??&&
column
.
defaultValue
!="">
<#
assign
Default
>${
column
.
defaultValue
}
L
</#
assign
>
<#
elseif
column
.
javaType
==
"Integer"
&&
column
.
defaultValue
??
&&
column
.
defaultValue
!="">
<#
assign
Default
>${
column
.
defaultValue
}</#
assign
>
<#
elseif
column
.
javaType
==
"String"
&&
column
.
defaultValue
??>
<#
assign
Default
>
"${column.defaultValue}"
</#
assign
>
<#
elseif
column
.
javaType
==
"BigDecimal"
&&
column
.
defaultValue
??&&
column
.
defaultValue
!="">
<#
assign
Default
>
BigDecimal
.
valueOf
(${
column
.
defaultValue
})</#
assign
>
<#
elseif
column
.
javaType
==
"Date"
>
<#
assign
Default
>
null
</#
assign
>
<#
else
>
<#
assign
Default
>
null
</#
assign
>
</#
if
>
this
.${
column
.
javaField
}
=
${
Default
};
</#
if
>
</#
list
>
}
}
\ No newline at end of file
appbuild-manager/src/main/resources/template/java/service.java.ftl
View file @
fd82c822
...
@@ -10,6 +10,7 @@ package ${packageName}.service;
...
@@ -10,6 +10,7 @@ package ${packageName}.service;
</#
if
>
</#
if
>
import
com
.
mortals
.
framework
.
service
.${
Service
};
import
com
.
mortals
.
framework
.
service
.${
Service
};
import
${
packageName
}.
model
.${
ClassName
}
Entity
;
import
${
packageName
}.
model
.${
ClassName
}
Entity
;
import
${
packageName
}.
dao
.${
ClassName
}
Dao
;
/**
/**
*
${
ClassName
}
Service
*
${
ClassName
}
Service
*
*
...
@@ -20,4 +21,5 @@ import ${packageName}.model.${ClassName}Entity;
...
@@ -20,4 +21,5 @@ import ${packageName}.model.${ClassName}Entity;
*/
*/
public
interface
${
ClassName
}
Service
extends
${
Service
}<${
ClassName
}
Entity
,${
pkColumn
.
javaType
}>{
public
interface
${
ClassName
}
Service
extends
${
Service
}<${
ClassName
}
Entity
,${
pkColumn
.
javaType
}>{
${
ClassName
}
Dao
getDao
();
}
}
\ No newline at end of file
appbuild-manager/src/main/resources/template/java/serviceImpl.java.ftl
View file @
fd82c822
...
@@ -45,6 +45,7 @@ import cn.hutool.core.util.IdUtil;
...
@@ -45,6 +45,7 @@ import cn.hutool.core.util.IdUtil;
<#
else
>
<#
else
>
<#
assign
Temp
></#
assign
>
<#
assign
Temp
></#
assign
>
</#
if
>
</#
if
>
import
lombok
.
extern
.
slf4j
.
Slf4j
;
/**
/**
*
${
ClassName
}
Service
*
${
ClassName
}
Service
*
${
functionName
}
service
实现
*
${
functionName
}
service
实现
...
@@ -53,6 +54,7 @@ import cn.hutool.core.util.IdUtil;
...
@@ -53,6 +54,7 @@ import cn.hutool.core.util.IdUtil;
*
@
date
${
datetime
}
*
@
date
${
datetime
}
*/
*/
@
Service
(
"${ClassName?uncap_first}Service"
)
@
Service
(
"${ClassName?uncap_first}Service"
)
@
Slf4j
public
class
${
ClassName
}
ServiceImpl
extends
${
Service
}<${
ClassName
}
Dao
,
${
ClassName
}
Entity
,
${
pkColumn
.
javaType
}>
implements
${
ClassName
}
Service
{
public
class
${
ClassName
}
ServiceImpl
extends
${
Service
}<${
ClassName
}
Dao
,
${
ClassName
}
Entity
,
${
pkColumn
.
javaType
}>
implements
${
ClassName
}
Service
{
<#
if
table
.
tplCategory
==
"sub"
>
<#
if
table
.
tplCategory
==
"sub"
>
@
Autowired
@
Autowired
...
@@ -72,8 +74,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
...
@@ -72,8 +74,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
</#
if
>
</#
if
>
</#
if
>
</#
if
>
item
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
item
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
item
.
setCreateUser
(
context
==
null
?
""
:
context
.
getUser
().
getLoginName
());
item
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
item
.
setCreateUserId
(
context
==
null
?
""
:
context
.
getUser
().
getId
());
item
.
setCreateTime
(
new
Date
());
item
.
setCreateTime
(
new
Date
());
}).
count
();
}).
count
();
${
subclassName
}
Service
.
save
(
entity
.
get
${
subClassName
}
List
());
${
subclassName
}
Service
.
save
(
entity
.
get
${
subClassName
}
List
());
...
@@ -97,11 +98,9 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
...
@@ -97,11 +98,9 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
</#
if
>
</#
if
>
</#
if
>
</#
if
>
item
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
item
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
item
.
setCreateUser
(
context
==
null
?
""
:
context
.
getUser
().
getLoginName
());
item
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
item
.
setCreateUserId
(
context
==
null
?
""
:
context
.
getUser
().
getId
());
item
.
setCreateTime
(
new
Date
());
item
.
setCreateTime
(
new
Date
());
item
.
setUpdateUser
(
context
==
null
?
""
:
context
.
getUser
().
getLoginName
());
item
.
setUpdateUserId
(
this
.
getContextUserId
(
context
));
item
.
setUpdateUserId
(
context
==
null
?
""
:
context
.
getUser
().
getId
());
item
.
setUpdateTime
(
new
Date
());
item
.
setUpdateTime
(
new
Date
());
}).
count
();
}).
count
();
${
subclassName
}
Service
.
save
(
entity
.
get
${
subClassName
}
List
());
${
subclassName
}
Service
.
save
(
entity
.
get
${
subClassName
}
List
());
...
@@ -134,8 +133,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
...
@@ -134,8 +133,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
${
subclassName
}
Entity
.
set
${
subPkColumn
.
javaField
?
cap_first
}(
IdUtil
.
getSnowflake
(
1024
,
512
).
nextId
());
${
subclassName
}
Entity
.
set
${
subPkColumn
.
javaField
?
cap_first
}(
IdUtil
.
getSnowflake
(
1024
,
512
).
nextId
());
</#
if
>
</#
if
>
${
subclassName
}
Entity
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
${
subclassName
}
Entity
.
set
${
subTableFkClassName
}(
entity
.
get
${
pkColumn
.
javaField
?
cap_first
}());
${
subclassName
}
Entity
.
setCreateUser
(
context
==
null
?
""
:
context
.
getUser
().
getLoginName
());
${
subclassName
}
Entity
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
${
subclassName
}
Entity
.
setCreateUserId
(
context
==
null
?
""
:
context
.
getUser
().
getId
());
${
subclassName
}
Entity
.
setCreateTime
(
new
Date
());
${
subclassName
}
Entity
.
setCreateTime
(
new
Date
());
${
subclassName
}
Service
.
save
(${
subclassName
}
Entity
,
context
);
${
subclassName
}
Service
.
save
(${
subclassName
}
Entity
,
context
);
}
}
...
@@ -146,8 +144,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
...
@@ -146,8 +144,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
protected
void
updateAfter
(${
ClassName
}
Entity
entity
,
Context
context
)
throws
AppException
{
protected
void
updateAfter
(${
ClassName
}
Entity
entity
,
Context
context
)
throws
AppException
{
if
(
!ObjectUtils.isEmpty(entity.get${subClassName}Entity())){
if
(
!ObjectUtils.isEmpty(entity.get${subClassName}Entity())){
${
subClassName
}
Entity
subEntity
=
entity
.
get
${
subClassName
}
Entity
();
${
subClassName
}
Entity
subEntity
=
entity
.
get
${
subClassName
}
Entity
();
subEntity
.
setUpdateUser
(
context
==
null
?
""
:
context
.
getUser
().
getLoginName
());
subEntity
.
setUpdateUserId
(
this
.
getContextUserId
(
context
));
subEntity
.
setUpdateUserId
(
context
==
null
?
""
:
context
.
getUser
().
getId
());
subEntity
.
setUpdateTime
(
new
Date
());
subEntity
.
setUpdateTime
(
new
Date
());
${
subclassName
}
Service
.
update
(
subEntity
,
context
);
${
subclassName
}
Service
.
update
(
subEntity
,
context
);
}
}
...
...
appbuild-manager/src/main/resources/template/java/vo.java.ftl
View file @
fd82c822
...
@@ -29,6 +29,9 @@ import ${packageName}.model.${ClassName}Entity;
...
@@ -29,6 +29,9 @@ import ${packageName}.model.${ClassName}Entity;
import
java
.
util
.
ArrayList
;
import
java
.
util
.
ArrayList
;
import
java
.
util
.
List
;
import
java
.
util
.
List
;
import
lombok
.
Data
;
import
lombok
.
Data
;
import
com
.
mortals
.
framework
.
annotation
.
Excel
;
import
java
.
math
.
BigDecimal
;
import
java
.
util
.
Date
;
/**
/**
*
${
functionName
}
视图对象
*
${
functionName
}
视图对象
*
*
...
@@ -38,6 +41,30 @@ import lombok.Data;
...
@@ -38,6 +41,30 @@ import lombok.Data;
@
Data
@
Data
public
class
${
ClassName
}
Vo
extends
${
Entity
}
{
public
class
${
ClassName
}
Vo
extends
${
Entity
}
{
<#
list
columns
as
column
>
<#
if
!column.isSuperColumn(column.javaField) && column.isExport==1>
/**
*
${
column
.
columnComment
}
*/
<#
if
column
.
isExport
==
1
>
<#
assign
comment
=
column
.
subComment
(
column
.
columnComment
)
/>
<#
assign
parentheseIndex
=
column
.
columnComment
?
index_of
(
"("
)>
<#
if
parentheseIndex
!= -1>
@
Excel
(
name
=
"${comment}"
,
readConverterExp
=
"${column.readConverterExp()}"
)
<#
elseif
column
.
javaType
==
"Date"
>
@
Excel
(
name
=
"${comment}"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
<#
else
>
@
Excel
(
name
=
"${comment}"
)
</#
if
>
</#
if
>
<#
if
column
.
isSerialize
==
1
>
@
JSONField
(
serialize
=
false
)
</#
if
>
private
${
column
.
javaType
}
${
column
.
javaField
};
</#
if
>
</#
list
>
<#
if
table
.
tplCategory
==
"tree"
>
<#
if
table
.
tplCategory
==
"tree"
>
/**
子
${
functionName
}
*/
/**
子
${
functionName
}
*/
private
List
<${
ClassName
}
Entity
>
children
=
new
ArrayList
<>();
private
List
<${
ClassName
}
Entity
>
children
=
new
ArrayList
<>();
...
...
appbuild-manager/src/main/resources/template/vue/VueDrawerShow.vue.ftl
View file @
fd82c822
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
</#list>
</#list>
</el-row>
</el-row>
</#if>
</#if>
<form-buttons @submit='submitForm' noCancelBtn />
<form-buttons @submit='submitForm'
v-if="pageInfo.type!='view'"
noCancelBtn />
</el-form>
</el-form>
</el-drawer>
</el-drawer>
...
...
appbuild-manager/src/main/resources/template/vue/webVueList.vue.ftl
View file @
fd82c822
...
@@ -160,6 +160,7 @@
...
@@ -160,6 +160,7 @@
prop={options.prop}
prop={options.prop}
label={options.label}
label={options.label}
width={options.width}
width={options.width}
formatter={options.formatter}
>
>
</el-table-column>
</el-table-column>
);
);
...
@@ -232,7 +233,21 @@
...
@@ -232,7 +233,21 @@
<#--忽略主键列 -->
<#--忽略主键列 -->
<#if column.columnName != subPkColumn.columnName && !column.isSuperColumn(column.javaField)>
<#if column.columnName != subPkColumn.columnName && !column.isSuperColumn(column.javaField)>
<#assign comment=column.subComment(column.columnComment) />
<#assign comment=column.subComment(column.columnComment) />
{prop:"${column.javaField}",label:"${comment}",width:100}<#sep>,
<#if column.javaType == "Long">
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatter},
</#if>
<#if column.javaType == "String">
{label: "${comment}", prop: "${column.javaField}"},
</#if>
<#if column.javaType == "Integer">
{label: "${comment}", prop: "${column.javaField}",formatter: this.formatter},
</#if>
<#if column.javaType == "Date">
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatterDate},
</#if>
<#if column.javaType == "BigDecimal">
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatter},
</#if>
</#if>
</#if>
</#list>
</#list>
],
],
...
@@ -292,7 +307,7 @@
...
@@ -292,7 +307,7 @@
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatterDate},
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatterDate},
</#if>
</#if>
<#if column.javaType == "BigDecimal">
<#if column.javaType == "BigDecimal">
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatter
Money
},
{label: "${comment}", prop: "${column.javaField}", formatter: this.formatter},
</#if>
</#if>
</#if>
</#if>
</#list>
</#list>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment