Skip to content

C
cneeds-server
Commit 7d1b62ad by zzrdark
Options

2.角色模块增删改查

parent c216ee36
Showing with 644 additions and 206 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.部门模块&#10;2.角色模块部分">
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/RoleVo.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/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/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/java/com/mx/cneeds/server/entity/SysRoleEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleEntity.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/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/dto/RoleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/RoleDto.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/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/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/SysDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.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/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/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/impl/SysDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.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/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/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/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/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/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-dev.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -78,16 +100,30 @@ ...@@ -78,16 +100,30 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="E:/project/IdeaProjects/renren-security" /> <property name="last_opened_file_path" value="E:/project/IdeaProjects/segmentfault-lessons" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2916053" /> <property name="project.structure.side.proportion" value="0.2916053" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="settings.github" /> <property name="settings.editor.selected.configurable" value="settings.github" />
<property name="settings.editor.splitter.proportion" value="0.20898877" /> <property name="settings.editor.splitter.proportion" value="0.20898877" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" />
<recent name="E:\mx_project\cneeds-server\src" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.common.generate" />
<recent name="com.mx.cneeds.server.anthorization.service" />
<recent name="com.mx.cneeds.server.datashow.web.system" />
<recent name="com.mx.cneeds.common.dto" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\service" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\service" />
...@@ -95,21 +131,8 @@ ...@@ -95,21 +131,8 @@
<recent name="E:\mx_project\cneeds-server\cneeds-common-pojo\src\main\java" /> <recent name="E:\mx_project\cneeds-server\cneeds-common-pojo\src\main\java" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.user.common" />
<recent name="com.mx.cneeds.common.annotation" />
<recent name="com.mx.cneeds.server.datashow.filter" />
<recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.server.datashow.config" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" />
<recent name="E:\mx_project\cneeds-server\src" />
</key>
</component> </component>
<component name="RunManager" selected="Spring Boot.UserServerApplication"> <component name="RunManager" selected="Spring Boot.DatashowApplication">
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<module name="cneeds-server-advice-control" /> <module name="cneeds-server-advice-control" />
<option name="VM_PARAMETERS" /> <option name="VM_PARAMETERS" />
...@@ -164,12 +187,12 @@ ...@@ -164,12 +187,12 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="RequestParamterConverter" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="PasswordEncode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.common.converter.RequestParamterConverter" /> <option name="MAIN_CLASS_NAME" value="utils.PasswordEncode" />
<module name="cneeds-common-utils" /> <module name="cneeds-server-authorization" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.mx.cneeds.common.converter.*" /> <option name="PATTERN" value="utils.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
...@@ -212,9 +235,18 @@ ...@@ -212,9 +235,18 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<list>
<item itemvalue="Application.EurekaServerApplication" />
<item itemvalue="Application.PasswordEncode" />
<item itemvalue="Spring Boot.AuthorizaitonApplication" />
<item itemvalue="Spring Boot.DatashowApplication" />
<item itemvalue="Spring Boot.DeviceApplication" />
<item itemvalue="Spring Boot.EurekaServerApplication" />
<item itemvalue="Spring Boot.UserServerApplication" />
</list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.RequestParamterConverter" /> <item itemvalue="Application.PasswordEncode" />
<item itemvalue="Application.EurekaServerApplication" /> <item itemvalue="Application.EurekaServerApplication" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -257,7 +289,11 @@ ...@@ -257,7 +289,11 @@
<workItem from="1583320312435" duration="9970000" /> <workItem from="1583320312435" duration="9970000" />
<workItem from="1583395022330" duration="616000" /> <workItem from="1583395022330" duration="616000" />
<workItem from="1583395719361" duration="15264000" /> <workItem from="1583395719361" duration="15264000" />
<workItem from="1583723774754" duration="22931000" /> <workItem from="1583723774754" duration="23127000" />
<workItem from="1583807454250" duration="27147000" />
<workItem from="1583893504296" duration="26375000" />
<workItem from="1583980091332" duration="17880000" />
<workItem from="1584066161394" duration="18177000" />
</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>
...@@ -308,7 +344,35 @@ ...@@ -308,7 +344,35 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1583752269522</updated> <updated>1583752269522</updated>
</task> </task>
<option name="localTasksCounter" value="8" /> <task id="LOCAL-00008" summary="1.增加分页查询">
<created>1583753936219</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1583753936219</updated>
</task>
<task id="LOCAL-00009" summary="1.增加dto&#10;2.系统管理4个模块的查询&#10;3.系统模块add功能&#10;4.增加mysql注释">
<created>1583844864857</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1583844864857</updated>
</task>
<task id="LOCAL-00010" summary="1.增加登陆，等">
<created>1583932173336</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1583932173336</updated>
</task>
<task id="LOCAL-00011" summary="1.部门模块&#10;2.角色模块部分">
<created>1584011537931</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1584011537931</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -336,17 +400,25 @@ ...@@ -336,17 +400,25 @@
<MESSAGE value="1.修改项目结构&#10;2.更改数据库连接&#10;3.增加测试docker部署" /> <MESSAGE value="1.修改项目结构&#10;2.更改数据库连接&#10;3.增加测试docker部署" />
<MESSAGE value="1.修改项目结构&#10;2.登陆&#10;3.等等" /> <MESSAGE value="1.修改项目结构&#10;2.登陆&#10;3.等等" />
<MESSAGE value="1.增加数据库数据&#10;2.增加数据权限拦截&#10;3.增加分页插件&#10;4.增加系统模块查询" /> <MESSAGE value="1.增加数据库数据&#10;2.增加数据权限拦截&#10;3.增加分页插件&#10;4.增加系统模块查询" />
<option name="LAST_COMMIT_MESSAGE" value="1.增加数据库数据&#10;2.增加数据权限拦截&#10;3.增加分页插件&#10;4.增加系统模块查询" /> <MESSAGE value="1.增加分页查询" />
<MESSAGE value="1.增加dto&#10;2.系统管理4个模块的查询&#10;3.系统模块add功能&#10;4.增加mysql注释" />
<MESSAGE value="1.增加登陆，等" />
<MESSAGE value="1.部门模块&#10;2.角色模块部分" />
<option name="LAST_COMMIT_MESSAGE" value="1.部门模块&#10;2.角色模块部分" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="552" y="178" key="#Project_Structure" timestamp="1583316360973"> <state x="552" y="178" key="#Project_Structure" timestamp="1583920392109">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583920392109" />
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583824373022">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583316360973" /> <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583824373022" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1583740715738"> <state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1584068280326">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1583740715738" /> <state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1584068280326" />
<state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117"> <state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
...@@ -359,62 +431,66 @@ ...@@ -359,62 +431,66 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583224455231" /> <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583224455231" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1583752264430"> <state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1583822701848">
<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="1583752264430" /> <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="740" y="275" key="FileChooserDialogImpl" timestamp="1583737037918"> <state x="463" y="112" key="CommitChangelistDialog2" timestamp="1584069254530">
<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="1583737037918" /> <state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1584069254530" />
<state width="1877" height="274" key="GridCell.Tab.0.bottom" timestamp="1583751980495"> <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 width="1877" height="274" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583751980495" /> <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1583991202144" />
<state width="1877" height="274" key="GridCell.Tab.0.center" timestamp="1583751980495"> <state width="1877" height="327" key="GridCell.Tab.0.bottom" timestamp="1584096626830">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="274" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583751980495" /> <state width="1877" height="327" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096626830" />
<state width="1877" height="274" key="GridCell.Tab.0.left" timestamp="1583751980495"> <state width="1877" height="327" key="GridCell.Tab.0.center" timestamp="1584096626830">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="274" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583751980495" /> <state width="1877" height="327" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096626830" />
<state width="1877" height="274" key="GridCell.Tab.0.right" timestamp="1583751980495"> <state width="1877" height="327" key="GridCell.Tab.0.left" timestamp="1584096626830">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="274" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583751980495" /> <state width="1877" height="327" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096626830" />
<state width="1877" height="336" key="GridCell.Tab.1.bottom" timestamp="1583751863551"> <state width="1877" height="327" key="GridCell.Tab.0.right" timestamp="1584096626830">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="327" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096626830" />
<state width="1877" height="336" key="GridCell.Tab.1.center" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.1.bottom" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.1.left" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.1.center" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.1.right" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.1.left" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.2.bottom" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.1.right" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.2.center" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.2.bottom" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.2.left" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.2.center" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="336" key="GridCell.Tab.2.right" timestamp="1583751863551"> <state width="1877" height="216" key="GridCell.Tab.2.left" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="336" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583751863551" /> <state width="1877" height="216" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<state width="1877" height="216" key="GridCell.Tab.2.right" timestamp="1584096619672">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="216" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584096619672" />
<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>
...@@ -427,22 +503,30 @@ ...@@ -427,22 +503,30 @@
<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="1583752451682"> <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1584011539523">
<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="1583752451682" /> <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1584011539523" />
<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>
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583724603426" /> <state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583724603426" />
<state x="690" y="284" key="extract.method.dialog" timestamp="1584010366958">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="284" key="extract.method.dialog/0.0.1920.1040@0.0.1920.1040" timestamp="1584010366958" />
<state x="636" y="253" width="647" height="534" key="find.popup" timestamp="1584085302478">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="636" y="253" width="647" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1584085302478" />
<state x="511" y="210" key="new project wizard" timestamp="1583318693876"> <state x="511" y="210" key="new project wizard" timestamp="1583318693876">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" /> <state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1583751643474"> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1584085955206">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1583751643474" /> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1584085955206" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -452,6 +536,16 @@ ...@@ -452,6 +536,16 @@
<line>275</line> <line>275</line>
<option name="timeStamp" value="3" /> <option name="timeStamp" value="3" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.0.9.RELEASE/spring-security-core-5.0.9.RELEASE-sources.jar!/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java</url>
<line>75</line>
<option name="timeStamp" value="10" />
</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>237</line>
<option name="timeStamp" value="27" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
......
cneeds-common-data/db/cneeds_server.sql
...@@ -23,7 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0; ...@@ -23,7 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `device_info`; DROP TABLE IF EXISTS `device_info`;
CREATE TABLE `device_info` ( CREATE TABLE `device_info` (
`device_id` bigint(20) NOT NULL COMMENT '设备id', `device_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '设备id',
`dept_id` bigint(20) DEFAULT NULL, `dept_id` bigint(20) DEFAULT NULL,
`imei` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'imei', `imei` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'imei',
`iccid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'iccid', `iccid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'iccid',
...@@ -36,7 +36,7 @@ CREATE TABLE `device_info` ( ...@@ -36,7 +36,7 @@ CREATE TABLE `device_info` (
`channel_nums_message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '渠道号提示信息', `channel_nums_message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '渠道号提示信息',
`channel_rules` int(255) DEFAULT NULL COMMENT '0:黑名单，1:白名单', `channel_rules` int(255) DEFAULT NULL COMMENT '0:黑名单，1:白名单',
PRIMARY KEY (`device_id`) USING BTREE PRIMARY KEY (`device_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备信息' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备信息' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for device_log -- Table structure for device_log
...@@ -44,7 +44,7 @@ CREATE TABLE `device_info` ( ...@@ -44,7 +44,7 @@ CREATE TABLE `device_info` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `device_log`; DROP TABLE IF EXISTS `device_log`;
CREATE TABLE `device_log` ( CREATE TABLE `device_log` (
`log_id` bigint(20) NOT NULL, `log_id` bigint(20) NOT NULL AUTO_INCREMENT,
`log_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'bug名字', `log_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'bug名字',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`device_id` bigint(20) DEFAULT NULL COMMENT '设备id', `device_id` bigint(20) DEFAULT NULL COMMENT '设备id',
...@@ -56,7 +56,7 @@ CREATE TABLE `device_log` ( ...@@ -56,7 +56,7 @@ CREATE TABLE `device_log` (
`logfile_size` bigint(20) DEFAULT NULL COMMENT '日志文件大小', `logfile_size` bigint(20) DEFAULT NULL COMMENT '日志文件大小',
`logfile_status` int(11) DEFAULT NULL COMMENT '日志文件上传状态,-1,失败,0上传中,1完成', `logfile_status` int(11) DEFAULT NULL COMMENT '日志文件上传状态,-1,失败,0上传中,1完成',
PRIMARY KEY (`log_id`) USING BTREE PRIMARY KEY (`log_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '测试上传的日志表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '测试上传的日志表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for device_logmedia -- Table structure for device_logmedia
...@@ -64,12 +64,12 @@ CREATE TABLE `device_log` ( ...@@ -64,12 +64,12 @@ CREATE TABLE `device_log` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `device_logmedia`; DROP TABLE IF EXISTS `device_logmedia`;
CREATE TABLE `device_logmedia` ( CREATE TABLE `device_logmedia` (
`logmedia_id` bigint(20) NOT NULL, `logmedia_id` bigint(20) NOT NULL AUTO_INCREMENT,
`location_url` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '音频路径', `location_url` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '音频路径',
`log_id` bigint(20) DEFAULT NULL, `log_id` bigint(20) DEFAULT NULL,
`type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '格式', `type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '格式',
PRIMARY KEY (`logmedia_id`) USING BTREE PRIMARY KEY (`logmedia_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日志音频表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日志音频表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for device_logsetting -- Table structure for device_logsetting
...@@ -77,11 +77,11 @@ CREATE TABLE `device_logmedia` ( ...@@ -77,11 +77,11 @@ CREATE TABLE `device_logmedia` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `device_logsetting`; DROP TABLE IF EXISTS `device_logsetting`;
CREATE TABLE `device_logsetting` ( CREATE TABLE `device_logsetting` (
`logsetting_id` bigint(20) NOT NULL, `logsetting_id` bigint(20) NOT NULL AUTO_INCREMENT,
`log_size` bigint(20) DEFAULT NULL COMMENT '日志容量（MB）', `log_size` bigint(20) DEFAULT NULL COMMENT '日志容量（MB）',
`device_id` bigint(20) DEFAULT NULL COMMENT '设备Id', `device_id` bigint(20) DEFAULT NULL COMMENT '设备Id',
PRIMARY KEY (`logsetting_id`) USING BTREE PRIMARY KEY (`logsetting_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备日志设置' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备日志设置' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for sys_dept -- Table structure for sys_dept
...@@ -89,14 +89,24 @@ CREATE TABLE `device_logsetting` ( ...@@ -89,14 +89,24 @@ CREATE TABLE `device_logsetting` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_dept`; DROP TABLE IF EXISTS `sys_dept`;
CREATE TABLE `sys_dept` ( CREATE TABLE `sys_dept` (
`dept_id` bigint(20) NOT NULL, `dept_id` bigint(20) NOT NULL AUTO_INCREMENT,
`parent_id` bigint(20) DEFAULT NULL COMMENT '上级部门ID，一级部门为0', `parent_id` bigint(20) DEFAULT NULL COMMENT '上级部门ID，一级部门为0',
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部门名称', `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部门名称',
`del_flag` int(11) DEFAULT NULL COMMENT '是否删除 -1：已删除 0：正常', `del_flag` int(11) DEFAULT NULL COMMENT '是否删除 -1：已删除 0：正常',
`distributor_num` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '渠道商号', `distributor_num` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '渠道商号',
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述', `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
PRIMARY KEY (`dept_id`) USING BTREE PRIMARY KEY (`dept_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_dept
-- ----------------------------
INSERT INTO `sys_dept` VALUES (0, NULL, '根', 0, NULL, NULL);
INSERT INTO `sys_dept` VALUES (1, 0, '美行集团', 0, NULL, NULL);
INSERT INTO `sys_dept` VALUES (2, 1, '长沙分公司', 0, NULL, NULL);
INSERT INTO `sys_dept` VALUES (3, 1, '上海分公司', 0, NULL, NULL);
INSERT INTO `sys_dept` VALUES (4, 3, '技术部', 0, NULL, NULL);
INSERT INTO `sys_dept` VALUES (5, 3, '销售部', 0, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_func -- Table structure for sys_func
...@@ -104,15 +114,40 @@ CREATE TABLE `sys_dept` ( ...@@ -104,15 +114,40 @@ CREATE TABLE `sys_dept` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_func`; DROP TABLE IF EXISTS `sys_func`;
CREATE TABLE `sys_func` ( CREATE TABLE `sys_func` (
`func_id` bigint(20) NOT NULL COMMENT 'ID', `func_id` bigint(20) NOT NULL AUTO_INCREMENT,
`parent_id` bigint(20) NOT NULL COMMENT '父类ID', `parent_id` bigint(20) NOT NULL,
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部门名称', `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`url` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '地址', `url` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`perms` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '授权', `perms` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`type` int(11) DEFAULT NULL COMMENT '类型 0：目录 1：菜单 2：按钮', `type` int(11) DEFAULT NULL,
`order_num` int(11) DEFAULT NULL COMMENT '排序', `order_num` int(11) DEFAULT NULL,
PRIMARY KEY (`func_id`) USING BTREE PRIMARY KEY (`func_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '功能表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 36 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '功能表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_func
-- ----------------------------
INSERT INTO `sys_func` VALUES (1, 0, '系统管理', NULL, NULL, 0, 0);
INSERT INTO `sys_func` VALUES (2, 1, '用户管理', 'modules/sys/user.html', NULL, 1, 1);
INSERT INTO `sys_func` VALUES (3, 1, '角色管理', 'modules/sys/role.html', NULL, 1, 2);
INSERT INTO `sys_func` VALUES (4, 1, '菜单管理', 'modules/sys/menu.html', NULL, 1, 3);
INSERT INTO `sys_func` VALUES (15, 2, '查看', NULL, 'sys:user:list,sys:user:info', 2, 0);
INSERT INTO `sys_func` VALUES (16, 2, '新增', NULL, 'sys:user:save,sys:role:select', 2, 0);
INSERT INTO `sys_func` VALUES (17, 2, '修改', NULL, 'sys:user:update,sys:role:select', 2, 0);
INSERT INTO `sys_func` VALUES (18, 2, '删除', NULL, 'sys:user:delete', 2, 0);
INSERT INTO `sys_func` VALUES (19, 3, '查看', NULL, 'sys:role:list,sys:role:info', 2, 0);
INSERT INTO `sys_func` VALUES (20, 3, '新增', NULL, 'sys:role:save,sys:menu:perms', 2, 0);
INSERT INTO `sys_func` VALUES (21, 3, '修改', NULL, 'sys:role:update,sys:menu:perms', 2, 0);
INSERT INTO `sys_func` VALUES (22, 3, '删除', NULL, 'sys:role:delete', 2, 0);
INSERT INTO `sys_func` VALUES (23, 4, '查看', NULL, 'sys:menu:list,sys:menu:info', 2, 0);
INSERT INTO `sys_func` VALUES (24, 4, '新增', NULL, 'sys:menu:save,sys:menu:select', 2, 0);
INSERT INTO `sys_func` VALUES (25, 4, '修改', NULL, 'sys:menu:update,sys:menu:select', 2, 0);
INSERT INTO `sys_func` VALUES (26, 4, '删除', NULL, 'sys:menu:delete', 2, 0);
INSERT INTO `sys_func` VALUES (31, 1, '部门管理', 'modules/sys/dept.html', NULL, 1, 1);
INSERT INTO `sys_func` VALUES (32, 31, '查看', NULL, 'sys:dept:list,sys:dept:info', 2, 0);
INSERT INTO `sys_func` VALUES (33, 31, '新增', NULL, 'sys:dept:save,sys:dept:select', 2, 0);
INSERT INTO `sys_func` VALUES (34, 31, '修改', NULL, 'sys:dept:update,sys:dept:select', 2, 0);
INSERT INTO `sys_func` VALUES (35, 31, '删除', NULL, 'sys:dept:delete', 2, 0);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_role -- Table structure for sys_role
...@@ -120,13 +155,19 @@ CREATE TABLE `sys_func` ( ...@@ -120,13 +155,19 @@ CREATE TABLE `sys_func` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_role`; DROP TABLE IF EXISTS `sys_role`;
CREATE TABLE `sys_role` ( CREATE TABLE `sys_role` (
`role_id` bigint(20) NOT NULL, `role_id` bigint(20) NOT NULL AUTO_INCREMENT,
`role_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色名称', `role_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色名称',
`remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注', `remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
`dept_id` bigint(20) DEFAULT NULL COMMENT '部门Id', `dept_id` bigint(20) DEFAULT NULL COMMENT '部门Id',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`role_id`) USING BTREE PRIMARY KEY (`role_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 27 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_role
-- ----------------------------
INSERT INTO `sys_role` VALUES (1, '管理员', '描述', 1, '2020-03-10 12:06:37');
INSERT INTO `sys_role` VALUES (26, 'zzzzzzzzzz', 'zzzzzzzzzzzzzzz', 0, '2020-03-13 04:51:20');
-- ---------------------------- -- ----------------------------
-- Table structure for sys_role_dept -- Table structure for sys_role_dept
...@@ -134,11 +175,18 @@ CREATE TABLE `sys_role` ( ...@@ -134,11 +175,18 @@ CREATE TABLE `sys_role` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_role_dept`; DROP TABLE IF EXISTS `sys_role_dept`;
CREATE TABLE `sys_role_dept` ( CREATE TABLE `sys_role_dept` (
`id` bigint(20) NOT NULL, `id` bigint(20) NOT NULL AUTO_INCREMENT,
`role_id` bigint(20) DEFAULT NULL COMMENT '角色id', `role_id` bigint(20) DEFAULT NULL COMMENT '角色id',
`dept_id` bigint(20) DEFAULT NULL COMMENT '部门id', `dept_id` bigint(20) DEFAULT NULL COMMENT '部门id',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门与角色映射表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 466 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门与角色映射表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_role_dept
-- ----------------------------
INSERT INTO `sys_role_dept` VALUES (463, 26, 3);
INSERT INTO `sys_role_dept` VALUES (464, 26, 4);
INSERT INTO `sys_role_dept` VALUES (465, 26, 5);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_role_func -- Table structure for sys_role_func
...@@ -146,11 +194,20 @@ CREATE TABLE `sys_role_dept` ( ...@@ -146,11 +194,20 @@ CREATE TABLE `sys_role_dept` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_role_func`; DROP TABLE IF EXISTS `sys_role_func`;
CREATE TABLE `sys_role_func` ( CREATE TABLE `sys_role_func` (
`id` bigint(20) NOT NULL, `id` bigint(20) NOT NULL AUTO_INCREMENT,
`role_id` bigint(20) DEFAULT NULL COMMENT '角色Id', `role_id` bigint(20) DEFAULT NULL COMMENT '角色Id',
`func_id` bigint(20) DEFAULT NULL COMMENT '功能Id', `func_id` bigint(20) DEFAULT NULL COMMENT '功能Id',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '功能与角色映射表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 489 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '功能与角色映射表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_role_func
-- ----------------------------
INSERT INTO `sys_role_func` VALUES (484, 26, 2);
INSERT INTO `sys_role_func` VALUES (485, 26, 15);
INSERT INTO `sys_role_func` VALUES (486, 26, 16);
INSERT INTO `sys_role_func` VALUES (487, 26, 17);
INSERT INTO `sys_role_func` VALUES (488, 26, 18);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_user -- Table structure for sys_user
...@@ -158,7 +215,7 @@ CREATE TABLE `sys_role_func` ( ...@@ -158,7 +215,7 @@ CREATE TABLE `sys_role_func` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_user`; DROP TABLE IF EXISTS `sys_user`;
CREATE TABLE `sys_user` ( CREATE TABLE `sys_user` (
`user_id` bigint(20) NOT NULL COMMENT '用户id', `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户id',
`username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名',
`password` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码', `password` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
`salt` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '加密盐', `salt` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '加密盐',
...@@ -168,7 +225,12 @@ CREATE TABLE `sys_user` ( ...@@ -168,7 +225,12 @@ CREATE TABLE `sys_user` (
`create_time` date DEFAULT NULL COMMENT '创建时间', `create_time` date DEFAULT NULL COMMENT '创建时间',
`dept_id` bigint(20) DEFAULT NULL COMMENT '部门id', `dept_id` bigint(20) DEFAULT NULL COMMENT '部门id',
PRIMARY KEY (`user_id`) USING BTREE PRIMARY KEY (`user_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_user
-- ----------------------------
INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$/uKcZ27sVZSWRRzSx9PEQ.ggLriOfc6AqILEyOYauVQQt5akh4YEm', 'YzcmCZNvbXocrsz9dm8e', 'root@cneeds.com.cn', '13612345678', 1, '2016-11-11', 0);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_user_role -- Table structure for sys_user_role
...@@ -176,10 +238,10 @@ CREATE TABLE `sys_user` ( ...@@ -176,10 +238,10 @@ CREATE TABLE `sys_user` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_user_role`; DROP TABLE IF EXISTS `sys_user_role`;
CREATE TABLE `sys_user_role` ( CREATE TABLE `sys_user_role` (
`id` bigint(20) NOT NULL, `id` bigint(20) NOT NULL AUTO_INCREMENT,
`user_id` bigint(20) DEFAULT NULL COMMENT '用户id', `user_id` bigint(20) DEFAULT NULL COMMENT '用户id',
`role_id` bigint(20) DEFAULT NULL COMMENT '角色id', `role_id` bigint(20) DEFAULT NULL COMMENT '角色id',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色用户映射表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色用户映射表' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java
...@@ -21,4 +21,8 @@ public interface SysRoleDeptDao extends BaseMapper<SysRoleDeptEntity> { ...@@ -21,4 +21,8 @@ public interface SysRoleDeptDao extends BaseMapper<SysRoleDeptEntity> {
*/ */
List<Long> queryDeptIdList(Long[] roleIds); List<Long> queryDeptIdList(Long[] roleIds);
/**
* 根据角色ID数组，批量删除
*/
int deleteBatch(Long[] roleIds);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.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.SysRoleFuncEntity; import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 功能与角色映射表 * 功能与角色映射表
* *
...@@ -13,5 +15,14 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -13,5 +15,14 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface SysRoleFuncDao extends BaseMapper<SysRoleFuncEntity> { public interface SysRoleFuncDao extends BaseMapper<SysRoleFuncEntity> {
/**
* 根据角色ID数组，批量删除
*/
int deleteBatch(Long[] roleIds);
/**
* 根据角色ID，获取菜单ID列表
*/
List<Long> queryMenuIdList(Long roleId);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java
...@@ -21,5 +21,8 @@ public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> { ...@@ -21,5 +21,8 @@ public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
*/ */
List<Long> queryRoleIdList(Long userId); List<Long> queryRoleIdList(Long userId);
/**
* 根据角色ID数组，批量删除
*/
int deleteBatch(Long[] roleIds);
} }
cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleEntity.java
package com.mx.cneeds.server.entity; package com.mx.cneeds.server.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
...@@ -8,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -8,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.beans.Transient; import java.beans.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 角色表 * 角色表
...@@ -45,4 +47,7 @@ public class SysRoleEntity implements Serializable { ...@@ -45,4 +47,7 @@ public class SysRoleEntity implements Serializable {
} }
cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml
...@@ -18,4 +18,11 @@ ...@@ -18,4 +18,11 @@
</foreach> </foreach>
</select> </select>
<delete id="deleteBatch">
delete from sys_role_dept where role_id in
<foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml
...@@ -11,4 +11,14 @@ ...@@ -11,4 +11,14 @@
</resultMap> </resultMap>
<delete id="deleteBatch">
delete from sys_role_func where role_id in
<foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
<select id="queryMenuIdList" resultType="long">
select func_id from sys_role_func where role_id = #{value}
</select>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml
...@@ -15,5 +15,11 @@ ...@@ -15,5 +15,11 @@
</select> </select>
<delete id="deleteBatch">
delete from sys_user_role where role_id in
<foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/RoleDto.java
...@@ -4,6 +4,7 @@ import lombok.Data; ...@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @ClassName DeptDtp * @ClassName DeptDtp
...@@ -39,4 +40,8 @@ public class RoleDto implements Serializable { ...@@ -39,4 +40,8 @@ public class RoleDto implements Serializable {
* 部门名称 * 部门名称
*/ */
private String deptName; private String deptName;
private List<Long> funcIdList;
private List<Long> deptIdList;
} }
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/RoleVo.java 0 → 100644
package com.mx.cneeds.common.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @ClassName DeptDtp
* @Author zzrdark
* @Date 2020-03-10 16:00
* @Description TODO
**/
@Data
public class RoleVo implements Serializable {
/**
*
*/
private Long roleId;
/**
* 角色名称
*/
private String roleName;
/**
* 备注
*/
private String remark;
/**
* 部门Id
*/
private Long deptId;
/**
* 创建时间
*/
private Date createTime;
/**
* 部门名称
*/
private String deptName;
private List<Long> funcIdList;
private List<Long> deptIdList;
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java
...@@ -75,7 +75,17 @@ public interface UserClient { ...@@ -75,7 +75,17 @@ public interface UserClient {
@RequestParam("sidx") String orderField, @RequestParam("sidx") String orderField,
@RequestParam("order") String order); @RequestParam("order") String order);
@PostMapping("/sys/role/info")
RoleDto infoRole(@RequestParam Long roleId);
@PostMapping("/sys/role/save")
void addRole(@RequestBody RoleDto dto);
@PostMapping("/sys/role/update")
void updateRole(@RequestBody RoleDto dto);
@PostMapping("/sys/role/delete")
void deleteRole(@RequestBody List<Long> ids);
/** /**
* *
* @param page * @param page
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java
...@@ -2,15 +2,13 @@ package com.mx.cneeds.server.datashow.web.system; ...@@ -2,15 +2,13 @@ package com.mx.cneeds.server.datashow.web.system;
import com.mx.cneeds.common.UserUtils; import com.mx.cneeds.common.UserUtils;
import com.mx.cneeds.common.converter.RequestParamterConverter; import com.mx.cneeds.common.converter.RequestParamterConverter;
import com.mx.cneeds.common.dto.DepartmentDto; import com.mx.cneeds.common.dto.*;
import com.mx.cneeds.common.dto.FuncDto;
import com.mx.cneeds.common.dto.PageDto;
import com.mx.cneeds.common.dto.UserDto;
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.CascaderVo;
import com.mx.cneeds.common.vo.DepartmentVo; 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.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;
...@@ -67,72 +65,29 @@ public class SystemController { ...@@ -67,72 +65,29 @@ public class SystemController {
return new R().put("data",pageDto); return new R().put("data",pageDto);
} }
@PostMapping("/dept/list") @PostMapping("/func/listAll")
public R deptList(@RequestParam(required = false) Integer page, public R selectTreeFunc(){
@RequestParam(required = false) Integer pageSize, List<FuncDto> dtos = userClient.funcListAll();
@RequestParam(required = false) String sort){ List<TreeVo> rootList = new ArrayList<>();
List<TreeVo> bodyList = new ArrayList<>();
String orderField = null; dtos.forEach(dto -> {
String order = null; TreeVo vo = new TreeVo(
dto.getFuncId(),
if (page==null || page==0){ dto.getName(),
page = new Integer(1); dto.getParentId());
} if (dto.getParentId() == 0L){
if (pageSize==null || pageSize==0){ rootList.add(vo);
pageSize = new Integer(10); } else {
} bodyList.add(vo);
if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
if (sort.contains("+")){
order = new String("asc");
}
if (sort.contains("-")){
order = new String("desc");
}
orderField = sort.substring(1);
orderField = RequestParamterConverter.toLine(orderField);
}
PageDto pageDto = userClient.deptList(page,pageSize,orderField,order);
return new R().put("data",pageDto);
}
@PostMapping("/role/list")
public R roleList(@RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) String sort){
String orderField = null;
String order = null;
if (page==null || page==0){
page = new Integer(1);
}
if (pageSize==null || pageSize==0){
pageSize = new Integer(10);
}
if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
if (sort.contains("+")){
order = new String("asc");
}
if (sort.contains("-")){
order = new String("desc");
}
orderField = sort.substring(1);
orderField = RequestParamterConverter.toLine(orderField);
} }
});
PageDto pageDto = userClient.roleList(page,pageSize,orderField,order); TreeToolUtils utils = new TreeToolUtils(rootList,bodyList);
List<TreeVo> result = utils.getTree();
return new R().put("data",pageDto); return new R().put("data",result);
} }
@PostMapping("/user/list") @PostMapping("/dept/list")
public R userList(@RequestParam(required = false) Integer page, public R deptList(@RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer pageSize, @RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) String sort){ @RequestParam(required = false) String sort){
...@@ -158,7 +113,7 @@ public class SystemController { ...@@ -158,7 +113,7 @@ public class SystemController {
} }
PageDto pageDto = userClient.userList(page,pageSize,orderField,order); PageDto pageDto = userClient.deptList(page,pageSize,orderField,order);
return new R().put("data",pageDto); return new R().put("data",pageDto);
} }
...@@ -197,16 +152,18 @@ public class SystemController { ...@@ -197,16 +152,18 @@ public class SystemController {
List<DepartmentDto> dtos = userClient.deptListAll(); List<DepartmentDto> dtos = userClient.deptListAll();
List<CascaderVo> rootList = new ArrayList<>(); List<CascaderVo> rootList = new ArrayList<>();
List<CascaderVo> bodyList = new ArrayList<>(); List<CascaderVo> bodyList = new ArrayList<>();
if (userDto.getDeptId()==0){ /*if (userDto.getDeptId()==0){
CascaderVo voRoot = new CascaderVo(0L,"根",0L); CascaderVo voRoot = new CascaderVo(0L,"根",0L);
rootList.add(voRoot); rootList.add(voRoot);
} }*/
dtos.forEach(dto -> { dtos.forEach(dto -> {
CascaderVo vo = new CascaderVo( CascaderVo vo = new CascaderVo(
dto.getDeptId(), dto.getDeptId(),
dto.getName(), dto.getName(),
dto.getParentId()); dto.getParentId());
if (dto.getParentId().equals(userDto.getDeptId())){ if (dto.getParentId()==null){
rootList.add(vo);
}else if (rootList.size() == 0 && dto.getParentId().equals(userDto.getDeptId())){
rootList.add(vo); rootList.add(vo);
} else { } else {
bodyList.add(vo); bodyList.add(vo);
...@@ -228,35 +185,113 @@ public class SystemController { ...@@ -228,35 +185,113 @@ public class SystemController {
dto.getDeptId(), dto.getDeptId(),
dto.getName(), dto.getName(),
dto.getParentId()); dto.getParentId());
if (dto.getParentId().equals(userDto.getDeptId())){ if (dto.getParentId()==null){
rootList.add(vo);
}else if (rootList.size() == 0 && dto.getParentId().equals(userDto.getDeptId())){
rootList.add(vo); rootList.add(vo);
} else { } else {
bodyList.add(vo); bodyList.add(vo);
} }
}); });
TreeToolUtils utils = new TreeToolUtils(rootList,bodyList); TreeToolUtils utils = new TreeToolUtils(rootList,bodyList);
List<TreeVo> result = utils.getTree(); List<TreeVo> result = utils.getTree();
return new R().put("data",result); return new R().put("data",result);
} }
@PostMapping("/func/listAll") @PostMapping("/role/list")
public R selectTreeFunc(){ public R roleList(@RequestParam(required = false) Integer page,
List<FuncDto> dtos = userClient.funcListAll(); @RequestParam(required = false) Integer pageSize,
List<TreeVo> rootList = new ArrayList<>(); @RequestParam(required = false) String sort){
List<TreeVo> bodyList = new ArrayList<>();
dtos.forEach(dto -> {
TreeVo vo = new TreeVo( String orderField = null;
dto.getFuncId(), String order = null;
dto.getName(),
dto.getParentId()); if (page==null || page==0){
if (dto.getParentId() == 0L){ page = new Integer(1);
rootList.add(vo);
} else {
bodyList.add(vo);
} }
}); if (pageSize==null || pageSize==0){
TreeToolUtils utils = new TreeToolUtils(rootList,bodyList); pageSize = new Integer(10);
List<TreeVo> result = utils.getTree(); }
return new R().put("data",result);
if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
if (sort.contains("+")){
order = new String("asc");
} }
if (sort.contains("-")){
order = new String("desc");
}
orderField = sort.substring(1);
orderField = RequestParamterConverter.toLine(orderField);
}
PageDto pageDto = userClient.roleList(page,pageSize,orderField,order);
return new R().put("data",pageDto);
}
@RequestMapping("/role/info")
public R infoRole(Long roleId){
RoleDto dto = userClient.infoRole(roleId);
return R.ok().put("data",dto);
}
@RequestMapping("/role/add")
public R roleAdd(RoleVo vo){
RoleDto dto = new RoleDto();
BeanUtils.copyProperties(vo,dto);
userClient.addRole(dto);
return R.ok();
}
@PostMapping("/role/edit")
public R editRole(RoleVo vo){
RoleDto dto = new RoleDto();
BeanUtils.copyProperties(vo,dto);
userClient.updateRole(dto);
return R.ok();
}
@PostMapping("/role/delete")
public R deleteRole(@RequestParam(value = "ids",required = false) List<Long> ids){
userClient.deleteRole(ids);
return R.ok();
}
@PostMapping("/user/list")
public R userList(@RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) String sort){
String orderField = null;
String order = null;
if (page==null || page==0){
page = new Integer(1);
}
if (pageSize==null || pageSize==0){
pageSize = new Integer(10);
}
if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
if (sort.contains("+")){
order = new String("asc");
}
if (sort.contains("-")){
order = new String("desc");
}
orderField = sort.substring(1);
orderField = RequestParamterConverter.toLine(orderField);
}
PageDto pageDto = userClient.userList(page,pageSize,orderField,order);
return new R().put("data",pageDto);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java
...@@ -7,6 +7,7 @@ import com.mx.cneeds.server.entity.SysDeptEntity; ...@@ -7,6 +7,7 @@ import com.mx.cneeds.server.entity.SysDeptEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* 部门表 * 部门表
...@@ -31,7 +32,7 @@ public interface SysDeptService extends IService<SysDeptEntity> { ...@@ -31,7 +32,7 @@ public interface SysDeptService extends IService<SysDeptEntity> {
List<Long> queryDetpIdList(Long parentId); List<Long> queryDetpIdList(Long parentId);
List<SysDeptEntity> queryDeptIdsBydeptName(List<Long> Ids); List<SysDeptEntity> queryDeptIdsBydeptName(Set<Long> Ids);
Long queryDeptCount(Map<String, Object> params); Long queryDeptCount(Map<String, Object> params);
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java
...@@ -3,6 +3,7 @@ package com.mx.cneeds.server.user.service; ...@@ -3,6 +3,7 @@ package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.server.entity.SysRoleDeptEntity; import com.mx.cneeds.server.entity.SysRoleDeptEntity;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -22,5 +23,9 @@ public interface SysRoleDeptService extends IService<SysRoleDeptEntity> { ...@@ -22,5 +23,9 @@ public interface SysRoleDeptService extends IService<SysRoleDeptEntity> {
* 根据角色ID，获取部门ID列表 * 根据角色ID，获取部门ID列表
*/ */
List<Long> queryDeptIdList(Long[] roleIds) ; List<Long> queryDeptIdList(Long[] roleIds) ;
void saveOrUpdate(Long roleId, List<Long> deptIdList);
int deleteBatch(Long[] roleIds);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java
...@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service; ...@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.server.entity.SysRoleFuncEntity; import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -15,6 +17,12 @@ import java.util.Map; ...@@ -15,6 +17,12 @@ import java.util.Map;
*/ */
public interface SysRoleFuncService extends IService<SysRoleFuncEntity> { public interface SysRoleFuncService extends IService<SysRoleFuncEntity> {
void saveOrUpdate(Long roleId, List<Long> menuIdList);
PageUtils queryPage(Map<String, Object> params); PageUtils queryPage(Map<String, Object> params);
int deleteBatch(Long[] roleIds);
List<Long> queryMenuIdList(Long roleId);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java
...@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service; ...@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.server.entity.SysRoleEntity; import com.mx.cneeds.server.entity.SysRoleEntity;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -16,5 +18,9 @@ import java.util.Map; ...@@ -16,5 +18,9 @@ import java.util.Map;
public interface SysRoleService extends IService<SysRoleEntity> { public interface SysRoleService extends IService<SysRoleEntity> {
PageUtils queryPage(Map<String, Object> params); PageUtils queryPage(Map<String, Object> params);
void saveRole(SysRoleEntity role, List<Long> funcIdList, List<Long> deptIdList);
void deleteBatch(Long[] roleIds);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java
...@@ -24,5 +24,6 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> { ...@@ -24,5 +24,6 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> {
*/ */
List<Long> queryRoleIdList(Long userId); List<Long> queryRoleIdList(Long userId);
int deleteBatch(Long[] roleIds);
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java
...@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service; ...@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -86,7 +88,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i ...@@ -86,7 +88,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i
@Override @Override
// @Transactional // @Transactional
public List<SysDeptEntity> queryDeptIdsBydeptName(List<Long> Ids) { public List<SysDeptEntity> queryDeptIdsBydeptName(Set<Long> Ids) {
return baseMapper.selectList(new QueryWrapper<SysDeptEntity>() return baseMapper.selectList(new QueryWrapper<SysDeptEntity>()
.select("dept_id","name").in("dept_id",Ids)); .select("dept_id","name").in("dept_id",Ids));
} }
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java
...@@ -12,6 +12,7 @@ import java.util.Map; ...@@ -12,6 +12,7 @@ import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@Service("sysRoleDeptService") @Service("sysRoleDeptService")
...@@ -32,4 +33,29 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptDao, SysRoleD ...@@ -32,4 +33,29 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptDao, SysRoleD
return baseMapper.queryDeptIdList(roleIds); return baseMapper.queryDeptIdList(roleIds);
} }
@Override
@Transactional(rollbackFor = Exception.class)
public void saveOrUpdate(Long roleId, List<Long> deptIdList) {
//先删除角色与部门关系
deleteBatch(new Long[]{roleId});
if(deptIdList.size() == 0){
return ;
}
//保存角色与菜单关系
for(Long deptId : deptIdList){
SysRoleDeptEntity sysRoleDeptEntity = new SysRoleDeptEntity();
sysRoleDeptEntity.setDeptId(deptId);
sysRoleDeptEntity.setRoleId(roleId);
this.save(sysRoleDeptEntity);
}
}
@Override
public int deleteBatch(Long[] roleIds){
return baseMapper.deleteBatch(roleIds);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java
...@@ -6,16 +6,39 @@ import com.mx.cneeds.server.dao.SysRoleFuncDao; ...@@ -6,16 +6,39 @@ import com.mx.cneeds.server.dao.SysRoleFuncDao;
import com.mx.cneeds.server.entity.SysRoleFuncEntity; import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import com.mx.cneeds.server.user.service.SysRoleFuncService; import com.mx.cneeds.server.user.service.SysRoleFuncService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@Service("sysRoleFuncService") @Service("sysRoleFuncService")
public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleFuncEntity> implements SysRoleFuncService { public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleFuncEntity> implements SysRoleFuncService {
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void saveOrUpdate(Long roleId, List<Long> menuIdList) {
//先删除角色与菜单关系
deleteBatch(new Long[]{roleId});
if(menuIdList.size() == 0){
return ;
}
//保存角色与菜单关系
for(Long funcId : menuIdList){
SysRoleFuncEntity sysRoleFuncEntity = new SysRoleFuncEntity();
sysRoleFuncEntity.setFuncId(funcId);
sysRoleFuncEntity.setRoleId(roleId);
this.save(sysRoleFuncEntity);
}
}
@Override
public PageUtils queryPage(Map<String, Object> params) { public PageUtils queryPage(Map<String, Object> params) {
IPage<SysRoleFuncEntity> page = this.page( IPage<SysRoleFuncEntity> page = this.page(
new Query<SysRoleFuncEntity>().getPage(params), new Query<SysRoleFuncEntity>().getPage(params),
...@@ -25,4 +48,14 @@ public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleF ...@@ -25,4 +48,14 @@ public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleF
return new PageUtils(page); return new PageUtils(page);
} }
@Override
public int deleteBatch(Long[] roleIds){
return baseMapper.deleteBatch(roleIds);
}
@Override
public List<Long> queryMenuIdList(Long roleId) {
return baseMapper.queryMenuIdList(roleId);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java
...@@ -5,22 +5,27 @@ import com.mx.cneeds.common.pager.Query; ...@@ -5,22 +5,27 @@ import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleDao; import com.mx.cneeds.server.dao.SysRoleDao;
import com.mx.cneeds.server.entity.SysDeptEntity; import com.mx.cneeds.server.entity.SysDeptEntity;
import com.mx.cneeds.server.entity.SysRoleEntity; import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.user.service.SysDeptService; import com.mx.cneeds.server.user.service.*;
import com.mx.cneeds.server.user.service.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@Service("sysRoleService") @Service("sysRoleService")
public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> implements SysRoleService { public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> implements SysRoleService {
@Autowired
private SysRoleFuncService sysRoleFuncService;
@Autowired
private SysRoleDeptService sysRoleDeptService;
@Autowired
private SysUserRoleService sysUserRoleService;
@Override @Override
...@@ -33,4 +38,34 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i ...@@ -33,4 +38,34 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
return new PageUtils(page); return new PageUtils(page);
} }
@Override
@Transactional(rollbackFor = Exception.class)
public void saveRole(SysRoleEntity role, List<Long> funcIdList, List<Long> deptIdList) {
role.setCreateTime(new Date());
this.save(role);
//保存角色与菜单关系
sysRoleFuncService.saveOrUpdate(role.getRoleId(), funcIdList);
//保存角色与部门关系
sysRoleDeptService.saveOrUpdate(role.getRoleId(), deptIdList);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteBatch(Long[] roleIds) {
//删除角色
this.removeByIds(Arrays.asList(roleIds));
//删除角色与菜单关联
sysRoleFuncService.deleteBatch(roleIds);
//删除角色与部门关联
sysRoleDeptService.deleteBatch(roleIds);
//删除角色与用户关联
sysUserRoleService.deleteBatch(roleIds);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java
...@@ -32,5 +32,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR ...@@ -32,5 +32,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
return baseMapper.queryRoleIdList(userId); return baseMapper.queryRoleIdList(userId);
} }
@Override
public int deleteBatch(Long[] roleIds){
return baseMapper.deleteBatch(roleIds);
}
} }
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java
...@@ -7,15 +7,14 @@ import com.mx.cneeds.common.validator.ValidatorUtils; ...@@ -7,15 +7,14 @@ import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysDeptEntity; import com.mx.cneeds.server.entity.SysDeptEntity;
import com.mx.cneeds.server.entity.SysRoleEntity; import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.user.service.SysDeptService; import com.mx.cneeds.server.user.service.SysDeptService;
import com.mx.cneeds.server.user.service.SysRoleDeptService;
import com.mx.cneeds.server.user.service.SysRoleFuncService;
import com.mx.cneeds.server.user.service.SysRoleService; import com.mx.cneeds.server.user.service.SysRoleService;
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.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions; //import org.apache.shiro.authz.annotation.RequiresPermissions;
...@@ -35,6 +34,12 @@ public class SysRoleController { ...@@ -35,6 +34,12 @@ public class SysRoleController {
@Autowired @Autowired
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@Autowired
private SysRoleFuncService sysRoleFuncService;
@Autowired
private SysRoleDeptService sysRoleDeptService;
/** /**
* 列表 * 列表
*/ */
...@@ -43,14 +48,14 @@ public class SysRoleController { ...@@ -43,14 +48,14 @@ public class SysRoleController {
public PageUtils list(@RequestParam Map<String, Object> params){ public PageUtils list(@RequestParam Map<String, Object> params){
PageUtils page = sysRoleService.queryPage(params); PageUtils page = sysRoleService.queryPage(params);
List<Long> list = new ArrayList<>(); Set<Long> set = new HashSet<>();
page.getList().forEach(e -> { page.getList().forEach(e -> {
SysRoleEntity entity = (SysRoleEntity) e; SysRoleEntity entity = (SysRoleEntity) e;
list.add(entity.getDeptId()); set.add(entity.getDeptId());
}); });
List<SysDeptEntity> sysDeptEntityList = sysDeptService.queryDeptIdsBydeptName(list); List<SysDeptEntity> sysDeptEntityList = sysDeptService.queryDeptIdsBydeptName(set);
List<RoleDto> roleDtos = new ArrayList<>(); List<RoleDto> roleDtos = new ArrayList<>();
page.getList().forEach(e -> { page.getList().forEach(e -> {
...@@ -72,21 +77,34 @@ public class SysRoleController { ...@@ -72,21 +77,34 @@ public class SysRoleController {
/** /**
* 信息 * 信息
*/ */
@RequestMapping("/info/{roleId}") @RequestMapping("/info")
// @RequiresPermissions("sys:sysrole:info") public RoleDto info(Long roleId){
public R info(@PathVariable("roleId") Long roleId){ SysRoleEntity role = sysRoleService.getById(roleId);
SysRoleEntity sysRole = sysRoleService.getById(roleId);
RoleDto roleDto = new RoleDto();
BeanUtils.copyProperties(role,roleDto);
//查询角色对应的菜单
List<Long> funcIdList = sysRoleFuncService.queryMenuIdList(roleId);
roleDto.setFuncIdList(funcIdList);
//查询角色对应的部门
List<Long> deptIdList = sysRoleDeptService.queryDeptIdList(new Long[]{roleId});
roleDto.setDeptIdList(deptIdList);
return R.ok().put("sysRole", sysRole); return roleDto;
} }
/** /**
* 保存 * 保存
*/ */
@RequestMapping("/save") @RequestMapping("/save")
// @RequiresPermissions("sys:sysrole:save") public R save(@RequestBody RoleDto dto){
public R save(@RequestBody SysRoleEntity sysRole){ SysRoleEntity sysRole = new SysRoleEntity();
sysRoleService.save(sysRole); BeanUtils.copyProperties(dto,sysRole);
sysRoleService.saveRole(sysRole,dto.getFuncIdList(),dto.getDeptIdList());
return R.ok(); return R.ok();
} }
...@@ -95,7 +113,6 @@ public class SysRoleController { ...@@ -95,7 +113,6 @@ public class SysRoleController {
* 修改 * 修改
*/ */
@RequestMapping("/update") @RequestMapping("/update")
// @RequiresPermissions("sys:sysrole:update")
public R update(@RequestBody SysRoleEntity sysRole){ public R update(@RequestBody SysRoleEntity sysRole){
ValidatorUtils.validateEntity(sysRole); ValidatorUtils.validateEntity(sysRole);
sysRoleService.updateById(sysRole); sysRoleService.updateById(sysRole);
...@@ -107,9 +124,8 @@ public class SysRoleController { ...@@ -107,9 +124,8 @@ public class SysRoleController {
* 删除 * 删除
*/ */
@RequestMapping("/delete") @RequestMapping("/delete")
// @RequiresPermissions("sys:sysrole:delete")
public R delete(@RequestBody Long[] roleIds){ public R delete(@RequestBody Long[] roleIds){
sysRoleService.removeByIds(Arrays.asList(roleIds)); sysRoleService.deleteBatch(roleIds);
return R.ok(); return R.ok();
} }
......
cneeds-server-user/src/main/resources/application-dev.yml
...@@ -50,7 +50,7 @@ eureka: ...@@ -50,7 +50,7 @@ eureka:
defaultZone: http://192.168.2.244:8761/eureka/ defaultZone: http://192.168.2.244:8761/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
ip-address: 192.168.2.244 # ip-address: 192.168.2.244
mybatis-plus: mybatis-plus:
......
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