Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
big_hedgehog01
jeecg-boot
提交
43329545
J
jeecg-boot
项目概览
big_hedgehog01
/
jeecg-boot
与 Fork 源项目一致
Fork自
jeecg / jeecg-boot
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jeecg-boot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
43329545
编写于
6月 17, 2021
作者:
JEECG低代码平台
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【gitee/I3HTFI】自定义树控件的表单里的外键直接显示id不显示name
新增监控在线用户 阿里监控去掉广告
上级
50333488
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
478 addition
and
38 deletion
+478
-38
ant-design-vue-jeecg/src/api/login.js
ant-design-vue-jeecg/src/api/login.js
+13
-0
ant-design-vue-jeecg/src/views/system/SysOnlineList.vue
ant-design-vue-jeecg/src/views/system/SysOnlineList.vue
+158
-0
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
...base-core/src/main/java/org/jeecg/config/DruidConfig.java
+81
-0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysOnlineController.java
.../jeecg/modules/system/controller/SysOnlineController.java
+128
-0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysOnlineVO.java
...rc/main/java/org/jeecg/modules/system/vo/SysOnlineVO.java
+60
-0
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+2
-2
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+5
-5
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
...${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+2
-2
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+5
-5
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+3
-3
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+5
-5
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
...${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+2
-2
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+5
-5
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
...${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+2
-2
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
...bussiPackage}/${entityPackage}/entity/${entityName}.javai
+5
-5
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
...${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+2
-2
未找到文件。
ant-design-vue-jeecg/src/api/login.js
浏览文件 @
43329545
...
@@ -71,4 +71,17 @@ export function thirdLogin(token,thirdType) {
...
@@ -71,4 +71,17 @@ export function thirdLogin(token,thirdType) {
'
Content-Type
'
:
'
application/json;charset=UTF-8
'
'
Content-Type
'
:
'
application/json;charset=UTF-8
'
}
}
})
})
}
/**
* 强退其他账号
* @param token
* @returns {*}
*/
export
function
forceLogout
(
parameter
)
{
return
axios
({
url
:
'
/sys/online/forceLogout
'
,
method
:
'
post
'
,
data
:
parameter
})
}
}
\ No newline at end of file
ant-design-vue-jeecg/src/views/system/SysOnlineList.vue
0 → 100644
浏览文件 @
43329545
<
template
>
<a-card
:bordered=
"false"
>
<!-- 查询区域 -->
<div
class=
"table-page-search-wrapper"
>
<a-form
layout=
"inline"
@
keyup.enter.native=
"searchQuery"
>
<a-row
:gutter=
"24"
>
<a-col
:md=
"6"
:sm=
"12"
>
<a-form-item
label=
"账号"
>
<a-input
placeholder=
"请输入账号查询"
v-model=
"queryParam.username"
></a-input>
</a-form-item>
</a-col>
<a-col
:md=
"6"
:sm=
"8"
>
<span
style=
"float: left;overflow: hidden;"
class=
"table-page-search-submitButtons"
>
<a-button
type=
"primary"
@
click=
"searchQuery"
icon=
"search"
>
查询
</a-button>
<a-button
type=
"primary"
@
click=
"searchReset"
icon=
"reload"
style=
"margin-left: 8px"
>
重置
</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- table区域-begin -->
<div>
<div
class=
"ant-alert ant-alert-info"
style=
"margin-bottom: 16px;"
>
<i
class=
"anticon anticon-info-circle ant-alert-icon"
></i>
已选择
<a
style=
"font-weight: 600"
>
{{
selectedRowKeys
.
length
}}
</a>
项
<a
style=
"margin-left: 24px"
@
click=
"onClearSelected"
>
清空
</a>
</div>
<a-table
ref=
"table"
size=
"middle"
:scroll=
"
{x:true}"
bordered
rowKey="token"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template
slot=
"avatarslot"
slot-scope=
"text, record, index"
>
<div
class=
"anty-img-wrap"
>
<a-avatar
shape=
"square"
:src=
"getAvatarView(record.avatar)"
icon=
"user"
/>
</div>
</
template
>
<span
slot=
"action"
slot-scope=
"text, record"
>
<a-popconfirm
title=
"强制退出用户?"
@
confirm=
"() => handleForce(record)"
>
<a-button
type=
"danger"
>
强退
</a-button>
</a-popconfirm>
</span>
</a-table>
</div>
</a-card>
</template>
<
script
>
import
'
@/assets/less/TableExpand.less
'
import
{
mixinDevice
}
from
'
@/utils/mixin
'
import
{
JeecgListMixin
}
from
'
@/mixins/JeecgListMixin
'
import
{
forceLogout
}
from
'
@/api/login
'
import
{
filterDictTextByCache
}
from
'
@/components/dict/JDictSelectUtil
'
import
{
getFileAccessHttpUrl
}
from
'
@/api/manage
'
;
export
default
{
name
:
"
SysOnlineList
"
,
mixins
:[
JeecgListMixin
,
mixinDevice
],
components
:
{},
data
()
{
return
{
description
:
'
在线用户管理页面
'
,
queryParam
:
{
username
:
''
},
// 表头
columns
:
[
{
title
:
'
用户账号
'
,
align
:
"
center
"
,
dataIndex
:
'
username
'
},{
title
:
'
用户姓名
'
,
align
:
"
center
"
,
dataIndex
:
'
realname
'
},{
title
:
'
头像
'
,
align
:
"
center
"
,
width
:
120
,
dataIndex
:
'
avatar
'
,
scopedSlots
:
{
customRender
:
"
avatarslot
"
}
},{
title
:
'
生日
'
,
align
:
"
center
"
,
dataIndex
:
'
birthday
'
},{
title
:
'
性别
'
,
align
:
"
center
"
,
dataIndex
:
'
sex
'
,
customRender
:
(
text
)
=>
{
//字典值翻译通用方法
return
filterDictTextByCache
(
'
sex
'
,
text
);
}
},{
title
:
'
手机号
'
,
align
:
"
center
"
,
dataIndex
:
'
phone
'
},{
title
:
'
操作
'
,
dataIndex
:
'
action
'
,
scopedSlots
:
{
customRender
:
'
action
'
},
align
:
"
center
"
,
width
:
170
}
],
url
:
{
list
:
"
/sys/online/list
"
},
dictOptions
:{},
}
},
created
()
{
},
computed
:
{
importExcelUrl
:
function
(){
return
`
${
window
.
_CONFIG
[
'
domianURL
'
]}
/
${
this
.
url
.
importExcelUrl
}
`
;
},
},
methods
:
{
getAvatarView
:
function
(
avatar
)
{
return
getFileAccessHttpUrl
(
avatar
)
},
handleForce
(
record
)
{
let
that
=
this
;
let
forceParam
=
{
token
:
record
.
token
}
return
forceLogout
(
forceParam
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
that
.
loadData
();
this
.
$message
.
success
(
'
强制退出用户”
'
+
record
.
realname
+
'
“成功!
'
);
}
else
{
that
.
$message
.
warning
(
res
.
message
);
}
})
}
}
}
</
script
>
<
style
scoped
>
@import
'~@assets/less/common.less'
;
</
style
>
\ No newline at end of file
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
0 → 100644
浏览文件 @
43329545
package
org.jeecg.config
;
import
com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
;
import
com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties
;
import
com.alibaba.druid.util.Utils
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
;
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
javax.servlet.*
;
import
java.io.IOException
;
@Configuration
@AutoConfigureAfter
(
DruidDataSourceAutoConfigure
.
class
)
public
class
DruidConfig
{
/**
* 带有广告的common.js全路径,druid-1.1.14
*/
private
static
final
String
FILE_PATH
=
"support/http/resources/js/common.js"
;
/**
* 原始脚本,触发构建广告的语句
*/
private
static
final
String
ORIGIN_JS
=
"this.buildFooter();"
;
/**
* 替换后的脚本
*/
private
static
final
String
NEW_JS
=
"//this.buildFooter();"
;
/**
* 去除Druid监控页面的广告
*
* @param properties DruidStatProperties属性集合
* @return {@link org.springframework.boot.web.servlet.FilterRegistrationBean}
*/
@Bean
@ConditionalOnWebApplication
@ConditionalOnProperty
(
name
=
"spring.datasource.druid.stat-view-servlet.enabled"
,
havingValue
=
"true"
)
public
FilterRegistrationBean
<
RemoveAdFilter
>
removeDruidAdFilter
(
DruidStatProperties
properties
)
throws
IOException
{
// 获取web监控页面的参数
DruidStatProperties
.
StatViewServlet
config
=
properties
.
getStatViewServlet
();
// 提取common.js的配置路径
String
pattern
=
config
.
getUrlPattern
()
!=
null
?
config
.
getUrlPattern
()
:
"/druid/*"
;
String
commonJsPattern
=
pattern
.
replaceAll
(
"\\*"
,
"js/common.js"
);
// 获取common.js
String
text
=
Utils
.
readFromResource
(
FILE_PATH
);
// 屏蔽 this.buildFooter(); 不构建广告
final
String
newJs
=
text
.
replace
(
ORIGIN_JS
,
NEW_JS
);
FilterRegistrationBean
<
RemoveAdFilter
>
registration
=
new
FilterRegistrationBean
<>();
registration
.
setFilter
(
new
RemoveAdFilter
(
newJs
));
registration
.
addUrlPatterns
(
commonJsPattern
);
return
registration
;
}
/**
* 删除druid的广告过滤器
*
* @author BBF
*/
private
class
RemoveAdFilter
implements
Filter
{
private
final
String
newJs
;
public
RemoveAdFilter
(
String
newJS
)
{
this
.
newJs
=
newJS
;
}
@Override
public
void
doFilter
(
ServletRequest
request
,
ServletResponse
response
,
FilterChain
chain
)
throws
IOException
,
ServletException
{
chain
.
doFilter
(
request
,
response
);
// 重置缓冲区,响应头不会被重置
response
.
resetBuffer
();
response
.
getWriter
().
write
(
newJs
);
}
}
}
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysOnlineController.java
0 → 100644
浏览文件 @
43329545
package
org.jeecg.modules.system.controller
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.shiro.SecurityUtils
;
import
org.jeecg.common.api.vo.Result
;
import
org.jeecg.common.constant.CacheConstant
;
import
org.jeecg.common.constant.CommonConstant
;
import
org.jeecg.common.system.api.ISysBaseAPI
;
import
org.jeecg.common.system.util.JwtUtil
;
import
org.jeecg.common.system.vo.LoginUser
;
import
org.jeecg.common.util.RedisUtil
;
import
org.jeecg.common.util.oConvertUtils
;
import
org.jeecg.modules.base.service.BaseCommonService
;
import
org.jeecg.modules.system.service.ISysUserService
;
import
org.jeecg.modules.system.vo.SysOnlineVO
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
/**
* @Description: 在线用户
* @Author: chenli
* @Date: 2020-06-07
* @Version: V1.0
*/
@RestController
@RequestMapping
(
"/sys/online"
)
@Slf4j
public
class
SysOnlineController
{
@Autowired
private
RedisUtil
redisUtil
;
@Autowired
public
RedisTemplate
redisTemplate
;
@Autowired
public
ISysUserService
userService
;
@Autowired
private
ISysBaseAPI
sysBaseAPI
;
@Resource
private
BaseCommonService
baseCommonService
;
@RequestMapping
(
value
=
"/list"
,
method
=
RequestMethod
.
GET
)
public
Result
<
Page
<
SysOnlineVO
>>
list
(
@RequestParam
(
name
=
"username"
,
required
=
false
)
String
username
,
@RequestParam
(
name
=
"pageNo"
,
defaultValue
=
"1"
)
Integer
pageNo
,
@RequestParam
(
name
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
pageSize
)
{
Collection
<
String
>
keys
=
redisTemplate
.
keys
(
CommonConstant
.
PREFIX_USER_TOKEN
+
"*"
);
SysOnlineVO
online
;
List
<
SysOnlineVO
>
onlineList
=
new
ArrayList
<
SysOnlineVO
>();
for
(
String
key
:
keys
)
{
online
=
new
SysOnlineVO
();
String
token
=
(
String
)
redisUtil
.
get
(
key
);
if
(!
StringUtils
.
isEmpty
(
token
)){
online
.
setToken
(
token
);
LoginUser
loginUser
=
sysBaseAPI
.
getUserByName
(
JwtUtil
.
getUsername
(
token
));
BeanUtils
.
copyProperties
(
loginUser
,
online
);
if
(
StringUtils
.
isNotEmpty
(
username
))
{
if
(
StringUtils
.
equals
(
username
,
online
.
getUsername
()))
{
onlineList
.
add
(
online
);
}
}
else
{
onlineList
.
add
(
online
);
}
}
}
Page
<
SysOnlineVO
>
page
=
new
Page
<
SysOnlineVO
>(
pageNo
,
pageSize
);
int
count
=
onlineList
.
size
();
List
<
SysOnlineVO
>
pages
=
new
ArrayList
<>();
//计算当前页第一条数据的下标
int
currId
=
pageNo
>
1
?
(
pageNo
-
1
)*
pageSize:
0
;
for
(
int
i
=
0
;
i
<
pageSize
&&
i
<
count
-
currId
;
i
++){
pages
.
add
(
onlineList
.
get
(
currId
+
i
));
}
page
.
setSize
(
pageSize
);
page
.
setCurrent
(
pageNo
);
page
.
setTotal
(
count
);
//计算分页总页数
page
.
setPages
(
count
%
10
==
0
?
count
/
10
:
count
/
10
+
1
);
page
.
setRecords
(
pages
);
Collections
.
reverse
(
onlineList
);
onlineList
.
removeAll
(
Collections
.
singleton
(
null
));
Result
<
Page
<
SysOnlineVO
>>
result
=
new
Result
<
Page
<
SysOnlineVO
>>();
result
.
setSuccess
(
true
);
result
.
setResult
(
page
);
return
result
;
}
/**
* 强退用户
*/
@RequestMapping
(
value
=
"/forceLogout"
,
method
=
RequestMethod
.
POST
)
public
Result
<
Object
>
forceLogout
(
@RequestBody
SysOnlineVO
online
)
{
//用户退出逻辑
if
(
oConvertUtils
.
isEmpty
(
online
.
getToken
()))
{
return
Result
.
error
(
"退出登录失败!"
);
}
String
username
=
JwtUtil
.
getUsername
(
online
.
getToken
());
LoginUser
sysUser
=
sysBaseAPI
.
getUserByName
(
username
);
if
(
sysUser
!=
null
)
{
baseCommonService
.
addLog
(
"强制: "
+
sysUser
.
getRealname
()+
"退出成功!"
,
CommonConstant
.
LOG_TYPE_1
,
null
,
sysUser
);
log
.
info
(
" 强制 "
+
sysUser
.
getRealname
()+
"退出成功! "
);
//清空用户登录Token缓存
redisUtil
.
del
(
CommonConstant
.
PREFIX_USER_TOKEN
+
online
.
getToken
());
//清空用户登录Shiro权限缓存
redisUtil
.
del
(
CommonConstant
.
PREFIX_USER_SHIRO_CACHE
+
sysUser
.
getId
());
//清空用户的缓存信息(包括部门信息),例如sys:cache:user::<username>
redisUtil
.
del
(
String
.
format
(
"%s::%s"
,
CacheConstant
.
SYS_USERS_CACHE
,
sysUser
.
getUsername
()));
//调用shiro的logout
SecurityUtils
.
getSubject
().
logout
();
return
Result
.
ok
(
"退出登录成功!"
);
}
else
{
return
Result
.
error
(
"Token无效!"
);
}
}
}
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysOnlineVO.java
0 → 100644
浏览文件 @
43329545
package
org.jeecg.modules.system.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
org.jeecg.common.aspect.annotation.Dict
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
/**
*
* @Author: chenli
* @Date: 2020-06-07
* @Version: V1.0
*/
@Data
public
class
SysOnlineVO
{
/**
* 会话id
*/
private
String
id
;
/**
* 会话编号
*/
private
String
token
;
/**
* 用户名
*/
private
String
username
;
/**
* 用户名
*/
private
String
realname
;
/**
* 头像
*/
private
String
avatar
;
/**
* 生日
*/
@JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
birthday
;
/**
* 性别(1:男 2:女)
*/
@Dict
(
dicCode
=
"sex"
)
private
Integer
sex
;
/**
* 手机号
*/
private
String
phone
;
}
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -55,13 +55,13 @@ public class ${entityName} implements Serializable {
...
@@ -55,13 +55,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
浏览文件 @
43329545
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -40,9 +40,9 @@ public class ${entityName} implements Serializable {
...
@@ -40,9 +40,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
<
/#
if
>
<
#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
@@ -51,13 +51,13 @@ public class ${entityName} implements Serializable {
...
@@ -51,13 +51,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
浏览文件 @
43329545
...
@@ -52,13 +52,13 @@ public class ${subTab.entityName} implements Serializable {
...
@@ -52,13 +52,13 @@ public class ${subTab.entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
浏览文件 @
43329545
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @
43329545
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
...
@@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
elseif
po
.
dictField
?
default
(
""
)?
trim
?
length
gt
1
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
assign
list_field_dictCode
=
', dicCode = "${po.dictField}"'
>
<#
elseif
po
.
classType
==
'sel_tree'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"
'
>
<#
elseif
po
.
classType
==
'sel_tree
'
>
</#
if
>
<#
assign
list_field_dictCode
=
', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'
>
</#
if
>
</#
if
>
/**${
po
.
filedComment
}*/
/**${
po
.
filedComment
}*/
<#
if
po
.
fieldName
==
primaryKeyField
>
<#
if
po
.
fieldName
==
primaryKeyField
>
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
...
@@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
浏览文件 @
43329545
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
...
@@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
fieldDbType
==
'Date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
po
.
classType
==
'date'
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
15
,
format
=
"yyyy-MM-dd"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
<#
else
>
<#
else
>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
<#
if
!excel_ignore_arr?seq_contains("${po.fieldName}")>
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
${
list_field_dictCode
}
)
@
Excel
(
name
=
"${po.filedComment}"
,
width
=
20
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
</#
if
>
</#
if
>
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@
DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录