Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
Z
zhxf_java
Project
Project
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
葛齐林
zhxf_java
Commits
1ac24f93
Commit
1ac24f93
authored
May 27, 2021
by
co_dengxiongwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
民族接口
parent
1bee9ea9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
3 deletions
+33
-3
SysUserController.java
...tform/admin/modules/sys/controller/SysUserController.java
+9
-0
SysUserDao.java
...ava/com/devplatform/admin/modules/sys/dao/SysUserDao.java
+11
-2
SysUserService.java
...devplatform/admin/modules/sys/service/SysUserService.java
+8
-1
SysUserServiceImpl.java
...rm/admin/modules/sys/service/impl/SysUserServiceImpl.java
+5
-0
No files found.
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysUserController.java
View file @
1ac24f93
...
@@ -29,6 +29,7 @@ import org.apache.shiro.crypto.hash.Sha256Hash;
...
@@ -29,6 +29,7 @@ import org.apache.shiro.crypto.hash.Sha256Hash;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -326,4 +327,12 @@ public class SysUserController extends AbstractController {
...
@@ -326,4 +327,12 @@ public class SysUserController extends AbstractController {
sysUserService
.
updatePw
(
split
,
pd
,
salt
,
getUserId
(),
getUser
().
getSysSystem
().
getCode
());
sysUserService
.
updatePw
(
split
,
pd
,
salt
,
getUserId
(),
getUser
().
getSysSystem
().
getCode
());
return
R
.
ok
();
return
R
.
ok
();
}
}
/** 获取民族 */
@ApiOperation
(
value
=
"获取民族列表"
,
notes
=
"获取民族列表"
)
@GetMapping
(
"/getAllNation"
)
public
R
getAllNation
()
{
List
<
HashMap
<
String
,
Object
>>
result
=
sysUserService
.
getAllNation
();
return
R
.
ok
().
put
(
"result"
,
result
);
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysUserDao.java
View file @
1ac24f93
...
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.devplatform.admin.modules.sys.bean.SysUserEntity
;
import
com.devplatform.admin.modules.sys.bean.SysUserEntity
;
import
com.devplatform.admin.modules.sys.model.SysUserModel
;
import
com.devplatform.admin.modules.sys.model.SysUserModel
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
java.util.HashMap
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
java.util.HashMap
;
import
java.util.List
;
/**
/**
* 系统用户
* 系统用户
...
@@ -113,4 +115,11 @@ public interface SysUserDao extends MyBaseMapper<SysUserEntity> {
...
@@ -113,4 +115,11 @@ public interface SysUserDao extends MyBaseMapper<SysUserEntity> {
@Param
(
"salt"
)
String
salt
,
@Param
(
"salt"
)
String
salt
,
@Param
(
"userId"
)
String
userId
,
@Param
(
"userId"
)
String
userId
,
@Param
(
"sysSign"
)
String
sysSign
);
@Param
(
"sysSign"
)
String
sysSign
);
/**
* 查询所有民族
* @return
*/
@Select
(
"select * from sys_nation"
)
List
<
HashMap
<
String
,
Object
>>
getAllNation
();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysUserService.java
View file @
1ac24f93
...
@@ -5,9 +5,10 @@ import com.devplatform.admin.modules.sys.bean.SysUserEntity;
...
@@ -5,9 +5,10 @@ import com.devplatform.admin.modules.sys.bean.SysUserEntity;
import
com.devplatform.admin.modules.sys.model.SysUserModel
;
import
com.devplatform.admin.modules.sys.model.SysUserModel
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.util.R
;
import
com.devplatform.common.util.R
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
/**
/**
* 系统用户
* 系统用户
...
@@ -149,4 +150,10 @@ public interface SysUserService extends MyBaseService<SysUserEntity> {
...
@@ -149,4 +150,10 @@ public interface SysUserService extends MyBaseService<SysUserEntity> {
* @param sysSign
* @param sysSign
*/
*/
void
updatePw
(
String
[]
split
,
String
password
,
String
salt
,
String
userId
,
String
sysSign
);
void
updatePw
(
String
[]
split
,
String
password
,
String
salt
,
String
userId
,
String
sysSign
);
/**
* 查询所有民族
* @return
*/
List
<
HashMap
<
String
,
Object
>>
getAllNation
();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysUserServiceImpl.java
View file @
1ac24f93
...
@@ -214,4 +214,9 @@ public class SysUserServiceImpl extends MyBaseServiceImpl<SysUserDao, SysUserEnt
...
@@ -214,4 +214,9 @@ public class SysUserServiceImpl extends MyBaseServiceImpl<SysUserDao, SysUserEnt
String
[]
split
,
String
password
,
String
salt
,
String
userId
,
String
sysSign
)
{
String
[]
split
,
String
password
,
String
salt
,
String
userId
,
String
sysSign
)
{
baseMapper
.
updatePw
(
split
,
password
,
salt
,
userId
,
sysSign
);
baseMapper
.
updatePw
(
split
,
password
,
salt
,
userId
,
sysSign
);
}
}
@Override
public
List
<
HashMap
<
String
,
Object
>>
getAllNation
()
{
return
baseMapper
.
getAllNation
();
}
}
}
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