Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fangyeqing
/
xkl-interface
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
zhaoyue
8 years ago
Commit
d1b9ea7e45c480c8daf9d7735f3f40506aa4de94
1 parent
64bb2ffc
Add admin info inter
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
2 deletions
src/main/java/com/xkl/controller/uploadsoft/AdminInfoController.java
src/main/java/com/xkl/model/AdminInfoModel.java
src/main/java/com/xkl/controller/uploadsoft/AdminInfoController.java
View file @
d1b9ea7
...
...
@@ -7,6 +7,7 @@ import com.xkl.authorization.annotation.*;
import
com.xkl.config.ResultStatus
;
import
com.xkl.domain.XklAdminEntity
;
import
com.xkl.domain.XklCompanyEntity
;
import
com.xkl.model.AdminInfoModel
;
import
com.xkl.model.AdminLoginModel
;
import
com.xkl.model.ResultModel
;
import
com.xkl.repository.XklCompanyRepository
;
...
...
@@ -38,7 +39,7 @@ public class AdminInfoController {
if
(
companyEntity
==
null
)
{
return
new
ResponseEntity
<>(
ResultModel
.
error
(
ResultStatus
.
COMPANY_ERROR
),
HttpStatus
.
OK
);
}
AdminLoginModel
adminLoginModel
=
new
AdminLoginModel
(
admin
.
getId
(),
admin
.
getAccount
(),
companyEntity
.
getId
(),
companyEntity
.
getName
(),
""
,
""
);
return
new
ResponseEntity
<>(
ResultModel
.
ok
(
adminLoginModel
),
HttpStatus
.
OK
);
AdminInfoModel
adminInfoModel
=
new
AdminInfoModel
(
admin
.
getId
(),
admin
.
getAccount
(),
companyEntity
.
getId
(),
companyEntity
.
getName
());
return
new
ResponseEntity
<>(
ResultModel
.
ok
(
adminInfoModel
),
HttpStatus
.
OK
);
}
}
...
...
src/main/java/com/xkl/model/AdminInfoModel.java
0 → 100644
View file @
d1b9ea7
package
com
.
xkl
.
model
;
import
lombok.Data
;
/**
* 管理员信息
*/
@Data
public
class
AdminInfoModel
{
public
long
adminId
;
public
String
adminAccount
;
public
long
comId
;
public
String
comName
;
public
AdminInfoModel
(
long
adminId
,
String
adminAccount
,
long
comId
,
String
comName
)
{
this
.
adminId
=
adminId
;
this
.
adminAccount
=
adminAccount
;
this
.
comId
=
comId
;
this
.
comName
=
comName
;
}
public
long
getAdminId
()
{
return
adminId
;
}
public
void
setAdminId
(
long
adminId
)
{
this
.
adminId
=
adminId
;
}
public
String
getAdminAccount
()
{
return
adminAccount
;
}
public
void
setAdminAccount
(
String
adminAccount
)
{
this
.
adminAccount
=
adminAccount
;
}
public
long
getComId
()
{
return
comId
;
}
public
void
setComId
(
long
comId
)
{
this
.
comId
=
comId
;
}
public
String
getComName
()
{
return
comName
;
}
public
void
setComName
(
String
comName
)
{
this
.
comName
=
comName
;
}
}
...
...
Please
register
or
login
to post a comment