Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
manager
Commits
b6cacf5a
Commit
b6cacf5a
authored
Jun 07, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adi
parent
8114d630
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
32 deletions
+45
-32
workspace.xml
.idea/workspace.xml
+0
-0
ADIAccountController.java
src/main/java/adi/controller/ADIAccountController.java
+4
-4
UserController.java
src/main/java/common/controller/UserController.java
+8
-8
TkioAccountController.java
src/main/java/tkio/controller/TkioAccountController.java
+7
-7
TrackAccountController.java
src/main/java/track/controller/TrackAccountController.java
+6
-6
IoAccountController.java
src/main/java/userio/controller/IoAccountController.java
+7
-7
UserLogThread.java
src/main/java/util/UserLogThread.java
+13
-0
No files found.
.idea/workspace.xml
View file @
b6cacf5a
This diff is collapsed.
Click to expand it.
src/main/java/adi/controller/ADIAccountController.java
View file @
b6cacf5a
...
...
@@ -45,7 +45,7 @@ public class ADIAccountController {
@ResponseBody
public
ResultModel
updateSale
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
email
,
@RequestParam
String
accountEmail
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
()
,
"adi"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
updateSale
(
email
,
accountEmail
));
}
...
...
@@ -80,7 +80,7 @@ public class ADIAccountController {
@RequestMapping
(
value
=
"/forbidenpress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbidenPress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"adi"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbidenPress
(
loginAccount
,
resource
));
}
...
...
@@ -89,7 +89,7 @@ public class ADIAccountController {
@RequestMapping
(
value
=
"/enablepress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enablePress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"adi"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enablePress
(
loginAccount
,
resource
));
}
...
...
@@ -100,7 +100,7 @@ public class ADIAccountController {
@RequestMapping
(
value
=
"/visit"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
visit
(
@CurrentAccount
User
loginAccount
,
@RequestBody
BackVisit
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
()
,
"adi"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
visit
(
loginAccount
,
resource
));
}
...
...
src/main/java/common/controller/UserController.java
View file @
b6cacf5a
...
...
@@ -53,7 +53,7 @@ public class UserController {
public
ResultModel
create
(
@CurrentAccount
User
loginAccount
,
@RequestBody
User
resource
,
HttpServletRequest
request
)
{
if
(
userService
.
validEmail
(
resource
.
getEmail
())){
userService
.
create
(
loginAccount
,
resource
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
resource
.
getEmail
(),
"创建系统账号"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
resource
.
getEmail
(),
"创建系统账号"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
true
);
}
else
{
...
...
@@ -64,7 +64,7 @@ public class UserController {
@RequestMapping
(
value
=
"/update"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
update
(
@CurrentAccount
User
loginAccount
,
@RequestBody
User
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
resource
.
getEmail
(),
"修改系统账号"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
resource
.
getEmail
(),
"修改系统账号"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
userService
.
update
(
loginAccount
,
resource
));
}
...
...
@@ -97,7 +97,7 @@ public class UserController {
@ResponseBody
public
ResultModel
delete
(
@CurrentAccount
User
loginAccount
,
@PathVariable
Long
id
,
HttpServletRequest
request
)
{
User
user
=
userService
.
delete
(
loginAccount
,
id
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"删除系统账号"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"删除系统账号"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
user
);
}
...
...
@@ -106,7 +106,7 @@ public class UserController {
@ResponseBody
public
ResultModel
enable
(
@CurrentAccount
User
loginAccount
,
@PathVariable
Long
id
,
HttpServletRequest
request
)
{
User
user
=
userService
.
enable
(
loginAccount
,
id
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"启用系统账号"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"启用系统账号"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
user
);
}
...
...
@@ -115,7 +115,7 @@ public class UserController {
@ResponseBody
public
ResultModel
forbiden
(
@CurrentAccount
User
loginAccount
,
@PathVariable
Long
id
,
HttpServletRequest
request
)
{
User
user
=
userService
.
forbiden
(
loginAccount
,
id
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"停用系统账号"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"停用系统账号"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
user
);
}
...
...
@@ -126,7 +126,7 @@ public class UserController {
User
login
=
userRepository
.
login
(
name
);
if
(
null
==
login
){
User
user
=
userService
.
updateName
(
loginAccount
,
name
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"修改系统账号名字"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"修改系统账号名字"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
true
);
}
else
{
...
...
@@ -141,7 +141,7 @@ public class UserController {
User
login
=
userRepository
.
login
(
loginAccount
.
getEmail
(),
CipherUtil
.
generatePassword
(
oldpwd
));
if
(
null
!=
login
){
User
user
=
userService
.
updatePwd
(
loginAccount
,
pwd
);
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"修改系统账号密码"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
user
.
getEmail
(),
"修改系统账号密码"
,
request
,
loginAccount
.
getRole
()
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
true
);
}
else
{
...
...
@@ -153,7 +153,7 @@ public class UserController {
@RequestMapping
(
value
=
"/update/pwd"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updatePwd
(
@RequestParam
String
email
,
@RequestParam
String
pwd
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
email
,
email
,
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
email
,
"修改系统账号密码"
,
request
,
null
);
UserLogThread
userlog
=
new
UserLogThread
(
email
,
email
,
OperateObjectTypeEnum
.
INNERUSER
.
getKey
(),
email
,
"修改系统账号密码"
,
request
,
null
,
"manager"
);
userlog
.
start
();
return
ResultModel
.
OK
(
userService
.
updatePwd
(
email
,
pwd
));
}
...
...
src/main/java/tkio/controller/TkioAccountController.java
View file @
b6cacf5a
...
...
@@ -37,7 +37,7 @@ public class TkioAccountController {
@ResponseBody
public
ResultModel
updateSale
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
email
,
@RequestParam
String
accountEmail
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
updateSale
(
email
,
accountEmail
));
}
...
...
@@ -68,7 +68,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/forbiden"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbiden
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbiden
(
loginAccount
,
resource
));
}
...
...
@@ -77,7 +77,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/enable"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enable
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enable
(
loginAccount
,
resource
));
}
...
...
@@ -86,7 +86,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/forbidenpress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbidenPress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭缴费状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭缴费状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
tkioAccountService
.
forbidenPress
(
loginAccount
,
resource
);
return
ResultModel
.
OK
();
...
...
@@ -96,7 +96,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/enablepress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enablePress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启缴费状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启缴费状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enablePress
(
loginAccount
,
resource
));
}
...
...
@@ -105,7 +105,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/pay"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
pay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Payment
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
pay
(
loginAccount
,
resource
));
}
...
...
@@ -114,7 +114,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/visit"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
visit
(
@CurrentAccount
User
loginAccount
,
@RequestBody
BackVisit
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
()
,
"tkio"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
visit
(
loginAccount
,
resource
));
}
...
...
src/main/java/track/controller/TrackAccountController.java
View file @
b6cacf5a
...
...
@@ -44,7 +44,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/forbiden"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbiden
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭到期提醒"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭到期提醒"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbiden
(
loginAccount
,
resource
));
}
...
...
@@ -53,7 +53,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/enable"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enable
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启到期提醒"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启到期提醒"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enable
(
loginAccount
,
resource
));
}
...
...
@@ -62,7 +62,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/forbidenpress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbidenPress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbidenPress
(
loginAccount
,
resource
));
}
...
...
@@ -71,7 +71,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/enablepress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enablePress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enablePress
(
loginAccount
,
resource
));
}
...
...
@@ -80,7 +80,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/pay"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
pay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Payment
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
pay
(
loginAccount
,
resource
));
}
...
...
@@ -89,7 +89,7 @@ public class TrackAccountController {
@RequestMapping
(
value
=
"/visit"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
visit
(
@CurrentAccount
User
loginAccount
,
@RequestBody
BackVisit
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
()
,
"track"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
visit
(
loginAccount
,
resource
));
}
...
...
src/main/java/userio/controller/IoAccountController.java
View file @
b6cacf5a
...
...
@@ -36,7 +36,7 @@ public class IoAccountController {
@ResponseBody
public
ResultModel
updateSale
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
email
,
@RequestParam
String
accountEmail
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
updateSale
(
email
,
accountEmail
));
}
...
...
@@ -68,7 +68,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/forbiden"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbiden
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbiden
(
loginAccount
,
resource
));
}
...
...
@@ -77,7 +77,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/enable"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enable
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Reminder
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enable
(
loginAccount
,
resource
));
}
...
...
@@ -86,7 +86,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/forbidenpress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbidenPress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
forbidenPress
(
loginAccount
,
resource
));
}
...
...
@@ -95,7 +95,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/enablepress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enablePress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启异常状态跟进"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enablePress
(
loginAccount
,
resource
));
}
...
...
@@ -104,7 +104,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/pay"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
pay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Payment
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"缴费"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
pay
(
loginAccount
,
resource
));
}
...
...
@@ -113,7 +113,7 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/visit"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
visit
(
@CurrentAccount
User
loginAccount
,
@RequestBody
BackVisit
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"回访"
,
request
,
loginAccount
.
getRole
()
,
"io"
);
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
visit
(
loginAccount
,
resource
));
}
...
...
src/main/java/util/UserLogThread.java
View file @
b6cacf5a
...
...
@@ -41,6 +41,18 @@ public class UserLogThread
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
* userlog.start();
*/
public
UserLogThread
(
String
operaAccount
,
String
accountName
,
String
operateObjectType
,
String
operateObject
,
String
operateType
,
HttpServletRequest
request
,
Long
role
,
String
platform
)
{
this
.
operaAccount
=
operaAccount
;
this
.
accountName
=
accountName
;
this
.
operateObjectType
=
operateObjectType
;
this
.
operateObject
=
operateObject
;
this
.
operateType
=
operateType
;
this
.
request
=
request
;
this
.
role
=
role
;
this
.
platfrom
=
platform
;
}
public
UserLogThread
(
String
operaAccount
,
String
accountName
,
String
operateObjectType
,
String
operateObject
,
String
operateType
,
HttpServletRequest
request
,
Long
role
)
{
this
.
operaAccount
=
operaAccount
;
...
...
@@ -66,6 +78,7 @@ public class UserLogThread
audit
.
setOperateTime
(
DateUtil
.
format
(
new
Date
(),
DateUtil
.
C_TIME_PATTON_DEFAULT
));
audit
.
setOperateType
(
this
.
operateType
);
audit
.
setRole
(
this
.
role
);
audit
.
setPlatfrom
(
this
.
platfrom
);
if
(
this
.
request
!=
null
)
{
String
ipAddr
=
IPAddrUtil
.
getIpAddrNew
(
request
);
...
...
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