Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
T
tcm-system
Project
Project
Details
Activity
Releases
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
TCM
tcm-system
Commits
559f8357
Commit
559f8357
authored
Aug 28, 2022
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
命令
parent
2515ac26
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
UserController.java
...com/pangding/web/authority/controller/UserController.java
+1
-1
NewCompanyServiceImpl.java
...authority/service/company/impl/NewCompanyServiceImpl.java
+2
-2
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+2
-2
DeviceServiceImpl.java
...angding/web/authority/service/impl/DeviceServiceImpl.java
+1
-1
UserServiceImpl.java
.../pangding/web/authority/service/impl/UserServiceImpl.java
+3
-3
No files found.
src/main/java/com/pangding/web/authority/controller/UserController.java
View file @
559f8357
...
@@ -84,7 +84,7 @@ public class UserController {
...
@@ -84,7 +84,7 @@ public class UserController {
}
}
return
ResponseResult
.
result
(
userServiceImpl
.
updateUser
(
webUserReqVo
));
return
ResponseResult
.
result
(
userServiceImpl
.
updateUser
(
webUserReqVo
));
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
return
ResponseResult
.
error
(
"99"
,
e
.
getMessage
());
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
e
.
getMessage
());
}
}
}
}
...
...
src/main/java/com/pangding/web/authority/service/company/impl/NewCompanyServiceImpl.java
View file @
559f8357
...
@@ -121,7 +121,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
...
@@ -121,7 +121,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getCompanyVo
().
getId
(),
CompanyResVo
.
class
);
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getCompanyVo
().
getId
(),
CompanyResVo
.
class
);
if
(
StringHelper
.
isEmpty
(
companyResVo
))
{
if
(
StringHelper
.
isEmpty
(
companyResVo
))
{
// 公司信息为空
// 公司信息为空
return
ResponseResult
.
error
(
"99"
,
"注册信息有误"
);
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
"注册信息有误"
);
}
}
// ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
// ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
// companyResVo.setAddress(req.getCompanyVo().getAddress());
// companyResVo.setAddress(req.getCompanyVo().getAddress());
...
@@ -175,7 +175,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
...
@@ -175,7 +175,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
// 错误信息为空,发送验证码成功 修改信息成功
// 错误信息为空,发送验证码成功 修改信息成功
return
responseResult
;
return
responseResult
;
}
else
{
}
else
{
return
ResponseResult
.
error
(
"99"
,
saveCompanyReqVo
.
getErrorMessage
());
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
saveCompanyReqVo
.
getErrorMessage
());
}
}
}
}
...
...
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
559f8357
...
@@ -1341,7 +1341,7 @@ public class CompanyServiceImpl implements CompanyService {
...
@@ -1341,7 +1341,7 @@ public class CompanyServiceImpl implements CompanyService {
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getCompanyVo
().
getId
(),
CompanyResVo
.
class
);
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getCompanyVo
().
getId
(),
CompanyResVo
.
class
);
if
(
StringHelper
.
isEmpty
(
companyResVo
))
{
if
(
StringHelper
.
isEmpty
(
companyResVo
))
{
// 公司信息为空
// 公司信息为空
return
ResponseResult
.
error
(
"99"
,
"注册信息有误"
);
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
"注册信息有误"
);
}
}
ObjectHelper
.
writeWithFrom
(
companyResVo
,
req
.
getCompanyVo
());
ObjectHelper
.
writeWithFrom
(
companyResVo
,
req
.
getCompanyVo
());
companyResVo
.
setAddress
(
req
.
getCompanyVo
().
getAddress
());
companyResVo
.
setAddress
(
req
.
getCompanyVo
().
getAddress
());
...
@@ -1445,7 +1445,7 @@ public class CompanyServiceImpl implements CompanyService {
...
@@ -1445,7 +1445,7 @@ public class CompanyServiceImpl implements CompanyService {
// 错误信息为空,发送验证码成功 修改信息成功
// 错误信息为空,发送验证码成功 修改信息成功
return
responseResult
;
return
responseResult
;
}
else
{
}
else
{
return
ResponseResult
.
error
(
"99"
,
saveCompanyReqVo
.
getErrorMessage
());
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
saveCompanyReqVo
.
getErrorMessage
());
}
}
}
}
...
...
src/main/java/com/pangding/web/authority/service/impl/DeviceServiceImpl.java
View file @
559f8357
...
@@ -64,7 +64,7 @@ public class DeviceServiceImpl implements DeviceService {
...
@@ -64,7 +64,7 @@ public class DeviceServiceImpl implements DeviceService {
public
ResponseResult
<
DeviceVo
>
updateDevice
(
DeviceReqVo
req
)
{
public
ResponseResult
<
DeviceVo
>
updateDevice
(
DeviceReqVo
req
)
{
DeviceVo
deviceVo
=
deviceDao
.
load
(
req
.
getDeviceId
(),
DeviceVo
.
class
);
DeviceVo
deviceVo
=
deviceDao
.
load
(
req
.
getDeviceId
(),
DeviceVo
.
class
);
if
(
StringHelper
.
isEmpty
(
deviceVo
))
{
if
(
StringHelper
.
isEmpty
(
deviceVo
))
{
return
ResponseResult
.
error
(
"99"
,
"设备编号有误"
);
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
"设备编号有误"
);
}
}
ObjectHelper
.
writeWithFrom
(
deviceVo
,
req
);
ObjectHelper
.
writeWithFrom
(
deviceVo
,
req
);
deviceDao
.
update
(
deviceVo
);
deviceDao
.
update
(
deviceVo
);
...
...
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @
559f8357
...
@@ -201,14 +201,14 @@ public class UserServiceImpl implements UserService {
...
@@ -201,14 +201,14 @@ public class UserServiceImpl implements UserService {
UserVo
userVo
=
userDao
.
load
(
userReqVo
,
UserVo
.
class
);
UserVo
userVo
=
userDao
.
load
(
userReqVo
,
UserVo
.
class
);
if
(!
StringHelper
.
isEmpty
(
userVo
))
{
if
(!
StringHelper
.
isEmpty
(
userVo
))
{
// 用户名已存在
// 用户名已存在
return
ResponseResult
.
error
(
"99"
,
"该用户名已存在"
);
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
"该用户名已存在"
);
}
}
try
{
try
{
/*将RSA加密后的密码解密*/
/*将RSA加密后的密码解密*/
String
password
=
saveUserReqVo
.
getPassword
();
//RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
String
password
=
saveUserReqVo
.
getPassword
();
//RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
String
confirmPassword
=
saveUserReqVo
.
getConfirmPassword
();
//RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
String
confirmPassword
=
saveUserReqVo
.
getConfirmPassword
();
//RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
if
(!
StringHelper
.
compare
(
password
,
confirmPassword
))
{
if
(!
StringHelper
.
compare
(
password
,
confirmPassword
))
{
return
ResponseResult
.
error
(
"99"
,
"两次填写的密码不相等"
);
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
"两次填写的密码不相等"
);
}
}
// 验证邀请码是否正确 todo 关联码怎么判断
// 验证邀请码是否正确 todo 关联码怎么判断
...
@@ -289,7 +289,7 @@ public class UserServiceImpl implements UserService {
...
@@ -289,7 +289,7 @@ public class UserServiceImpl implements UserService {
}
}
return
ResponseResult
.
result
(
"注册成功"
);
return
ResponseResult
.
result
(
"注册成功"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
return
ResponseResult
.
error
(
"99"
,
e
.
getMessage
());
return
(
ResponseResult
)
ResponseResult
.
error
(
"99"
,
e
.
getMessage
());
}
}
}
}
...
...
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