mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加字典获取所有数据的接口

This commit is contained in:
TinyAnts 2022-08-11 09:40:40 +08:00
parent 545c9bbb16
commit f8490c1990
9 changed files with 115 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
View File

@ -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", // 所有字典数据
};
}

13
server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java
View File

@ -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<DictDataVo> list = iSettingDictDataService.all();
return AjaxResult.success(list);
}
/**
* 字典数据列表
*

13
server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java
View File

@ -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<DictTypeVo> list = iSettingDictTypeService.all();
return AjaxResult.success(list);
}
/**
* 字典类型列表
*

9
server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java
View File

@ -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<DictDataVo>
*/
List<DictDataVo> all();
/**
* 字典数据列表
*

9
server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java
View File

@ -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<DictTypeVo>
*/
List<DictTypeVo> all();
/**
* 字典类型列表
*

28
server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java
View File

@ -29,6 +29,34 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
@Resource
DictDataMapper dictDataMapper;
/**
* 字典数据所有
*
* @author fzr
* @return List<DictDataVo>
*/
@Override
public List<DictDataVo> all() {
QueryWrapper<DictData> 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<DictData> dictDataList = dictDataMapper.selectList(queryWrapper);
List<DictDataVo> 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;
}
/**
* 字典数据列表
*

28
server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java
View File

@ -29,6 +29,34 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
@Resource
DictTypeMapper dictTypeMapper;
/**
* 字典类型所有
*
* @author fzr
* @return List<DictTypeVo>
*/
@Override
public List<DictTypeVo> all() {
QueryWrapper<DictType> 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<DictType> dictTypeList = dictTypeMapper.selectList(queryWrapper);
List<DictTypeVo> 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;
}
/**
* 字典类型列表
*

16
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@ -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<SystemAuthAdmin>()
.select(field)
.eq("is_delete", 0)
.eq("nickname", systemAuthAdminParam.getNickname())
.ne("id", systemAuthAdminParam.getId())
.last("limit 1")), "昵称已存在换一个吧！");
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.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());

2
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java
View File

@ -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());
}