Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JeeSpringCloud
Commits
7fa8137a
Commit
7fa8137a
authored
Oct 22, 2018
by
HuangBingGui
Browse files
no commit message
parent
6c859da2
Changes
202
Hide whitespace changes
Inline
Side-by-side
JeeSpringCloud/src/main/java/com/jeespring/modules/oauth/rest/oauthRestController.java
View file @
7fa8137a
...
@@ -79,7 +79,9 @@ public class oauthRestController extends AbstractBaseController {
...
@@ -79,7 +79,9 @@ public class oauthRestController extends AbstractBaseController {
@ApiOperation
(
value
=
"授权平台调用次数失败(Content-Type为application/html)"
,
notes
=
"授权平台调用次数失败(Content-Type为application/html)"
)
@ApiOperation
(
value
=
"授权平台调用次数失败(Content-Type为application/html)"
,
notes
=
"授权平台调用次数失败(Content-Type为application/html)"
)
public
Result
apiTimeLimiFaild
(
HttpServletRequest
request
,
HttpServletResponse
response
){
public
Result
apiTimeLimiFaild
(
HttpServletRequest
request
,
HttpServletResponse
response
){
String
apiTimeLimi
=
request
.
getParameter
(
"apiTimeLimi"
);
String
apiTimeLimi
=
request
.
getParameter
(
"apiTimeLimi"
);
if
(
apiTimeLimi
==
null
)
apiTimeLimi
=
""
;
if
(
apiTimeLimi
==
null
)
{
apiTimeLimi
=
""
;
}
return
ResultFactory
.
getErrorResult
(
"调用失败,接口允许最多调用"
+
apiTimeLimi
+
"次数!15分钟后解锁!"
);
return
ResultFactory
.
getErrorResult
(
"调用失败,接口允许最多调用"
+
apiTimeLimi
+
"次数!15分钟后解锁!"
);
}
}
@RequestMapping
(
value
=
{
"userOnlineAmountFaild"
},
method
={
RequestMethod
.
POST
,
RequestMethod
.
GET
})
@RequestMapping
(
value
=
{
"userOnlineAmountFaild"
},
method
={
RequestMethod
.
POST
,
RequestMethod
.
GET
})
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/oauth/service/OauthService.java
View file @
7fa8137a
...
@@ -33,7 +33,9 @@ public class OauthService {
...
@@ -33,7 +33,9 @@ public class OauthService {
SysConfig
sysConfigOauth
=
new
SysConfig
();
SysConfig
sysConfigOauth
=
new
SysConfig
();
sysConfigOauth
.
setType
(
"oauthOpen"
);
sysConfigOauth
.
setType
(
"oauthOpen"
);
SysConfig
sysConfigsOauth
=
sysConfigService
.
findListFirstCache
(
sysConfigOauth
);
SysConfig
sysConfigsOauth
=
sysConfigService
.
findListFirstCache
(
sysConfigOauth
);
if
(
sysConfigsOauth
.
getValue
().
equals
(
"true"
))
return
true
;
if
(
"true"
.
equals
(
sysConfigsOauth
.
getValue
()))
{
return
true
;
}
return
false
;
return
false
;
}
}
...
@@ -137,8 +139,9 @@ public class OauthService {
...
@@ -137,8 +139,9 @@ public class OauthService {
int
countShiro
=
redisUtils
.
getCountShiro
();
int
countShiro
=
redisUtils
.
getCountShiro
();
Subject
subject
=
SecurityUtils
.
getSubject
();
Subject
subject
=
SecurityUtils
.
getSubject
();
String
key
=
null
;
String
key
=
null
;
if
(
subject
!=
null
&&
subject
.
getSession
()
!=
null
)
if
(
subject
!=
null
&&
subject
.
getSession
()
!=
null
)
{
key
=
redisUtils
.
SHIRO_REDIS
+
":"
+
subject
.
getSession
().
getId
().
toString
();
key
=
redisUtils
.
SHIRO_REDIS
+
":"
+
subject
.
getSession
().
getId
().
toString
();
}
if
(
Integer
.
valueOf
(
userOnlineAmount
.
getValue
())<
countShiro
&&
key
!=
null
){
if
(
Integer
.
valueOf
(
userOnlineAmount
.
getValue
())<
countShiro
&&
key
!=
null
){
redisUtils
.
remove
(
key
);
redisUtils
.
remove
(
key
);
return
ResultFactory
.
getErrorResult
(
"在线控制:在线"
+
countShiro
+
"人/总控制"
+
userOnlineAmount
.
getValue
()+
"人"
);
return
ResultFactory
.
getErrorResult
(
"在线控制:在线"
+
countShiro
+
"人/总控制"
+
userOnlineAmount
.
getValue
()+
"人"
);
...
@@ -167,8 +170,12 @@ public class OauthService {
...
@@ -167,8 +170,12 @@ public class OauthService {
String
redisKeyMonth
=
"ApiTimeMonth"
;
String
redisKeyMonth
=
"ApiTimeMonth"
;
Object
apiTimeDay
=
redisUtils
.
get
(
redisKeyDay
);
Object
apiTimeDay
=
redisUtils
.
get
(
redisKeyDay
);
Object
apiTimeMonth
=
redisUtils
.
get
(
redisKeyMonth
);
Object
apiTimeMonth
=
redisUtils
.
get
(
redisKeyMonth
);
if
(
apiTimeDay
==
null
)
apiTimeDay
=
"0"
;
if
(
apiTimeDay
==
null
)
{
if
(
apiTimeMonth
==
null
)
apiTimeMonth
=
"0"
;
apiTimeDay
=
"0"
;
}
if
(
apiTimeMonth
==
null
)
{
apiTimeMonth
=
"0"
;
}
return
ResultFactory
.
getSuccessResult
(
"Day:"
+
apiTimeDay
+
" Time;Month:"
+
apiTimeMonth
+
" Time"
);
return
ResultFactory
.
getSuccessResult
(
"Day:"
+
apiTimeDay
+
" Time;Month:"
+
apiTimeMonth
+
" Time"
);
}
}
public
Result
setApiTime
(){
public
Result
setApiTime
(){
...
@@ -178,8 +185,12 @@ public class OauthService {
...
@@ -178,8 +185,12 @@ public class OauthService {
Object
apiTimeMonth
=
redisUtils
.
get
(
redisKeyMonth
);
Object
apiTimeMonth
=
redisUtils
.
get
(
redisKeyMonth
);
Long
apiTimeDayLong
=
0L
;
Long
apiTimeDayLong
=
0L
;
Long
apiTimeMonthLong
=
0L
;
Long
apiTimeMonthLong
=
0L
;
if
(
apiTimeDay
==
null
)
apiTimeDay
=
0
;
if
(
apiTimeDay
==
null
)
{
if
(
apiTimeMonth
==
null
)
apiTimeMonth
=
0
;
apiTimeDay
=
0
;
}
if
(
apiTimeMonth
==
null
)
{
apiTimeMonth
=
0
;
}
if
(
apiTimeDay
!=
null
){
if
(
apiTimeDay
!=
null
){
apiTimeDayLong
=
Long
.
valueOf
(
apiTimeDay
.
toString
());
apiTimeDayLong
=
Long
.
valueOf
(
apiTimeDay
.
toString
());
apiTimeDayLong
=
apiTimeDayLong
+
1
;
apiTimeDayLong
=
apiTimeDayLong
+
1
;
...
@@ -212,7 +223,7 @@ public class OauthService {
...
@@ -212,7 +223,7 @@ public class OauthService {
if
(
apiTimeLimis
.
size
()>
0
){
if
(
apiTimeLimis
.
size
()>
0
){
apiTimeLongSysConfig
=
Long
.
valueOf
(
apiTimeLimis
.
get
(
0
).
getValue
());
apiTimeLongSysConfig
=
Long
.
valueOf
(
apiTimeLimis
.
get
(
0
).
getValue
());
}
}
if
(
apiTimeLongSysConfig
.
equals
(
"-1"
)){
if
(
"-1"
.
equals
(
apiTimeLongSysConfig
)){
apiTimeLongSysConfig
=
100000000L
;
apiTimeLongSysConfig
=
100000000L
;
}
}
if
(
apiTimeLimis
.
size
()==
0
){
if
(
apiTimeLimis
.
size
()==
0
){
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/server/rest/SysServerRestController.java
View file @
7fa8137a
...
@@ -257,7 +257,7 @@ public class SysServerRestController extends AbstractBaseController {
...
@@ -257,7 +257,7 @@ public class SysServerRestController extends AbstractBaseController {
}
}
private
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
private
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysServerService
.
delete
(
sysServerService
.
get
(
id
));
sysServerService
.
delete
(
sysServerService
.
get
(
id
));
}
}
...
@@ -286,7 +286,7 @@ public class SysServerRestController extends AbstractBaseController {
...
@@ -286,7 +286,7 @@ public class SysServerRestController extends AbstractBaseController {
}
}
private
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
private
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysServerService
.
deleteByLogic
(
sysServerService
.
get
(
id
));
sysServerService
.
deleteByLogic
(
sysServerService
.
get
(
id
));
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/server/service/SysServerService.java
View file @
7fa8137a
...
@@ -36,16 +36,20 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -36,16 +36,20 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
@Autowired
@Autowired
private
RedisUtils
redisUtils
;
private
RedisUtils
redisUtils
;
@Override
public
SysServer
get
(
String
id
)
{
public
SysServer
get
(
String
id
)
{
//获取数据库数据
//获取数据库数据
SysServer
sysServer
=
super
.
get
(
id
);
SysServer
sysServer
=
super
.
get
(
id
);
return
sysServer
;
return
sysServer
;
}
}
@Override
public
SysServer
getCache
(
String
id
)
{
public
SysServer
getCache
(
String
id
)
{
//获取缓存数据
//获取缓存数据
SysServer
sysServer
=(
SysServer
)
redisUtils
.
get
(
RedisUtils
.
getIdKey
(
SysServerService
.
class
.
getName
(),
id
));
SysServer
sysServer
=(
SysServer
)
redisUtils
.
get
(
RedisUtils
.
getIdKey
(
SysServerService
.
class
.
getName
(),
id
));
if
(
sysServer
!=
null
)
return
sysServer
;
if
(
sysServer
!=
null
)
{
return
sysServer
;
}
//获取数据库数据
//获取数据库数据
sysServer
=
super
.
get
(
id
);
sysServer
=
super
.
get
(
id
);
//设置缓存数据
//设置缓存数据
...
@@ -53,17 +57,21 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -53,17 +57,21 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
return
sysServer
;
return
sysServer
;
}
}
@Override
public
List
<
SysServer
>
total
(
SysServer
sysServer
)
{
public
List
<
SysServer
>
total
(
SysServer
sysServer
)
{
//获取数据库数据
//获取数据库数据
List
<
SysServer
>
sysServerList
=
super
.
total
(
sysServer
);
List
<
SysServer
>
sysServerList
=
super
.
total
(
sysServer
);
return
sysServerList
;
return
sysServerList
;
}
}
@Override
public
List
<
SysServer
>
totalCache
(
SysServer
sysServer
)
{
public
List
<
SysServer
>
totalCache
(
SysServer
sysServer
)
{
//获取缓存数据
//获取缓存数据
String
totalKey
=
RedisUtils
.
getTotalKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
String
totalKey
=
RedisUtils
.
getTotalKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
List
<
SysServer
>
sysServerList
=(
List
<
SysServer
>)
redisUtils
.
get
(
totalKey
);
List
<
SysServer
>
sysServerList
=(
List
<
SysServer
>)
redisUtils
.
get
(
totalKey
);
if
(
sysServerList
!=
null
)
return
sysServerList
;
if
(
sysServerList
!=
null
)
{
return
sysServerList
;
}
//获取数据库数据
//获取数据库数据
sysServerList
=
super
.
total
(
sysServer
);
sysServerList
=
super
.
total
(
sysServer
);
//设置缓存数据
//设置缓存数据
...
@@ -71,6 +79,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -71,6 +79,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
return
sysServerList
;
return
sysServerList
;
}
}
@Override
public
List
<
SysServer
>
findList
(
SysServer
sysServer
)
{
public
List
<
SysServer
>
findList
(
SysServer
sysServer
)
{
//获取数据库数据
//获取数据库数据
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
...
@@ -78,11 +87,14 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -78,11 +87,14 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
return
sysServerList
;
return
sysServerList
;
}
}
@Override
public
List
<
SysServer
>
findListCache
(
SysServer
sysServer
)
{
public
List
<
SysServer
>
findListCache
(
SysServer
sysServer
)
{
//获取缓存数据
//获取缓存数据
String
findListKey
=
RedisUtils
.
getFindListKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
String
findListKey
=
RedisUtils
.
getFindListKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
List
<
SysServer
>
sysServerList
=(
List
<
SysServer
>)
redisUtils
.
get
(
findListKey
);
List
<
SysServer
>
sysServerList
=(
List
<
SysServer
>)
redisUtils
.
get
(
findListKey
);
if
(
sysServerList
!=
null
)
return
sysServerList
;
if
(
sysServerList
!=
null
)
{
return
sysServerList
;
}
//获取数据库数据
//获取数据库数据
sysServerList
=
super
.
findList
(
sysServer
);
sysServerList
=
super
.
findList
(
sysServer
);
//设置缓存数据
//设置缓存数据
...
@@ -93,7 +105,9 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -93,7 +105,9 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
public
SysServer
findListFirst
(
SysServer
sysServer
)
{;
public
SysServer
findListFirst
(
SysServer
sysServer
)
{;
//获取数据库数据
//获取数据库数据
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
if
(
sysServerList
.
size
()>
0
)
sysServer
=
sysServerList
.
get
(
0
);
if
(
sysServerList
.
size
()>
0
)
{
sysServer
=
sysServerList
.
get
(
0
);
}
return
sysServer
;
return
sysServer
;
}
}
...
@@ -101,27 +115,36 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -101,27 +115,36 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
//获取缓存数据
//获取缓存数据
String
findListFirstKey
=
RedisUtils
.
getFindListFirstKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
String
findListFirstKey
=
RedisUtils
.
getFindListFirstKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
sysServer
));
SysServer
sysServerRedis
=(
SysServer
)
redisUtils
.
get
(
findListFirstKey
);
SysServer
sysServerRedis
=(
SysServer
)
redisUtils
.
get
(
findListFirstKey
);
if
(
sysServerRedis
!=
null
)
return
sysServerRedis
;
if
(
sysServerRedis
!=
null
)
{
return
sysServerRedis
;
}
//获取数据库数据
//获取数据库数据
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
List
<
SysServer
>
sysServerList
=
super
.
findList
(
sysServer
);
if
(
sysServerList
.
size
()>
0
)
sysServer
=
sysServerList
.
get
(
0
);
if
(
sysServerList
.
size
()>
0
)
{
else
sysServer
=
new
SysServer
();
sysServer
=
sysServerList
.
get
(
0
);
}
else
{
sysServer
=
new
SysServer
();
}
//设置缓存数据
//设置缓存数据
redisUtils
.
set
(
findListFirstKey
,
sysServer
);
redisUtils
.
set
(
findListFirstKey
,
sysServer
);
return
sysServer
;
return
sysServer
;
}
}
@Override
public
Page
<
SysServer
>
findPage
(
Page
<
SysServer
>
page
,
SysServer
sysServer
)
{
public
Page
<
SysServer
>
findPage
(
Page
<
SysServer
>
page
,
SysServer
sysServer
)
{
//获取数据库数据
//获取数据库数据
Page
<
SysServer
>
pageReuslt
=
super
.
findPage
(
page
,
sysServer
);
Page
<
SysServer
>
pageReuslt
=
super
.
findPage
(
page
,
sysServer
);
return
pageReuslt
;
return
pageReuslt
;
}
}
@Override
public
Page
<
SysServer
>
findPageCache
(
Page
<
SysServer
>
page
,
SysServer
sysServer
)
{
public
Page
<
SysServer
>
findPageCache
(
Page
<
SysServer
>
page
,
SysServer
sysServer
)
{
//获取缓存数据
//获取缓存数据
String
findPageKey
=
RedisUtils
.
getFindPageKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
page
)+
JSON
.
toJSONString
(
sysServer
));
String
findPageKey
=
RedisUtils
.
getFindPageKey
(
SysServerService
.
class
.
getName
(),
JSON
.
toJSONString
(
page
)+
JSON
.
toJSONString
(
sysServer
));
Page
<
SysServer
>
pageReuslt
=(
Page
<
SysServer
>)
redisUtils
.
get
(
findPageKey
);
Page
<
SysServer
>
pageReuslt
=(
Page
<
SysServer
>)
redisUtils
.
get
(
findPageKey
);
if
(
pageReuslt
!=
null
)
return
pageReuslt
;
if
(
pageReuslt
!=
null
)
{
return
pageReuslt
;
}
//获取数据库数据
//获取数据库数据
pageReuslt
=
super
.
findPage
(
page
,
sysServer
);
pageReuslt
=
super
.
findPage
(
page
,
sysServer
);
//设置缓存数据
//设置缓存数据
...
@@ -129,6 +152,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -129,6 +152,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
return
pageReuslt
;
return
pageReuslt
;
}
}
@Override
@Transactional
(
readOnly
=
false
)
@Transactional
(
readOnly
=
false
)
public
void
save
(
SysServer
sysServer
)
{
public
void
save
(
SysServer
sysServer
)
{
//保存数据库记录
//保存数据库记录
...
@@ -140,6 +164,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -140,6 +164,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
redisUtils
.
removePattern
(
RedisUtils
.
getFinPageKeyPattern
(
SysServerService
.
class
.
getName
()));
redisUtils
.
removePattern
(
RedisUtils
.
getFinPageKeyPattern
(
SysServerService
.
class
.
getName
()));
}
}
@Override
@Transactional
(
readOnly
=
false
)
@Transactional
(
readOnly
=
false
)
public
void
delete
(
SysServer
sysServer
)
{
public
void
delete
(
SysServer
sysServer
)
{
//清除记录缓存数据
//清除记录缓存数据
...
@@ -151,6 +176,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
...
@@ -151,6 +176,7 @@ public class SysServerService extends AbstractBaseService<SysServerDao, SysServe
redisUtils
.
removePattern
(
RedisUtils
.
getFinPageKeyPattern
(
SysServerService
.
class
.
getName
()));
redisUtils
.
removePattern
(
RedisUtils
.
getFinPageKeyPattern
(
SysServerService
.
class
.
getName
()));
}
}
@Override
@Transactional
(
readOnly
=
false
)
@Transactional
(
readOnly
=
false
)
public
void
deleteByLogic
(
SysServer
sysServer
)
{
public
void
deleteByLogic
(
SysServer
sysServer
)
{
//清除记录缓存数据
//清除记录缓存数据
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/server/web/SysServerController.java
View file @
7fa8137a
...
@@ -166,8 +166,9 @@ public class SysServerController extends AbstractBaseController {
...
@@ -166,8 +166,9 @@ public class SysServerController extends AbstractBaseController {
public
String
form
(
SysServer
sysServer
,
Model
model
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
public
String
form
(
SysServer
sysServer
,
Model
model
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
model
.
addAttribute
(
"action"
,
request
.
getParameter
(
"action"
));
model
.
addAttribute
(
"action"
,
request
.
getParameter
(
"action"
));
model
.
addAttribute
(
"sysServer"
,
sysServer
);
model
.
addAttribute
(
"sysServer"
,
sysServer
);
if
(
request
.
getParameter
(
"ViewFormType"
)!=
null
&&
request
.
getParameter
(
"ViewFormType"
).
equals
(
"FormTwo"
))
if
(
request
.
getParameter
(
"ViewFormType"
)!=
null
&&
"FormTwo"
.
equals
(
request
.
getParameter
(
"ViewFormType"
)))
{
return
"modules/sys/sysServerFormTwo"
;
return
"modules/sys/sysServerFormTwo"
;
}
return
"modules/sys/sysServerForm"
;
return
"modules/sys/sysServerForm"
;
}
}
...
@@ -229,7 +230,7 @@ public class SysServerController extends AbstractBaseController {
...
@@ -229,7 +230,7 @@ public class SysServerController extends AbstractBaseController {
addMessage
(
redirectAttributes
,
sysConfigService
.
isDemoModeDescription
());
addMessage
(
redirectAttributes
,
sysConfigService
.
isDemoModeDescription
());
return
"redirect:"
+
adminPath
+
"/sys/sysServer/?repage"
;
return
"redirect:"
+
adminPath
+
"/sys/sysServer/?repage"
;
}
}
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysServerService
.
delete
(
sysServerService
.
get
(
id
));
sysServerService
.
delete
(
sysServerService
.
get
(
id
));
}
}
...
@@ -247,7 +248,7 @@ public class SysServerController extends AbstractBaseController {
...
@@ -247,7 +248,7 @@ public class SysServerController extends AbstractBaseController {
addMessage
(
redirectAttributes
,
sysConfigService
.
isDemoModeDescription
());
addMessage
(
redirectAttributes
,
sysConfigService
.
isDemoModeDescription
());
return
"redirect:"
+
adminPath
+
"/sys/sysServer/?repage"
;
return
"redirect:"
+
adminPath
+
"/sys/sysServer/?repage"
;
}
}
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysServerService
.
deleteByLogic
(
sysServerService
.
get
(
id
));
sysServerService
.
deleteByLogic
(
sysServerService
.
get
(
id
));
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/Area.java
View file @
7fa8137a
...
@@ -33,11 +33,13 @@ public class Area extends TreeEntity<Area> {
...
@@ -33,11 +33,13 @@ public class Area extends TreeEntity<Area> {
// @JsonBackReference
// @JsonBackReference
// @NotNull
// @NotNull
public
Area
getParent
()
{
@Override
public
Area
getParent
()
{
return
parent
;
return
parent
;
}
}
public
void
setParent
(
Area
parent
)
{
@Override
public
void
setParent
(
Area
parent
)
{
this
.
parent
=
parent
;
this
.
parent
=
parent
;
}
}
//
//
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/Menu.java
View file @
7fa8137a
...
@@ -57,7 +57,9 @@ public class Menu extends AbstractBaseEntity<Menu> {
...
@@ -57,7 +57,9 @@ public class Menu extends AbstractBaseEntity<Menu> {
@Length
(
min
=
1
,
max
=
2000
)
@Length
(
min
=
1
,
max
=
2000
)
public
String
getParentIds
()
{
public
String
getParentIds
()
{
if
(
parentIds
==
null
)
parentIds
=
"0,"
;
if
(
parentIds
==
null
)
{
parentIds
=
"0,"
;
}
return
parentIds
;
return
parentIds
;
}
}
...
@@ -137,9 +139,11 @@ public class Menu extends AbstractBaseEntity<Menu> {
...
@@ -137,9 +139,11 @@ public class Menu extends AbstractBaseEntity<Menu> {
if
(
children
==
null
||
children
.
size
()
==
0
){
if
(
children
==
null
||
children
.
size
()
==
0
){
return
false
;
return
false
;
}
}
if
(
children
.
toString
().
contains
(
"查看"
))
return
false
;
if
(
children
.
toString
().
contains
(
"查看"
))
{
return
false
;
}
for
(
Menu
child:
children
){
for
(
Menu
child:
children
){
if
(
child
.
getIsShow
()
.
equals
(
"1"
)){
if
(
"1"
.
equals
(
child
.
getIsShow
())){
return
true
;
return
true
;
}
}
}
}
...
@@ -149,8 +153,9 @@ public class Menu extends AbstractBaseEntity<Menu> {
...
@@ -149,8 +153,9 @@ public class Menu extends AbstractBaseEntity<Menu> {
public
boolean
hasPermisson
(){
public
boolean
hasPermisson
(){
List
<
Menu
>
menuList
=
UserUtils
.
getMenuList
();
List
<
Menu
>
menuList
=
UserUtils
.
getMenuList
();
for
(
Menu
menu:
menuList
){
for
(
Menu
menu:
menuList
){
if
(
menu
.
getId
().
equals
(
this
.
getId
()))
if
(
menu
.
getId
().
equals
(
this
.
getId
()))
{
return
true
;
return
true
;
}
}
}
return
false
;
return
false
;
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/Office.java
View file @
7fa8137a
...
@@ -82,11 +82,13 @@ public class Office extends TreeEntity<Office> {
...
@@ -82,11 +82,13 @@ public class Office extends TreeEntity<Office> {
// @JsonBackReference
// @JsonBackReference
// @NotNull
// @NotNull
public
Office
getParent
()
{
@Override
public
Office
getParent
()
{
return
parent
;
return
parent
;
}
}
public
void
setParent
(
Office
parent
)
{
@Override
public
void
setParent
(
Office
parent
)
{
this
.
parent
=
parent
;
this
.
parent
=
parent
;
}
}
//
//
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/SysConfigTree.java
View file @
7fa8137a
...
@@ -76,20 +76,24 @@ public class SysConfigTree extends TreeEntity<SysConfigTree> {
...
@@ -76,20 +76,24 @@ public class SysConfigTree extends TreeEntity<SysConfigTree> {
}
}
//@JsonBackReference
//@JsonBackReference
public
SysConfigTree
getParent
()
{
@Override
public
SysConfigTree
getParent
()
{
return
parent
;
return
parent
;
}
}
public
void
setParent
(
SysConfigTree
parent
)
{
@Override
public
void
setParent
(
SysConfigTree
parent
)
{
this
.
parent
=
parent
;
this
.
parent
=
parent
;
}
}
@Length
(
min
=
0
,
max
=
2000
,
message
=
"所有父级编号长度必须介于 0 和 2000 之间"
)
@Override
@Length
(
min
=
0
,
max
=
2000
,
message
=
"所有父级编号长度必须介于 0 和 2000 之间"
)
public
String
getParentIds
()
{
public
String
getParentIds
()
{
return
parentIds
;
return
parentIds
;
}
}
public
void
setParentIds
(
String
parentIds
)
{
@Override
public
void
setParentIds
(
String
parentIds
)
{
this
.
parentIds
=
parentIds
;
this
.
parentIds
=
parentIds
;
}
}
...
@@ -134,7 +138,8 @@ public class SysConfigTree extends TreeEntity<SysConfigTree> {
...
@@ -134,7 +138,8 @@ public class SysConfigTree extends TreeEntity<SysConfigTree> {
this
.
endUpdateDate
=
endUpdateDate
;
this
.
endUpdateDate
=
endUpdateDate
;
}
}
public
String
getParentId
()
{
@Override
public
String
getParentId
()
{
return
parent
!=
null
&&
parent
.
getId
()
!=
null
?
parent
.
getId
()
:
"0"
;
return
parent
!=
null
&&
parent
.
getId
()
!=
null
?
parent
.
getId
()
:
"0"
;
}
}
}
}
\ No newline at end of file
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/SysDictTree.java
View file @
7fa8137a
...
@@ -84,21 +84,25 @@ public class SysDictTree extends TreeEntity<SysDictTree> {
...
@@ -84,21 +84,25 @@ public class SysDictTree extends TreeEntity<SysDictTree> {
//this.sort = sort;
//this.sort = sort;
//}
//}
@JsonBackReference
@Override
@JsonBackReference
public
SysDictTree
getParent
()
{
public
SysDictTree
getParent
()
{
return
parent
;
return
parent
;
}
}
public
void
setParent
(
SysDictTree
parent
)
{
@Override
public
void
setParent
(
SysDictTree
parent
)
{
this
.
parent
=
parent
;
this
.
parent
=
parent
;
}
}
@Length
(
min
=
0
,
max
=
2000
,
message
=
"所有父级编号长度必须介于 0 和 2000 之间"
)
@Override
@Length
(
min
=
0
,
max
=
2000
,
message
=
"所有父级编号长度必须介于 0 和 2000 之间"
)
public
String
getParentIds
()
{
public
String
getParentIds
()
{
return
parentIds
;
return
parentIds
;
}
}
public
void
setParentIds
(
String
parentIds
)
{
@Override
public
void
setParentIds
(
String
parentIds
)
{
this
.
parentIds
=
parentIds
;
this
.
parentIds
=
parentIds
;
}
}
...
@@ -143,7 +147,8 @@ public class SysDictTree extends TreeEntity<SysDictTree> {
...
@@ -143,7 +147,8 @@ public class SysDictTree extends TreeEntity<SysDictTree> {
this
.
endUpdateDate
=
endUpdateDate
;
this
.
endUpdateDate
=
endUpdateDate
;
}
}
public
String
getParentId
()
{
@Override
public
String
getParentId
()
{
return
parent
!=
null
&&
parent
.
getId
()
!=
null
?
parent
.
getId
()
:
"0"
;
return
parent
!=
null
&&
parent
.
getId
()
!=
null
?
parent
.
getId
()
:
"0"
;
}
}
}
}
\ No newline at end of file
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/entity/User.java
View file @
7fa8137a
...
@@ -88,7 +88,8 @@ public class User extends AbstractBaseEntity<User> {
...
@@ -88,7 +88,8 @@ public class User extends AbstractBaseEntity<User> {
}
}
//SupCol(isUnique="true", isHide="true")
//SupCol(isUnique="true", isHide="true")
@ExcelField
(
title
=
"ID"
,
type
=
1
,
align
=
2
,
sort
=
1
)
@Override
@ExcelField
(
title
=
"ID"
,
type
=
1
,
align
=
2
,
sort
=
1
)
public
String
getId
()
{
public
String
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -186,7 +187,8 @@ public class User extends AbstractBaseEntity<User> {
...
@@ -186,7 +187,8 @@ public class User extends AbstractBaseEntity<User> {
this
.
mobile
=
mobile
;
this
.
mobile
=
mobile
;
}
}
@ExcelField
(
title
=
"备注"
,
align
=
1
,
sort
=
900
)
@Override
@ExcelField
(
title
=
"备注"
,
align
=
1
,
sort
=
900
)
public
String
getRemarks
()
{
public
String
getRemarks
()
{
return
remarks
;
return
remarks
;
}
}
...
@@ -201,7 +203,8 @@ public class User extends AbstractBaseEntity<User> {
...
@@ -201,7 +203,8 @@ public class User extends AbstractBaseEntity<User> {
this
.
userType
=
userType
;
this
.
userType
=
userType
;
}
}
@ExcelField
(
title
=
"创建时间"
,
type
=
0
,
align
=
1
,
sort
=
90
)
@Override
@ExcelField
(
title
=
"创建时间"
,
type
=
0
,
align
=
1
,
sort
=
90
)
public
Date
getCreateDate
()
{
public
Date
getCreateDate
()
{
return
createDate
;
return
createDate
;
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/interceptor/LogInterceptor.java
View file @
7fa8137a
...
@@ -42,9 +42,10 @@ public class LogInterceptor extends AbstractService implements HandlerIntercepto
...
@@ -42,9 +42,10 @@ public class LogInterceptor extends AbstractService implements HandlerIntercepto
@Override
@Override
public
void
afterCompletion
(
HttpServletRequest
request
,
HttpServletResponse
response
,
public
void
afterCompletion
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
,
Exception
ex
)
throws
Exception
{
Object
handler
,
Exception
ex
)
throws
Exception
{
if
(!
"/error"
.
equals
(
request
.
getRequestURI
()))
if
(!
"/error"
.
equals
(
request
.
getRequestURI
()))
{
logger
.
info
(
"URI: {},耗时:{} "
,
request
.
getRequestURI
()+
"-"
+
request
.
getMethod
()
logger
.
info
(
"URI: {},耗时:{} "
,
request
.
getRequestURI
()
+
"-"
+
request
.
getMethod
()
,
DateUtils
.
formatDateTime
(
System
.
currentTimeMillis
()
-
startTimeThreadLocal
.
get
()));
,
DateUtils
.
formatDateTime
(
System
.
currentTimeMillis
()
-
startTimeThreadLocal
.
get
()));
}
//删除线程变量中的数据,防止内存泄漏
//删除线程变量中的数据,防止内存泄漏
startTimeThreadLocal
.
remove
();
startTimeThreadLocal
.
remove
();
// 保存日志
// 保存日志
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/interceptor/LogThread.java
View file @
7fa8137a
...
@@ -64,13 +64,17 @@ public class LogThread extends Thread {
...
@@ -64,13 +64,17 @@ public class LogThread extends Thread {
}
}
// 如果有异常,设置异常信息
// 如果有异常,设置异常信息
//log.setException(Exceptions.getStackTraceAsString(ex));
//log.setException(Exceptions.getStackTraceAsString(ex));
if
(
ex
!=
null
)
if
(
ex
!=
null
)
{
log
.
setException
(
ex
.
getMessage
());
log
.
setException
(
ex
.
getMessage
());
}
// 如果无标题并无异常日志,则不保存信息
// 如果无标题并无异常日志,则不保存信息
if
(
StringUtils
.
isBlank
(
log
.
getTitle
())
&&
StringUtils
.
isBlank
(
log
.
getException
()))
if
(
StringUtils
.
isBlank
(
log
.
getTitle
())
&&
StringUtils
.
isBlank
(
log
.
getException
()))
{
continue
;
continue
;
}
log
.
setId
(
UUID
.
randomUUID
().
toString
());
log
.
setId
(
UUID
.
randomUUID
().
toString
());
if
(
log
.
getParams
()!=
null
&&
log
.
getParams
().
length
()>=
500
)
log
.
setParams
(
log
.
getParams
().
substring
(
0
,
200
));
if
(
log
.
getParams
()!=
null
&&
log
.
getParams
().
length
()>=
500
)
{
log
.
setParams
(
log
.
getParams
().
substring
(
0
,
200
));
}
logDao
.
insert
(
log
);
logDao
.
insert
(
log
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
System
.
out
);
e
.
printStackTrace
(
System
.
out
);
...
@@ -123,11 +127,13 @@ public class LogThread extends Thread {
...
@@ -123,11 +127,13 @@ public class LogThread extends Thread {
if
(
menuNamePath
==
null
)
{
if
(
menuNamePath
==
null
)
{
for
(
String
p
:
StringUtils
.
split
(
permission
))
{
for
(
String
p
:
StringUtils
.
split
(
permission
))
{
menuNamePath
=
menuMap
.
get
(
p
);
menuNamePath
=
menuMap
.
get
(
p
);
if
(
StringUtils
.
isNotBlank
(
menuNamePath
))
if
(
StringUtils
.
isNotBlank
(
menuNamePath
))
{
break
;
break
;
}
}
}
if
(
menuNamePath
==
null
)
if
(
menuNamePath
==
null
)
{
return
""
;
return
""
;
}
}
}
return
menuNamePath
;
return
menuNamePath
;
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/interceptor/WebInterceptorConfigurer.java
View file @
7fa8137a
...
@@ -28,6 +28,7 @@ public class WebInterceptorConfigurer extends WebMvcConfigurerAdapter{
...
@@ -28,6 +28,7 @@ public class WebInterceptorConfigurer extends WebMvcConfigurerAdapter{
@Autowired
@Autowired
private
LogThread
logThread
;
private
LogThread
logThread
;
@Override
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
registry
.
addInterceptor
(
logInterceptor
).
addPathPatterns
(
"/**"
);
registry
.
addInterceptor
(
logInterceptor
).
addPathPatterns
(
"/**"
);
super
.
addInterceptors
(
registry
);
super
.
addInterceptors
(
registry
);
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/rest/SysConfigRestController.java
View file @
7fa8137a
...
@@ -238,7 +238,7 @@ public class SysConfigRestController extends AbstractBaseController {
...
@@ -238,7 +238,7 @@ public class SysConfigRestController extends AbstractBaseController {
@ApiOperation
(
value
=
"批量删除系统配置(Content-Type为text/html)"
,
notes
=
"批量删除系统配置(Content-Type为text/html)"
)
@ApiOperation
(
value
=
"批量删除系统配置(Content-Type为text/html)"
,
notes
=
"批量删除系统配置(Content-Type为text/html)"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"query"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"query"
)
public
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
public
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysConfigService
.
delete
(
sysConfigService
.
get
(
id
));
sysConfigService
.
delete
(
sysConfigService
.
get
(
id
));
}
}
...
@@ -253,7 +253,7 @@ public class SysConfigRestController extends AbstractBaseController {
...
@@ -253,7 +253,7 @@ public class SysConfigRestController extends AbstractBaseController {
@ApiOperation
(
value
=
"逻辑批量删除系统配置(Content-Type为text/html)"
,
notes
=
"逻辑批量删除系统配置(Content-Type为text/html)"
)
@ApiOperation
(
value
=
"逻辑批量删除系统配置(Content-Type为text/html)"
,
notes
=
"逻辑批量删除系统配置(Content-Type为text/html)"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"query"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"query"
)
public
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
public
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysConfigService
.
deleteByLogic
(
sysConfigService
.
get
(
id
));
sysConfigService
.
deleteByLogic
(
sysConfigService
.
get
(
id
));
}
}
...
@@ -265,7 +265,7 @@ public class SysConfigRestController extends AbstractBaseController {
...
@@ -265,7 +265,7 @@ public class SysConfigRestController extends AbstractBaseController {
@ApiOperation
(
value
=
"批量删除系统配置(Content-Type为application/json)"
,
notes
=
"批量删除系统配置(Content-Type为application/json)"
)
@ApiOperation
(
value
=
"批量删除系统配置(Content-Type为application/json)"
,
notes
=
"批量删除系统配置(Content-Type为application/json)"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"body"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"body"
)
public
Result
deleteAllJson
(
@RequestBody
String
ids
,
RedirectAttributes
redirectAttributes
)
{
public
Result
deleteAllJson
(
@RequestBody
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysConfigService
.
delete
(
sysConfigService
.
get
(
id
));
sysConfigService
.
delete
(
sysConfigService
.
get
(
id
));
}
}
...
@@ -280,7 +280,7 @@ public class SysConfigRestController extends AbstractBaseController {
...
@@ -280,7 +280,7 @@ public class SysConfigRestController extends AbstractBaseController {
@ApiOperation
(
value
=
"逻辑批量删除系统配置(Content-Type为application/json)"
,
notes
=
"逻辑批量删除系统配置(Content-Type为application/json)"
)
@ApiOperation
(
value
=
"逻辑批量删除系统配置(Content-Type为application/json)"
,
notes
=
"逻辑批量删除系统配置(Content-Type为application/json)"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"body"
)
@ApiImplicitParam
(
name
=
"ids"
,
value
=
"系统配置ids,用,隔开"
,
required
=
false
,
dataType
=
"String"
,
paramType
=
"body"
)
public
Result
deleteAllByLogicJson
(
@RequestBody
String
ids
,
RedirectAttributes
redirectAttributes
)
{
public
Result
deleteAllByLogicJson
(
@RequestBody
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysConfigService
.
deleteByLogic
(
sysConfigService
.
get
(
id
));
sysConfigService
.
deleteByLogic
(
sysConfigService
.
get
(
id
));
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/rest/SysUserOnlineRestController.java
View file @
7fa8137a
...
@@ -261,7 +261,7 @@ public class SysUserOnlineRestController extends AbstractBaseController {
...
@@ -261,7 +261,7 @@ public class SysUserOnlineRestController extends AbstractBaseController {
}
}
private
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
private
Result
deleteAll
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysUserOnlineService
.
delete
(
sysUserOnlineService
.
get
(
id
));
sysUserOnlineService
.
delete
(
sysUserOnlineService
.
get
(
id
));
}
}
...
@@ -290,7 +290,7 @@ public class SysUserOnlineRestController extends AbstractBaseController {
...
@@ -290,7 +290,7 @@ public class SysUserOnlineRestController extends AbstractBaseController {
}
}
private
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
private
Result
deleteAllByLogic
(
String
ids
,
RedirectAttributes
redirectAttributes
)
{
String
idArray
[]
=
ids
.
split
(
","
);
String
[]
idArray
=
ids
.
split
(
","
);
for
(
String
id
:
idArray
){
for
(
String
id
:
idArray
){
sysUserOnlineService
.
deleteByLogic
(
sysUserOnlineService
.
get
(
id
));
sysUserOnlineService
.
deleteByLogic
(
sysUserOnlineService
.
get
(
id
));
}
}
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/AreaService.java
View file @
7fa8137a
...
@@ -26,13 +26,15 @@ public class AreaService extends TreeService<AreaDao, Area> {
...
@@ -26,13 +26,15 @@ public class AreaService extends TreeService<AreaDao, Area> {
return
UserUtils
.
getAreaList
();
return
UserUtils
.
getAreaList
();
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
save
(
Area
area
)
{
public
void
save
(
Area
area
)
{
super
.
save
(
area
);
super
.
save
(
area
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_AREA_LIST
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_AREA_LIST
);
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
delete
(
Area
area
)
{
public
void
delete
(
Area
area
)
{
super
.
delete
(
area
);
super
.
delete
(
area
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_AREA_LIST
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_AREA_LIST
);
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/DictService.java
View file @
7fa8137a
...
@@ -31,13 +31,15 @@ public class DictService extends AbstractBaseService<DictDao, Dict> {
...
@@ -31,13 +31,15 @@ public class DictService extends AbstractBaseService<DictDao, Dict> {
return
dao
.
findTypeList
(
new
Dict
());
return
dao
.
findTypeList
(
new
Dict
());
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
save
(
Dict
dict
)
{
public
void
save
(
Dict
dict
)
{
super
.
save
(
dict
);
super
.
save
(
dict
);
CacheUtils
.
remove
(
DictUtils
.
CACHE_DICT_MAP
);
CacheUtils
.
remove
(
DictUtils
.
CACHE_DICT_MAP
);
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
delete
(
Dict
dict
)
{
public
void
delete
(
Dict
dict
)
{
super
.
delete
(
dict
);
super
.
delete
(
dict
);
CacheUtils
.
remove
(
DictUtils
.
CACHE_DICT_MAP
);
CacheUtils
.
remove
(
DictUtils
.
CACHE_DICT_MAP
);
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/LogService.java
View file @
7fa8137a
...
@@ -25,7 +25,8 @@ public class LogService extends AbstractBaseService<LogDao, Log> {
...
@@ -25,7 +25,8 @@ public class LogService extends AbstractBaseService<LogDao, Log> {
@Autowired
@Autowired
private
LogDao
logDao
;
private
LogDao
logDao
;
public
Page
<
Log
>
findPage
(
Page
<
Log
>
page
,
Log
log
)
{
@Override
public
Page
<
Log
>
findPage
(
Page
<
Log
>
page
,
Log
log
)
{
// 设置默认时间范围,默认当前月
// 设置默认时间范围,默认当前月
if
(
log
.
getBeginDate
()
==
null
){
if
(
log
.
getBeginDate
()
==
null
){
...
...
JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/OfficeService.java
View file @
7fa8137a
...
@@ -34,7 +34,8 @@ public class OfficeService extends TreeService<OfficeDao, Office> {
...
@@ -34,7 +34,8 @@ public class OfficeService extends TreeService<OfficeDao, Office> {
}
}
}
}
@Transactional
(
readOnly
=
true
)
@Override
@Transactional
(
readOnly
=
true
)
public
List
<
Office
>
findList
(
Office
office
){
public
List
<
Office
>
findList
(
Office
office
){
office
.
setParentIds
(
office
.
getParentIds
()+
"%"
);
office
.
setParentIds
(
office
.
getParentIds
()+
"%"
);
return
dao
.
findByParentIdsLike
(
office
);
return
dao
.
findByParentIdsLike
(
office
);
...
@@ -46,13 +47,15 @@ public class OfficeService extends TreeService<OfficeDao, Office> {
...
@@ -46,13 +47,15 @@ public class OfficeService extends TreeService<OfficeDao, Office> {
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
save
(
Office
office
)
{
public
void
save
(
Office
office
)
{
super
.
save
(
office
);
super
.
save
(
office
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_OFFICE_LIST
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_OFFICE_LIST
);
}
}
@Transactional
(
readOnly
=
false
)
@Override
@Transactional
(
readOnly
=
false
)
public
void
delete
(
Office
office
)
{
public
void
delete
(
Office
office
)
{
super
.
delete
(
office
);
super
.
delete
(
office
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_OFFICE_LIST
);
UserUtils
.
removeCache
(
UserUtils
.
CACHE_OFFICE_LIST
);
...
...
Prev
1
…
3
4
5
6
7
8
9
10
11
Next
Write
Preview
Supports
Markdown
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