Skip to content

C
cneeds-server
Commit e430c585 by zzrdark
Options

1.用户模块

parent 9c2372bb
Showing with 237 additions and 92 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment=""> <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.用户模块">
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserFuncDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserDeptEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserFuncEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserFuncDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserFuncServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserDeptController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserFuncController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDao.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/UserDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/UserDto.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserFuncDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserFuncDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserFuncDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserFuncDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/common/DataFilterAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/common/DataFilterAspect.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserFuncServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" />
</list> </list>
...@@ -295,7 +297,8 @@ ...@@ -295,7 +297,8 @@
<workItem from="1583893504296" duration="26375000" /> <workItem from="1583893504296" duration="26375000" />
<workItem from="1583980091332" duration="17880000" /> <workItem from="1583980091332" duration="17880000" />
<workItem from="1584066161394" duration="18287000" /> <workItem from="1584066161394" duration="18287000" />
<workItem from="1584325001929" duration="17951000" /> <workItem from="1584325001929" duration="18105000" />
<workItem from="1584411045642" duration="12441000" />
</task> </task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload"> <task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created> <created>1578451117064</created>
...@@ -381,7 +384,14 @@ ...@@ -381,7 +384,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1584096669506</updated> <updated>1584096669506</updated>
</task> </task>
<option name="localTasksCounter" value="13" /> <task id="LOCAL-00013" summary="1.用户模块">
<created>1584357902418</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1584357902418</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -414,7 +424,8 @@ ...@@ -414,7 +424,8 @@
<MESSAGE value="1.增加登陆，等" /> <MESSAGE value="1.增加登陆，等" />
<MESSAGE value="1.部门模块&#10;2.角色模块部分" /> <MESSAGE value="1.部门模块&#10;2.角色模块部分" />
<MESSAGE value="2.角色模块增删改查" /> <MESSAGE value="2.角色模块增删改查" />
<option name="LAST_COMMIT_MESSAGE" value="2.角色模块增删改查" /> <MESSAGE value="1.用户模块" />
<option name="LAST_COMMIT_MESSAGE" value="1.用户模块" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="552" y="178" key="#Project_Structure" timestamp="1583920392109"> <state x="552" y="178" key="#Project_Structure" timestamp="1583920392109">
...@@ -445,62 +456,62 @@ ...@@ -445,62 +456,62 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" /> <state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1584096665796"> <state x="463" y="112" key="CommitChangelistDialog2" timestamp="1584358028554">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1584096665796" /> <state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1584358028554" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1583991202144"> <state x="740" y="275" key="FileChooserDialogImpl" timestamp="1583991202144">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1583991202144" /> <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1583991202144" />
<state width="1877" height="327" key="GridCell.Tab.0.bottom" timestamp="1584096720690"> <state width="1877" height="231" key="GridCell.Tab.0.bottom" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="327" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720690" /> <state width="1877" height="231" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="327" key="GridCell.Tab.0.center" timestamp="1584096720690"> <state width="1877" height="231" key="GridCell.Tab.0.center" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="327" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720690" /> <state width="1877" height="231" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="327" key="GridCell.Tab.0.left" timestamp="1584096720690"> <state width="1877" height="231" key="GridCell.Tab.0.left" timestamp="1584435739968">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="327" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720690" /> <state width="1877" height="231" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739968" />
<state width="1877" height="327" key="GridCell.Tab.0.right" timestamp="1584096720690"> <state width="1877" height="231" key="GridCell.Tab.0.right" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="327" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720690" /> <state width="1877" height="231" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.1.bottom" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.1.bottom" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.1.center" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.1.center" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.1.left" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.1.left" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.1.right" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.1.right" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.2.bottom" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.2.bottom" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.2.center" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.2.center" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.2.left" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.2.left" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state width="1877" height="471" key="GridCell.Tab.2.right" timestamp="1584096720686"> <state width="1877" height="231" key="GridCell.Tab.2.right" timestamp="1584435739969">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="471" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096720686" /> <state width="1877" height="231" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584435739969" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926"> <state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
...@@ -513,10 +524,10 @@ ...@@ -513,10 +524,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583725437328" /> <state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583725437328" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1584096671443"> <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1584357959279">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1584096671443" /> <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1584357959279" />
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1583724603426"> <state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1583724603426">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
...@@ -551,11 +562,6 @@ ...@@ -551,11 +562,6 @@
<line>75</line> <line>75</line>
<option name="timeStamp" value="10" /> <option name="timeStamp" value="10" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java</url>
<line>293</line>
<option name="timeStamp" value="27" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java
...@@ -19,7 +19,7 @@ public interface SysRoleDeptDao extends BaseMapper<SysRoleDeptEntity> { ...@@ -19,7 +19,7 @@ public interface SysRoleDeptDao extends BaseMapper<SysRoleDeptEntity> {
/** /**
* 根据角色ID，获取部门ID列表 * 根据角色ID，获取部门ID列表
*/ */
List<Long> queryDeptIdList(Long[] roleIds); List<Long> queryDeptId(Long roleId);
/** /**
* 根据角色ID数组，批量删除 * 根据角色ID数组，批量删除
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.java
...@@ -23,6 +23,6 @@ public interface SysRoleFuncDao extends BaseMapper<SysRoleFuncEntity> { ...@@ -23,6 +23,6 @@ public interface SysRoleFuncDao extends BaseMapper<SysRoleFuncEntity> {
/** /**
* 根据角色ID，获取菜单ID列表 * 根据角色ID，获取菜单ID列表
*/ */
List<Long> queryMenuIdList(Long roleId); List<Long> queryFuncId(Long roleId);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mx.cneeds.server.entity.SysUserDeptEntity; import com.mx.cneeds.server.entity.SysUserDeptEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 部门与角色映射表 * 部门与角色映射表
* *
...@@ -17,4 +19,9 @@ public interface SysUserDeptDao extends BaseMapper<SysUserDeptEntity> { ...@@ -17,4 +19,9 @@ public interface SysUserDeptDao extends BaseMapper<SysUserDeptEntity> {
* 根据角色ID数组，批量删除 * 根据角色ID数组，批量删除
*/ */
int deleteBatch(Long[] roleIds); int deleteBatch(Long[] roleIds);
/**
* 根据角色ID，获取部门ID列表
*/
List<Long> queryDeptIdList(Long userId);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserFuncDao.java
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mx.cneeds.server.entity.SysUserFuncEntity; import com.mx.cneeds.server.entity.SysUserFuncEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 功能与角色映射表 * 功能与角色映射表
* *
...@@ -17,4 +19,10 @@ public interface SysUserFuncDao extends BaseMapper<SysUserFuncEntity> { ...@@ -17,4 +19,10 @@ public interface SysUserFuncDao extends BaseMapper<SysUserFuncEntity> {
* 根据角色ID数组，批量删除 * 根据角色ID数组，批量删除
*/ */
int deleteBatch(Long[] roleIds); int deleteBatch(Long[] roleIds);
/**
* 根据角色ID，获取菜单ID列表
*/
List<Long> queryFuncIdList(Long roleId);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java
...@@ -17,9 +17,9 @@ import java.util.List; ...@@ -17,9 +17,9 @@ import java.util.List;
public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> { public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
/** /**
* 根据用户ID，获取角色ID列表 * 根据用户ID，获取角色ID
*/ */
List<Long> queryRoleIdList(Long userId); Long queryRoleId(Long userId);
/** /**
* 根据角色ID数组，批量删除 * 根据角色ID数组，批量删除
......
cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml
...@@ -11,11 +11,9 @@ ...@@ -11,11 +11,9 @@
</resultMap> </resultMap>
<select id="queryDeptIdList" resultType="long"> <select id="queryDeptId" resultType="long">
select dept_id from sys_role_dept where role_id in select dept_id from sys_role_dept where role_id = #{roleId}
<foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId}
</foreach>
</select> </select>
<delete id="deleteBatch"> <delete id="deleteBatch">
......
cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</foreach> </foreach>
</delete> </delete>
<select id="queryMenuIdList" resultType="long"> <select id="queryFuncId" resultType="long">
select func_id from sys_role_func where role_id = #{value} select func_id from sys_role_func where role_id = #{roleId}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml
...@@ -18,5 +18,9 @@ ...@@ -18,5 +18,9 @@
</foreach> </foreach>
</delete> </delete>
<select id="queryDeptIdList" resultType="long">
select dept_id from sys_user_dept where user_id = #{userId}
</select>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-data/src/main/resources/mapper/SysUserFuncDao.xml
...@@ -16,4 +16,8 @@ ...@@ -16,4 +16,8 @@
#{userId} #{userId}
</foreach> </foreach>
</delete> </delete>
<select id="queryFuncIdList" resultType="long">
select func_id from sys_user_func where user_id = #{userId}
</select>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<result property="roleId" column="role_id"/> <result property="roleId" column="role_id"/>
</resultMap> </resultMap>
<select id="queryRoleIdList" resultType="long"> <select id="queryRoleId" resultType="long">
select role_id from sys_user_role where user_id = #{value} select role_id from sys_user_role where user_id = #{value}
</select> </select>
......
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java
...@@ -3,6 +3,7 @@ package com.mx.cneeds.common.vo; ...@@ -3,6 +3,7 @@ package com.mx.cneeds.common.vo;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @ClassName SysUser * @ClassName SysUser
...@@ -12,10 +13,43 @@ import java.io.Serializable; ...@@ -12,10 +13,43 @@ import java.io.Serializable;
**/ **/
@Data @Data
public class UserVo implements Serializable { public class UserVo implements Serializable {
/**
* 用户id
*/
private Long userId;
/**
* 用户名
*/
private String username; private String username;
/**
* 密码
*/
private String password; private String password;
/**
* 加密盐
*/
private String salt;
/**
* 邮箱
*/
private String email;
/**
* 手机
*/
private String mobile;
/**
* 账户状态 0：禁用 1：正常
*/
private Integer status;
/**
* 部门id
*/
private Long deptId;
private List<Long> funcIdList;
private List<Long> deptIdList;
private Long roleId;
} }
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java
...@@ -86,6 +86,11 @@ public interface UserClient { ...@@ -86,6 +86,11 @@ public interface UserClient {
@PostMapping("/sys/role/delete") @PostMapping("/sys/role/delete")
void deleteRole(@RequestBody List<Long> ids); void deleteRole(@RequestBody List<Long> ids);
@PostMapping("/sys/role/listAll")
List<RoleDto> roleListAll();
/** /**
* *
* @param page * @param page
...@@ -103,4 +108,15 @@ public interface UserClient { ...@@ -103,4 +108,15 @@ public interface UserClient {
@PostMapping("/sys/user/userinfo") @PostMapping("/sys/user/userinfo")
UserDto userInfo(@RequestParam String username); UserDto userInfo(@RequestParam String username);
@PostMapping("/sys/user/save")
void addUser(@RequestBody UserDto dto);
@PostMapping("/sys/user/update")
void updateUser(@RequestBody UserDto dto);
@PostMapping("/sys/user/delete")
void deleteUser(@RequestBody List<Long> ids);
} }
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java
...@@ -37,7 +37,7 @@ public class FeignInterceptor implements RequestInterceptor { ...@@ -37,7 +37,7 @@ public class FeignInterceptor implements RequestInterceptor {
String authString = RequestParamterConverter.authorizationConverter("clientapp","112233"); String authString = RequestParamterConverter.authorizationConverter("clientapp","112233");
requestTemplate.header("Authorization",authString); requestTemplate.header("Authorization",authString);
}else{ }else{
requestTemplate.query("username",username); requestTemplate.query("login_username",username);
} }
} }
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java
...@@ -6,10 +6,7 @@ import com.mx.cneeds.common.dto.*; ...@@ -6,10 +6,7 @@ import com.mx.cneeds.common.dto.*;
import com.mx.cneeds.common.generate.CascaderToolUtils; import com.mx.cneeds.common.generate.CascaderToolUtils;
import com.mx.cneeds.common.generate.TreeToolUtils; import com.mx.cneeds.common.generate.TreeToolUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.vo.CascaderVo; import com.mx.cneeds.common.vo.*;
import com.mx.cneeds.common.vo.DepartmentVo;
import com.mx.cneeds.common.vo.RoleVo;
import com.mx.cneeds.common.vo.TreeVo;
import com.mx.cneeds.server.datashow.client.UserClient; import com.mx.cneeds.server.datashow.client.UserClient;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -317,6 +314,13 @@ public class SystemController { ...@@ -317,6 +314,13 @@ public class SystemController {
return R.ok(); return R.ok();
} }
@PostMapping("/role/listAll")
public R selectRole(){
List<RoleDto> roleDtos = userClient.roleListAll();
return new R().put("data",roleDtos);
}
@PostMapping("/user/list") @PostMapping("/user/list")
public R userList(@RequestParam(required = false) Integer page, public R userList(@RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer pageSize, @RequestParam(required = false) Integer pageSize,
...@@ -348,4 +352,32 @@ public class SystemController { ...@@ -348,4 +352,32 @@ public class SystemController {
return new R().put("data",pageDto); return new R().put("data",pageDto);
} }
@RequestMapping("/user/info")
public R infoRole(String username){
UserDto dto = userClient.userInfo(username);
return R.ok().put("data",dto);
}
@RequestMapping("/user/add")
public R addUser(UserVo vo){
UserDto dto = new UserDto();
BeanUtils.copyProperties(vo,dto);
userClient.addUser(dto);
return R.ok();
}
@PostMapping("/user/update")
public R editUser(UserVo vo){
UserDto dto = new UserDto();
BeanUtils.copyProperties(vo,dto);
userClient.updateUser(dto);
return R.ok();
}
@PostMapping("/user/delete")
public R deleteUser(@RequestParam(value = "ids",required = false) List<Long> ids){
userClient.deleteUser(ids);
return R.ok();
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/common/DataFilterAspect.java
...@@ -59,7 +59,7 @@ public class DataFilterAspect { ...@@ -59,7 +59,7 @@ public class DataFilterAspect {
public void dataFilter(JoinPoint point){ public void dataFilter(JoinPoint point){
Object params = point.getArgs()[0]; Object params = point.getArgs()[0];
if(params != null && params instanceof Map){ if(params != null && params instanceof Map){
String username = (String) ((Map) params).get("username"); String username = (String) ((Map) params).get("login_username");
//如果不是超级管理员，则进行数据过滤 //如果不是超级管理员，则进行数据过滤
if(!Constant.STRING_SUPER_ADMIN.equals(username)){ if(!Constant.STRING_SUPER_ADMIN.equals(username)){
Map map = (Map)params; Map map = (Map)params;
...@@ -89,9 +89,9 @@ public class DataFilterAspect { ...@@ -89,9 +89,9 @@ public class DataFilterAspect {
SysUserEntity sysUserEntity = sysUserService.queryUserByUsername(username); SysUserEntity sysUserEntity = sysUserService.queryUserByUsername(username);
//用户角色对应的部门ID列表 //用户角色对应的部门ID列表
List<Long> roleIdList = sysUserRoleService.queryRoleIdList(sysUserEntity.getUserId()); Long roleId = sysUserRoleService.queryRoleId(sysUserEntity.getUserId());
if(roleIdList.size() > 0){ if(roleId != null){
List<Long> userDeptIdList = sysRoleDeptService.queryDeptIdList(roleIdList.toArray(new Long[roleIdList.size()])); List<Long> userDeptIdList = sysRoleDeptService.queryDeptId(roleId);
deptIdList.addAll(userDeptIdList); deptIdList.addAll(userDeptIdList);
} }
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java
...@@ -22,7 +22,7 @@ public interface SysRoleDeptService extends IService<SysRoleDeptEntity> { ...@@ -22,7 +22,7 @@ public interface SysRoleDeptService extends IService<SysRoleDeptEntity> {
/** /**
* 根据角色ID，获取部门ID列表 * 根据角色ID，获取部门ID列表
*/ */
List<Long> queryDeptIdList(Long[] roleIds) ; List<Long> queryDeptId(Long roleIds) ;
void saveOrUpdate(Long roleId, List<Long> deptIdList); void saveOrUpdate(Long roleId, List<Long> deptIdList);
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java
...@@ -23,6 +23,6 @@ public interface SysRoleFuncService extends IService<SysRoleFuncEntity> { ...@@ -23,6 +23,6 @@ public interface SysRoleFuncService extends IService<SysRoleFuncEntity> {
int deleteBatch(Long[] roleIds); int deleteBatch(Long[] roleIds);
List<Long> queryMenuIdList(Long roleId); List<Long> queryFuncId(Long roleId);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java
...@@ -22,5 +22,7 @@ public interface SysUserDeptService extends IService<SysUserDeptEntity> { ...@@ -22,5 +22,7 @@ public interface SysUserDeptService extends IService<SysUserDeptEntity> {
int deleteBatch(Long[] userIds); int deleteBatch(Long[] userIds);
void saveOrUpdate(Long userId, List<Long> deptIdList); void saveOrUpdate(Long userId, List<Long> deptIdList);
List<Long> queryDeptIdList(Long userId);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java
...@@ -22,5 +22,7 @@ public interface SysUserFuncService extends IService<SysUserFuncEntity> { ...@@ -22,5 +22,7 @@ public interface SysUserFuncService extends IService<SysUserFuncEntity> {
int deleteBatch(Long[] userIds); int deleteBatch(Long[] userIds);
void saveOrUpdate(Long userId, List<Long> menuIdList); void saveOrUpdate(Long userId, List<Long> menuIdList);
List<Long> queryFuncIdList(Long user);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java
...@@ -22,7 +22,7 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> { ...@@ -22,7 +22,7 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> {
* 根据用户ID，获取角色ID列表 * 根据用户ID，获取角色ID列表
* @param userId * @param userId
*/ */
List<Long> queryRoleIdList(Long userId); Long queryRoleId(Long userId);
int deleteBatch(Long[] roleIds); int deleteBatch(Long[] roleIds);
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java
...@@ -29,8 +29,8 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptDao, SysRoleD ...@@ -29,8 +29,8 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptDao, SysRoleD
} }
@Override @Override
public List<Long> queryDeptIdList(Long[] roleIds) { public List<Long> queryDeptId(Long roleId) {
return baseMapper.queryDeptIdList(roleIds); return baseMapper.queryDeptId(roleId);
} }
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java
...@@ -54,8 +54,8 @@ public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleF ...@@ -54,8 +54,8 @@ public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleF
} }
@Override @Override
public List<Long> queryMenuIdList(Long roleId) { public List<Long> queryFuncId(Long roleId) {
return baseMapper.queryMenuIdList(roleId); return baseMapper.queryFuncId(roleId);
} }
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java
...@@ -55,4 +55,9 @@ public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptDao, SysUserD ...@@ -55,4 +55,9 @@ public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptDao, SysUserD
} }
} }
@Override
public List<Long> queryDeptIdList(Long userId) {
return baseMapper.queryDeptIdList(userId);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserFuncServiceImpl.java
...@@ -56,4 +56,9 @@ public class SysUserFuncServiceImpl extends ServiceImpl<SysUserFuncDao, SysUserF ...@@ -56,4 +56,9 @@ public class SysUserFuncServiceImpl extends ServiceImpl<SysUserFuncDao, SysUserF
} }
} }
@Override
public List<Long> queryFuncIdList(Long userId) {
return baseMapper.queryFuncIdList(userId);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java
...@@ -28,8 +28,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR ...@@ -28,8 +28,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
} }
@Override @Override
public List<Long> queryRoleIdList(Long userId) { public Long queryRoleId(Long userId) {
return baseMapper.queryRoleIdList(userId); return baseMapper.queryRoleId(userId);
} }
@Override @Override
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java
...@@ -100,11 +100,11 @@ public class SysRoleController { ...@@ -100,11 +100,11 @@ public class SysRoleController {
//查询角色对应的菜单 //查询角色对应的菜单
List<Long> funcIdList = sysRoleFuncService.queryMenuIdList(roleId); List<Long> funcIdList = sysRoleFuncService.queryFuncId(roleId);
roleDto.setFuncIdList(funcIdList); roleDto.setFuncIdList(funcIdList);
//查询角色对应的部门 //查询角色对应的部门
List<Long> deptIdList = sysRoleDeptService.queryDeptIdList(new Long[]{roleId}); List<Long> deptIdList = sysRoleDeptService.queryDeptId(roleId);
roleDto.setDeptIdList(deptIdList); roleDto.setDeptIdList(deptIdList);
return roleDto; return roleDto;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java
...@@ -6,12 +6,16 @@ import com.mx.cneeds.common.result.R; ...@@ -6,12 +6,16 @@ import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.common.vo.UserVo; import com.mx.cneeds.common.vo.UserVo;
import com.mx.cneeds.server.entity.SysUserEntity; import com.mx.cneeds.server.entity.SysUserEntity;
import com.mx.cneeds.server.user.service.SysUserDeptService;
import com.mx.cneeds.server.user.service.SysUserFuncService;
import com.mx.cneeds.server.user.service.SysUserRoleService;
import com.mx.cneeds.server.user.service.SysUserService; import com.mx.cneeds.server.user.service.SysUserService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
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.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions; //import org.apache.shiro.authz.annotation.RequiresPermissions;
...@@ -30,6 +34,17 @@ public class SysUserController { ...@@ -30,6 +34,17 @@ public class SysUserController {
@Autowired @Autowired
private SysUserService sysUserService; private SysUserService sysUserService;
@Autowired
private SysUserRoleService sysUserRoleService;
@Autowired
private SysUserDeptService sysUserDeptService;
@Autowired
private SysUserFuncService sysUserFuncService;
/** /**
* 列表 * 列表
...@@ -54,8 +69,12 @@ public class SysUserController { ...@@ -54,8 +69,12 @@ public class SysUserController {
@PostMapping("/userinfo") @PostMapping("/userinfo")
public UserDto infoByUsername(@RequestParam("username") String username){ public UserDto infoByUsername(@RequestParam("username") String username){
SysUserEntity sysUser = sysUserService.queryUserByUsername(username); SysUserEntity sysUser = sysUserService.queryUserByUsername(username);
Long roleId = sysUserRoleService.queryRoleId(sysUser.getUserId());
UserDto userDto = new UserDto(); UserDto userDto = new UserDto();
BeanUtils.copyProperties(sysUser,userDto); BeanUtils.copyProperties(sysUser,userDto);
userDto.setRoleId(roleId);
userDto.setDeptIdList(sysUserDeptService.queryDeptIdList(sysUser.getUserId()));
userDto.setFuncIdList(sysUserFuncService.queryFuncIdList(sysUser.getUserId()));
return userDto; return userDto;
} }
...@@ -83,7 +102,7 @@ public class SysUserController { ...@@ -83,7 +102,7 @@ public class SysUserController {
BeanUtils.copyProperties(dto,sysUser); BeanUtils.copyProperties(dto,sysUser);
ValidatorUtils.validateEntity(sysUser); ValidatorUtils.validateEntity(sysUser);
sysUserService.update(sysUser, dto.getFuncIdList(), dto.getDeptIdList()); sysUserService.update(sysUser, dto.getFuncIdList(), dto.getDeptIdList());
return R.ok(); return R.ok();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment