diff --git a/mms-font/src/utils/index.js b/mms-font/src/utils/index.js index a458b83de4f6d3baf845231850d7499901c7db54..615ec894a42fdd0282b9962c091a3f6a55571804 100644 --- a/mms-font/src/utils/index.js +++ b/mms-font/src/utils/index.js @@ -48,6 +48,14 @@ export function treeDataTranslate (data, id = 'id', pid = 'parentId') { return res } +/** + * 数组去重 + * @param {*} arr 数组 + */ +export function unique (arr) { + return Array.from(new Set(arr)) +} + /** * 清除登录信息 */ diff --git a/mms-font/src/views/main.vue b/mms-font/src/views/main.vue index 46e0eaa9ce497b2500cc3a384b306fb497250613..908079471889a9ec75c453e6d516ae6962b3c546 100644 --- a/mms-font/src/views/main.vue +++ b/mms-font/src/views/main.vue @@ -90,7 +90,7 @@ // 获取当前管理员信息 getUserInfo () { this.$http({ - url: this.$http.adornUrl('/sys/user/info'), + url: this.$http.adornUrl('/sys/user/currentUser'), method: 'get', params: this.$http.adornParams() }).then(({data}) => { diff --git a/mms-font/src/views/modules/sys/user-add-or-update.vue b/mms-font/src/views/modules/sys/user-add-or-update.vue index e4dd4e774e9427686ff33595694456ccee9adacd..4a1a0d22f334c5668a3f1b9ae1ab83f8005674d0 100644 --- a/mms-font/src/views/modules/sys/user-add-or-update.vue +++ b/mms-font/src/views/modules/sys/user-add-or-update.vue @@ -2,179 +2,246 @@ - - - - - - - - - - - - - + :visible.sync="visible" + > + + + + + + + + + + + 选择文件 + + + + + + + + + + + + + + + + + + + + + + + - - - {{ role.roleName }} - - - - - 禁用 - 正常 - - + + + + + + + 禁用 + 正常 + + + + + + + 男 + 女 + + + + + + + + + {{ role.name }} + + + + + + + + + + + + - 取消 + 取消 确定 diff --git a/mms-font/src/views/modules/sys/user.vue b/mms-font/src/views/modules/sys/user.vue index b716b073c8d3ec6fbbdc9e18a8c3652b3aee25df..27e780e1b9a1c07654068707081a1f7245fcea6f 100644 --- a/mms-font/src/views/modules/sys/user.vue +++ b/mms-font/src/views/modules/sys/user.vue @@ -2,7 +2,7 @@
- + 查询 @@ -21,19 +21,27 @@ header-align="center" align="center" width="50"> + + + width="150" + label="编码"> + width="150" + label="姓名"> @@ -113,6 +123,11 @@ activated () { this.getDataList() }, + mounted () { + this.$nextTick(() => { + this.$refs.userName.focus() + }) + }, methods: { // 获取数据列表 getDataList () { @@ -123,7 +138,7 @@ params: this.$http.adornParams({ 'page': this.pageIndex, 'limit': this.pageSize, - 'username': this.dataForm.userName + 'userName': this.dataForm.userName }) }).then(({data}) => { if (data && data.code === 0) { @@ -134,6 +149,9 @@ this.totalPage = 0 } this.dataListLoading = false + this.$nextTick(() => { + this.$refs.userName.focus() + }) }) }, // 每页数 diff --git a/mms/src/main/java/com/pannk/mms/common/base/Constant.java b/mms/src/main/java/com/pannk/mms/common/base/Constant.java index bead13dfaf19beb44f61bb3a34a3e515e5687d75..73d903545d36d55c2efad72d527962f5afed79e7 100644 --- a/mms/src/main/java/com/pannk/mms/common/base/Constant.java +++ b/mms/src/main/java/com/pannk/mms/common/base/Constant.java @@ -20,8 +20,11 @@ public class Constant { public static final String PAGE = "page"; public static final String LIMIT = "limit"; public static final String ORDER_FIELD = "sidx"; - public static final String ORDER ="order"; + public static final String ORDER = "order"; public static final String ASC = "ASC"; + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + public static final String SIMPLE_DATE_FORMAT = "yyyy-MM-dd"; + public static final String INIT_PASSWORD = "123456"; /** * 菜单类型 diff --git a/mms/src/main/java/com/pannk/mms/common/config/FastJsonMessageConverterConfig.java b/mms/src/main/java/com/pannk/mms/common/config/FastJsonMessageConverterConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..09a0a7bda5c7062fecb7bda1f83e4e111e5d3c5a --- /dev/null +++ b/mms/src/main/java/com/pannk/mms/common/config/FastJsonMessageConverterConfig.java @@ -0,0 +1,46 @@ +package com.pannk.mms.common.config; + +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson.support.config.FastJsonConfig; +import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import com.pannk.mms.common.base.Constant; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by wolf on 20-11-23. + */ +@Configuration +public class FastJsonMessageConverterConfig extends WebMvcConfigurationSupport { + @Override + public void configureMessageConverters(List> converters) { + for (int i = 0; i < converters.size(); i++) { + HttpMessageConverter converter = converters.get(i); + if (converter instanceof MappingJackson2HttpMessageConverter) { + converters.remove(converter); + break; + } + } + FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter(); + FastJsonConfig fastJsonConfig = new FastJsonConfig(); + fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue, // 是否输出值为null的字段,默认为false,我们将它打开 + SerializerFeature.WriteNullListAsEmpty, // 将Collection类型字段的字段空值输出为[] + SerializerFeature.WriteNullStringAsEmpty, // 将字符串类型字段的空值输出为空字符串 + SerializerFeature.WriteNullNumberAsZero, // 将数值类型字段的空值输出为0 + SerializerFeature.WriteDateUseDateFormat, + SerializerFeature.DisableCircularReferenceDetect // 禁用循环引用 + ); + fastJsonConfig.setDateFormat(Constant.DATE_FORMAT); + fastJsonHttpMessageConverter.setFastJsonConfig(fastJsonConfig); + List fastMediaTypes = new ArrayList<>(); + fastMediaTypes.add(MediaType.APPLICATION_JSON); + fastJsonHttpMessageConverter.setSupportedMediaTypes(fastMediaTypes); + converters.add(fastJsonHttpMessageConverter); + } +} diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/controller/SysUserController.java b/mms/src/main/java/com/pannk/mms/modules/sys/controller/SysUserController.java index 0b43ec78cd76727a16e054137f7708cc91a2e1d5..ed504052bf317077db185afdf2fccc428d25da82 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/controller/SysUserController.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/controller/SysUserController.java @@ -1,15 +1,13 @@ package com.pannk.mms.modules.sys.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pannk.mms.common.base.BaseController; -import com.pannk.mms.common.base.PageData; import com.pannk.mms.common.base.Result; import com.pannk.mms.modules.sys.entity.SysUserEntity; import com.pannk.mms.modules.sys.service.SysUserService; +import com.pannk.mms.modules.sys.vo.SysUserInfo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -24,29 +22,86 @@ public class SysUserController extends BaseController { private SysUserService sysUserService; - + /** + * 用户列表 + * + * @param params 参数 + * @return + */ @GetMapping("/list") - public Result list(@RequestParam Map params) { + public Result list(@RequestParam Map params) { return Result.success(sysUserService.queryPage(params)); } - @GetMapping("/info") - public Result detail() { + + /** + * 当前登录用户 + * + * @return + */ + @GetMapping("/currentUser") + public Result currentUser() { return Result.success(sysUserService.queryUserInfo(getUserId())); } - @GetMapping("/save") - public Result save() { - SysUserEntity sysUserEntity = new SysUserEntity(); - sysUserEntity.setCode("P00001"); - sysUserEntity.setEmail("qxd@126.com"); - sysUserEntity.setFullName("秦晓东"); - sysUserEntity.setGender(0); - sysUserEntity.setStatus(0); - sysUserEntity.setUserName("qxd"); - sysUserEntity.setPassword("123456"); - createData(sysUserEntity); - sysUserService.save(sysUserEntity); - return Result.success(sysUserEntity); + /** + * 用户信息 + * + * @param id id + * @return + */ + @GetMapping("/info/{id}") + public Result info(@PathVariable Long id) { + return Result.success(sysUserService.queryUserInfo(id)); + } + + /** + * 新增用户 + * + * @param sysUserInfo 用户 + * @return + */ + @PostMapping("/save") + public Result save(@RequestBody SysUserInfo sysUserInfo) { + createData(sysUserInfo); + sysUserService.saveUserInfo(sysUserInfo); + return Result.success(sysUserInfo); + } + + /** + * 更新信息 + * + * @param sysUserInfo 用户信息 + * @return + */ + @PutMapping("/update") + public Result update(@RequestBody SysUserInfo sysUserInfo) { + updateDate(sysUserInfo); + sysUserService.updateUserInfo(sysUserInfo); + return Result.success(sysUserInfo); + } + + /** + * 删除用户 + * + * @param id id + * @return + */ + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Long id) { + sysUserService.removeById(id); + return Result.success(); + } + + /** + * 批量删除 + * + * @param ids id数组 + * @return + */ + @DeleteMapping("/batchDelete") + public Result batchDelete(Long[] ids) { + sysUserService.remove(new QueryWrapper().in("id", ids)); + return Result.success(); } } diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserMapper.java b/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserMapper.java index 88f59a6e4101b75b93ecd42ecc014d431e32b25e..cec3d33d38dd4779ca1227e86c36b993a9d6f5b5 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserMapper.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserMapper.java @@ -16,4 +16,10 @@ public interface SysUserMapper extends BaseMapper { * @return */ SysUserEntity queryByUserName(String userName); + + /** + * 删除用户角色 + * @param id 用户ID + */ + void deleteUserRole(Long id); } diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserRoleMapper.java b/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserRoleMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ecd804a90e9b21fdc34cf9acdd607be9d0b79ffb --- /dev/null +++ b/mms/src/main/java/com/pannk/mms/modules/sys/dao/SysUserRoleMapper.java @@ -0,0 +1,12 @@ +package com.pannk.mms.modules.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pannk.mms.modules.sys.entity.SysUserRoleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * Created by wolf on 20-11-23. + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { +} diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/entity/SysUserEntity.java b/mms/src/main/java/com/pannk/mms/modules/sys/entity/SysUserEntity.java index 3e88fa3f05eb19a9496d9ea722b808168944a2fc..2cb288668eaddfd7c88b990d0394fe76802da96e 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/entity/SysUserEntity.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/entity/SysUserEntity.java @@ -58,9 +58,12 @@ public class SysUserEntity extends BaseEntity { /** * 头像 */ - private String avatar; + private String mobile; + /** + * 备注 + */ private String remark; /** diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserRoleService.java b/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserRoleService.java new file mode 100644 index 0000000000000000000000000000000000000000..64fad5f7446bb8035911105b4df2b83106c1426e --- /dev/null +++ b/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserRoleService.java @@ -0,0 +1,10 @@ +package com.pannk.mms.modules.sys.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pannk.mms.modules.sys.entity.SysUserRoleEntity; + +/** + * Created by wolf on 20-11-23. + */ +public interface SysUserRoleService extends IService{ +} diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserService.java b/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserService.java index f0030329c6f63da06c9cf2af6b7b174da80f7e21..92f02d2c0d1997a3210b177de7d74c4943184c0a 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserService.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/service/SysUserService.java @@ -55,4 +55,18 @@ public interface SysUserService extends IService { * @return */ PageData queryPage(Map params); + + /** + * 更新用户信息 + * + * @param sysUserInfo 用户信息 + */ + void updateUserInfo(SysUserInfo sysUserInfo); + + /** + * 新增用户信息 + * + * @param sysUserInfo 用户信息 + */ + void saveUserInfo(SysUserInfo sysUserInfo); } diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserRoleServiceImpl.java b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4c09863d0b5810d57772fce3b75d9ce6b46774b5 --- /dev/null +++ b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,15 @@ +package com.pannk.mms.modules.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pannk.mms.modules.sys.dao.SysUserRoleMapper; +import com.pannk.mms.modules.sys.entity.SysUserRoleEntity; +import com.pannk.mms.modules.sys.service.SysUserRoleService; +import org.springframework.stereotype.Service; + +/** + * Created by wolf on 20-11-23. + */ +@Service +public class SysUserRoleServiceImpl extends ServiceImpl implements + SysUserRoleService { +} diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java index eb33adb875374483d7dbd95d27f6aa571dad0f87..efff6918eaae510c9a4809f1726dfec765fffd9d 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/service/impl/SysUserServiceImpl.java @@ -12,15 +12,20 @@ import com.pannk.mms.common.utils.TokenUtil; import com.pannk.mms.modules.sys.dao.SysUserMapper; import com.pannk.mms.modules.sys.entity.SysRoleEntity; import com.pannk.mms.modules.sys.entity.SysUserEntity; +import com.pannk.mms.modules.sys.entity.SysUserRoleEntity; import com.pannk.mms.modules.sys.service.SysRoleService; +import com.pannk.mms.modules.sys.service.SysUserRoleService; import com.pannk.mms.modules.sys.service.SysUserService; import com.pannk.mms.modules.sys.vo.LoginForm; import com.pannk.mms.modules.sys.vo.SysUserInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -38,6 +43,9 @@ public class SysUserServiceImpl extends ServiceImpl roles = sysRoleService.queryUserRole(sysUserEntity.getId()); BeanUtils.copyProperties(sysUserEntity, sysUserInfo); sysUserInfo.setRoles(roles); + List roleIdList = new ArrayList<>(); + for (SysRoleEntity sre : roles) { + roleIdList.add(sre.getId()); + } + sysUserInfo.setRoleIdList(roleIdList); return sysUserInfo; } @@ -77,9 +90,47 @@ public class SysUserServiceImpl extends ServiceImpl queryPage(Map params) { - IPage page = this.page(new Query().getPage(params), new QueryWrapper<>()); + String userName = (String) params.get("userName"); + IPage page = this.page(new Query().getPage(params), new + QueryWrapper().like(StringUtils.isNotEmpty(userName), "user_name", userName)); return new PageData<>(page); } + + @Transactional(rollbackFor = Exception.class) + @Override + public void updateUserInfo(SysUserInfo sysUserInfo) { + this.updateById(sysUserInfo); + sysUserRoleService.remove(new QueryWrapper().eq("user_id", sysUserInfo.getId())); + saveUserRole(sysUserInfo); + } + + /** + * 保存用户角色 + * + * @param sysUserInfo 用户信息 + */ + private void saveUserRole(SysUserInfo sysUserInfo) { + List sysUserRoleIdList = sysUserInfo.getRoleIdList(); + if (sysUserRoleIdList.size() > 0) { + List list = new ArrayList<>(sysUserRoleIdList.size()); + for (Long roleId : sysUserRoleIdList) { + SysUserRoleEntity sysUserRoleEntity = new SysUserRoleEntity(); + sysUserRoleEntity.setUserId(sysUserInfo.getId()); + sysUserRoleEntity.setRoleId(roleId); + list.add(sysUserRoleEntity); + } + sysUserRoleService.saveBatch(list); + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void saveUserInfo(SysUserInfo sysUserInfo) { + sysUserInfo.setPassword(Constant.INIT_PASSWORD); + save(sysUserInfo); + saveUserRole(sysUserInfo); + } } diff --git a/mms/src/main/java/com/pannk/mms/modules/sys/vo/SysUserInfo.java b/mms/src/main/java/com/pannk/mms/modules/sys/vo/SysUserInfo.java index 4e152d7ba61ba30d438d19811eb424284d7900ed..624dae6e532ec6671f006564c43fd47be839083f 100644 --- a/mms/src/main/java/com/pannk/mms/modules/sys/vo/SysUserInfo.java +++ b/mms/src/main/java/com/pannk/mms/modules/sys/vo/SysUserInfo.java @@ -15,4 +15,9 @@ public class SysUserInfo extends SysUserEntity { * 用户角色 */ List roles; + + /** + * 角色Id + */ + List roleIdList; } diff --git a/mms/src/main/resources/db/init.sql b/mms/src/main/resources/db/init.sql index e7cfdfa4fe8dc9cc92006c881db5fc4e443c104f..ab00189c1bff248d9a906040ff44640b34f4a035 100644 --- a/mms/src/main/resources/db/init.sql +++ b/mms/src/main/resources/db/init.sql @@ -1,23 +1,39 @@ -- 系统用户表 CREATE TABLE `sys_user` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', - `user_name` varchar(100) NOT NULL COMMENT '用户名', - `password` varchar(100) NOT NULL COMMENT '密码', - `code` varchar(100) NOT NULL COMMENT '编号', - `gender` smallint DEFAULT '0' COMMENT '性别,0:男,1:女', - `email` varchar(100) DEFAULT NULL COMMENT '邮箱', - `full_name` varchar(100) DEFAULT NULL COMMENT '姓名', - `status` varchar(100) NOT NULL COMMENT '状态,0:启用,1:禁用', - `create_date` date DEFAULT NULL COMMENT '新增日期', - `create_user` varchar(100) DEFAULT NULL COMMENT '新增人', - `update_date` date DEFAULT NULL COMMENT '更新日期', - `update_user` varchar(100) DEFAULT NULL COMMENT '更新人', - `avatar` blob, - `remark` text, + `id` BIGINT NOT NULL AUTO_INCREMENT + COMMENT '主键', + `user_name` VARCHAR(100) NOT NULL + COMMENT '用户名', + `password` VARCHAR(100) NOT NULL + COMMENT '密码', + `code` VARCHAR(100) NOT NULL + COMMENT '编号', + `gender` SMALLINT DEFAULT '0' + COMMENT '性别,0:男,1:女', + `email` VARCHAR(100) DEFAULT NULL + COMMENT '邮箱', + `full_name` VARCHAR(100) DEFAULT NULL + COMMENT '姓名', + `status` VARCHAR(100) NOT NULL + COMMENT '状态,0:启用,1:禁用', + `create_date` DATETIME DEFAULT NULL + COMMENT '新增日期', + `create_user` VARCHAR(100) DEFAULT NULL + COMMENT '新增人', + `update_date` DATETIME DEFAULT NULL + COMMENT '更新日期', + `update_user` VARCHAR(100) DEFAULT NULL + COMMENT '更新人', + `mobile` VARCHAR(20) COMMENT '手机号', + `remark` TEXT, PRIMARY KEY (`id`), UNIQUE KEY `user_name_unique` (`user_name`), UNIQUE KEY `code_unique` (`code`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci +) + ENGINE = InnoDB + AUTO_INCREMENT = 4 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci -- 用户角色表 CREATE TABLE `sys_user_role` ( `id` BIGINT NOT NULL AUTO_INCREMENT @@ -203,51 +219,51 @@ CREATE TABLE `biz_workflow` ( ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci; -INSERT INTO `sys_menu`(id,parent_id,name,url,perms,type,icon,seq,create_user,create_date) VALUES - (1,0,'系统管理',NULL,NULL,0,'system',0,1,now()), - (2,1,'管理员列表','sys/user',NULL,1,'admin',1,1,now()), - (3,1,'角色管理','sys/role',NULL,1,'role',2,1,now()), - (4,1,'菜单管理','sys/menu',NULL,1,'menu',3,1,now()), - (6,1,'定时任务','job/schedule',NULL,1,'job',5,1,now()), - (7,6,'查看',NULL,'sys:schedule:list,sys:schedule:info',2,NULL,0,1,now()), - (8,6,'新增',NULL,'sys:schedule:save',2,NULL,0,1,now()), - (9,6,'修改',NULL,'sys:schedule:update',2,NULL,0,1,now()), - (10,6,'删除',NULL,'sys:schedule:delete',2,NULL,0,1,now()), - (11,6,'暂停',NULL,'sys:schedule:pause',2,NULL,0,1,now()), - (12,6,'恢复',NULL,'sys:schedule:resume',2,NULL,0,1,now()), - (13,6,'立即执行',NULL,'sys:schedule:run',2,NULL,0,1,now()), - (14,6,'日志列表',NULL,'sys:schedule:log',2,NULL,0,1,now()), - (15,2,'查看',NULL,'sys:user:list,sys:user:info',2,NULL,0,1,now()), - (16,2,'新增',NULL,'sys:user:save,sys:role:select',2,NULL,0,1,now()), - (17,2,'修改',NULL,'sys:user:update,sys:role:select',2,NULL,0,1,now()), - (18,2,'删除',NULL,'sys:user:delete',2,NULL,0,1,now()), - (19,3,'查看',NULL,'sys:role:list,sys:role:info',2,NULL,0,1,now()), - (20,3,'新增',NULL,'sys:role:save,sys:menu:list',2,NULL,0,1,now()), - (21,3,'修改',NULL,'sys:role:update,sys:menu:list',2,NULL,0,1,now()), - (22,3,'删除',NULL,'sys:role:delete',2,NULL,0,1,now()), - (23,4,'查看',NULL,'sys:menu:list,sys:menu:info',2,NULL,0,1,now()), - (24,4,'新增',NULL,'sys:menu:save,sys:menu:select',2,NULL,0,1,now()), - (25,4,'修改',NULL,'sys:menu:update,sys:menu:select',2,NULL,0,1,now()), - (26,4,'删除',NULL,'sys:menu:delete',2,NULL,0,1,now()), - (27,1,'参数管理','sys/config','sys:config:list,sys:config:info,sys:config:save,sys:config:update,sys:config:delete',1,'config',6,1,now()), - (29,1,'系统日志','sys/log','sys:log:list',1,'log',7,1,now()), - (36,0,'设备管理','','',0,'shouye',1,1,now()), - (45,36,'设备类型','devices/device/devicetype','',1,'menu',0,1,now()), - (46,36,'设备实例','devices/deviceExample/deviceExa','',1,'editor',3,1,now()), - (47,36,'设备厂家','devices/deviceFactory/deviceFac','',1,'role',1,1,now()), - (49,45,'查看','','device:devicetype:list,device:devicetype:info',2,'',0,1,now()), - (52,45,'修改状态','','device:devicetype:status',2,'',0,1,now()), - (53,46,'查看',NULL,'device:accessdeviceinfo:list,device:accessdeviceinfo:info',2,NULL,0,1,now()), - (54,46,'新增',NULL,'device:accessdeviceinfo:save',2,NULL,0,1,now()), - (55,46,'删除',NULL,'device:accessdeviceinfo:delete',2,NULL,0,1,now()), - (56,46,'修改',NULL,'device:accessdeviceinfo:update,device:accessdeviceinfo:updateStatus',2,NULL,0,1,now()), - (57,47,'查看','','device:manufacturer:list,device:manufacturer:info',2,'',0,1,now()), - (60,47,'修改状态','','device:manufacturer:status',2,'',0,1,now()), - (65,36,'区域管理','devices/region/index','',1,'config',2,1,now()), - (66,65,'新增','','device:deviceregion:save',2,'',0,1,now()), - (67,65,'查看','','device:deviceregion:list,device:deviceregion:info',2,'',0,1,now()), - (68,65,'更新','','device:deviceregion:update',2,'',0,1,now()), - (69,65,'删除','','device:deviceregion:delete',2,'',0,1,now()), - (72,45,'保存订阅地址','','device:devicetypetemplate:updateSubscribeUrl',2,'',0,1,now()), - (73,45,'修改类型模板状态','','device:devicetypetemplate:updateStatus',2,'',0,1,now()), - (74,36,'设备告警','devices/deviceReport/index','',1,'',5,1,now()); \ No newline at end of file +INSERT INTO `sys_menu` (id, parent_id, name, url, perms, type, icon, seq, create_user, create_date) VALUES + (1, 0, '系统管理', NULL, NULL, 0, 'system', 0, 1, now()), + (2, 1, '管理员列表', 'sys/user', NULL, 1, 'admin', 1, 1, now()), + (3, 1, '角色管理', 'sys/role', NULL, 1, 'role', 2, 1, now()), + (4, 1, '菜单管理', 'sys/menu', NULL, 1, 'menu', 3, 1, now()), + (6, 1, '定时任务', 'job/schedule', NULL, 1, 'job', 5, 1, now()), + (7, 6, '查看', NULL, 'sys:schedule:list,sys:schedule:info', 2, NULL, 0, 1, now()), + (8, 6, '新增', NULL, 'sys:schedule:save', 2, NULL, 0, 1, now()), + (9, 6, '修改', NULL, 'sys:schedule:update', 2, NULL, 0, 1, now()), + (10, 6, '删除', NULL, 'sys:schedule:delete', 2, NULL, 0, 1, now()), + (11, 6, '暂停', NULL, 'sys:schedule:pause', 2, NULL, 0, 1, now()), + (12, 6, '恢复', NULL, 'sys:schedule:resume', 2, NULL, 0, 1, now()), + (13, 6, '立即执行', NULL, 'sys:schedule:run', 2, NULL, 0, 1, now()), + (14, 6, '日志列表', NULL, 'sys:schedule:log', 2, NULL, 0, 1, now()), + (15, 2, '查看', NULL, 'sys:user:list,sys:user:info', 2, NULL, 0, 1, now()), + (16, 2, '新增', NULL, 'sys:user:save,sys:role:select', 2, NULL, 0, 1, now()), + (17, 2, '修改', NULL, 'sys:user:update,sys:role:select', 2, NULL, 0, 1, now()), + (18, 2, '删除', NULL, 'sys:user:delete', 2, NULL, 0, 1, now()), + (19, 3, '查看', NULL, 'sys:role:list,sys:role:info', 2, NULL, 0, 1, now()), + (20, 3, '新增', NULL, 'sys:role:save,sys:menu:list', 2, NULL, 0, 1, now()), + (21, 3, '修改', NULL, 'sys:role:update,sys:menu:list', 2, NULL, 0, 1, now()), + (22, 3, '删除', NULL, 'sys:role:delete', 2, NULL, 0, 1, now()), + (23, 4, '查看', NULL, 'sys:menu:list,sys:menu:info', 2, NULL, 0, 1, now()), + (24, 4, '新增', NULL, 'sys:menu:save,sys:menu:select', 2, NULL, 0, 1, now()), + (25, 4, '修改', NULL, 'sys:menu:update,sys:menu:select', 2, NULL, 0, 1, now()), + (26, 4, '删除', NULL, 'sys:menu:delete', 2, NULL, 0, 1, now()), + (27, 1, '参数管理', 'sys/config', 'sys:config:list,sys:config:info,sys:config:save,sys:config:update,sys:config:delete', 1, 'config', 6, 1, now()), + (29, 1, '系统日志', 'sys/log', 'sys:log:list', 1, 'log', 7, 1, now()), + (36, 0, '设备管理', '', '', 0, 'shouye', 1, 1, now()), + (45, 36, '设备类型', 'devices/device/devicetype', '', 1, 'menu', 0, 1, now()), + (46, 36, '设备实例', 'devices/deviceExample/deviceExa', '', 1, 'editor', 3, 1, now()), + (47, 36, '设备厂家', 'devices/deviceFactory/deviceFac', '', 1, 'role', 1, 1, now()), + (49, 45, '查看', '', 'device:devicetype:list,device:devicetype:info', 2, '', 0, 1, now()), + (52, 45, '修改状态', '', 'device:devicetype:status', 2, '', 0, 1, now()), + (53, 46, '查看', NULL, 'device:accessdeviceinfo:list,device:accessdeviceinfo:info', 2, NULL, 0, 1, now()), + (54, 46, '新增', NULL, 'device:accessdeviceinfo:save', 2, NULL, 0, 1, now()), + (55, 46, '删除', NULL, 'device:accessdeviceinfo:delete', 2, NULL, 0, 1, now()), + (56, 46, '修改', NULL, 'device:accessdeviceinfo:update,device:accessdeviceinfo:updateStatus', 2, NULL, 0, 1, now()), + (57, 47, '查看', '', 'device:manufacturer:list,device:manufacturer:info', 2, '', 0, 1, now()), + (60, 47, '修改状态', '', 'device:manufacturer:status', 2, '', 0, 1, now()), + (65, 36, '区域管理', 'devices/region/index', '', 1, 'config', 2, 1, now()), + (66, 65, '新增', '', 'device:deviceregion:save', 2, '', 0, 1, now()), + (67, 65, '查看', '', 'device:deviceregion:list,device:deviceregion:info', 2, '', 0, 1, now()), + (68, 65, '更新', '', 'device:deviceregion:update', 2, '', 0, 1, now()), + (69, 65, '删除', '', 'device:deviceregion:delete', 2, '', 0, 1, now()), + (72, 45, '保存订阅地址', '', 'device:devicetypetemplate:updateSubscribeUrl', 2, '', 0, 1, now()), + (73, 45, '修改类型模板状态', '', 'device:devicetypetemplate:updateStatus', 2, '', 0, 1, now()), + (74, 36, '设备告警', 'devices/deviceReport/index', '', 1, '', 5, 1, now()); \ No newline at end of file diff --git a/mms/src/main/resources/mapper/sys/SysUserMapper.xml b/mms/src/main/resources/mapper/sys/SysUserMapper.xml index 3b97a21f6f72688dc38c2e4bb1f5ab18f13b49d8..74cc423fb3b403c448ba49a73d874ffbd0b09804 100644 --- a/mms/src/main/resources/mapper/sys/SysUserMapper.xml +++ b/mms/src/main/resources/mapper/sys/SysUserMapper.xml @@ -1,6 +1,9 @@ + + DELETE FROM sys_user_role WHERE user_id = #{userId} +