From f8490c19904097ffeaccc926a8fef1403366732c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 11 Aug 2022 09:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/config/AdminConfig.java | 12 ++++---- .../setting/DictDataController.java | 13 +++++++++ .../setting/DictTypeController.java | 13 +++++++++ .../setting/ISettingDictDataService.java | 9 ++++++ .../setting/ISettingDictTypeService.java | 9 ++++++ .../impl/SettingDictDataServiceImpl.java | 28 +++++++++++++++++++ .../impl/SettingDictTypeServiceImpl.java | 28 +++++++++++++++++++ .../impl/SystemAuthAdminServiceImpl.java | 16 +++++------ .../impl/SystemAuthRoleServiceImpl.java | 2 -- 9 files changed, 115 insertions(+), 15 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index f76c0639..91c53f94 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -22,11 +22,13 @@ public class AdminConfig { // 免权限验证 public static String[] notAuthUri = new String[]{ - "system:admin:upInfo", // 管理员更新 - "system:admin:self", // 管理员信息 - "system:logout", // 退出登录 - "system:menu:menus", // 系统菜单 - "system:menu:route", // 菜单路由 + "system:logout", // 退出登录 + "system:menu:menus", // 系统菜单 + "system:menu:route", // 菜单路由 + "system:admin:upInfo", // 管理员更新 + "system:admin:self", // 管理员信息 + "setting:dict:type:all", // 所有字典类型 + "setting:dict:data:all", // 所有字典数据 }; } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java index 1670b367..72bb7be1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java @@ -11,6 +11,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -23,6 +24,18 @@ public class DictDataController { @Resource ISettingDictDataService iSettingDictDataService; + /** + * 字典数据所有 + * + * @author fzr + * @return Object + */ + @GetMapping("/all") + public Object all() { + List list = iSettingDictDataService.all(); + return AjaxResult.success(list); + } + /** * 字典数据列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java index 59502823..85310194 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java @@ -11,6 +11,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -23,6 +24,18 @@ public class DictTypeController { @Resource ISettingDictTypeService iSettingDictTypeService; + /** + * 字典类型所有 + * + * @author fzr + * @return Object + */ + @GetMapping("/all") + public Object all() { + List list = iSettingDictTypeService.all(); + return AjaxResult.success(list); + } + /** * 字典类型列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java index c7429071..28abbd48 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java @@ -5,6 +5,7 @@ import com.hxkj.admin.validate.setting.DictDataParam; import com.hxkj.admin.vo.setting.DictDataVo; import com.hxkj.common.core.PageResult; +import java.util.List; import java.util.Map; /** @@ -12,6 +13,14 @@ import java.util.Map; */ public interface ISettingDictDataService { + /** + * 字典数据所有 + * + * @author fzr + * @return List + */ + List all(); + /** * 字典数据列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java index 620d39f7..96a83822 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java @@ -5,6 +5,7 @@ import com.hxkj.admin.validate.setting.DictTypeParam; import com.hxkj.admin.vo.setting.DictTypeVo; import com.hxkj.common.core.PageResult; +import java.util.List; import java.util.Map; /** @@ -12,6 +13,14 @@ import java.util.Map; */ public interface ISettingDictTypeService { + /** + * 字典类型所有 + * + * @author fzr + * @return List + */ + List all(); + /** * 字典类型列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java index af33f10a..2d8e4e4e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -29,6 +29,34 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { @Resource DictDataMapper dictDataMapper; + /** + * 字典数据所有 + * + * @author fzr + * @return List + */ + @Override + public List all() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time"); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc("id"); + + List dictDataList = dictDataMapper.selectList(queryWrapper); + + List list = new LinkedList<>(); + for (DictData dictData : dictDataList) { + DictDataVo vo = new DictDataVo(); + BeanUtils.copyProperties(dictData, vo); + + vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime())); + list.add(vo); + } + + return list; + } + /** * 字典数据列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java index 39d58178..2ddb2496 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -29,6 +29,34 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { @Resource DictTypeMapper dictTypeMapper; + /** + * 字典类型所有 + * + * @author fzr + * @return List + */ + @Override + public List all() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,dict_name,dict_type,dict_remark,dict_status,create_time,update_time"); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc("id"); + + List dictTypeList = dictTypeMapper.selectList(queryWrapper); + + List list = new LinkedList<>(); + for (DictType dictType : dictTypeList) { + DictTypeVo vo = new DictTypeVo(); + BeanUtils.copyProperties(dictType, vo); + + vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime())); + list.add(vo); + } + + return list; + } + /** * 字典类型列表 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java index a4c7e129..7f1216c4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -275,14 +275,14 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { .ne("id", systemAuthAdminParam.getId()) .last("limit 1")), "账号已存在换一个吧！"); - if (systemAuthAdminParam.getRole() > 0) { - Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("is_delete", 0) - .eq("nickname", systemAuthAdminParam.getNickname()) - .ne("id", systemAuthAdminParam.getId()) - .last("limit 1")), "昵称已存在换一个吧！"); + Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("nickname", systemAuthAdminParam.getNickname()) + .ne("id", systemAuthAdminParam.getId()) + .last("limit 1")), "昵称已存在换一个吧！"); + if (systemAuthAdminParam.getRole() > 0 && systemAuthAdminParam.getId() != 1) { Assert.notNull(iSystemAuthRoleService.detail(systemAuthAdminParam.getRole()), "角色不存在!"); } @@ -292,7 +292,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setPostId(systemAuthAdminParam.getPostId()); model.setNickname(systemAuthAdminParam.getNickname()); model.setUsername(systemAuthAdminParam.getUsername()); - model.setAvatar( UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar())); + model.setAvatar(UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar())); model.setRole(systemAuthAdminParam.getId() == 1 ? 0 : systemAuthAdminParam.getRole()); model.setSort(systemAuthAdminParam.getSort()); model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint()); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java index 2f1b1b95..98ebe09b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java @@ -152,8 +152,6 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthRoleMapper.insert(model); - System.out.println(model.getId()); - System.out.println(systemAuthRoleParam.getMenuIds()); iSystemAuthPermService.batchSaveByMenuIds(model.getId(), systemAuthRoleParam.getMenuIds()); }