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

字典管理功能

This commit is contained in:
TinyAnts 2022-07-18 18:37:02 +08:00
parent b6aaff68f8
commit b7531046ac
12 changed files with 546 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,10 @@ package com.hxkj.admin.controller.setting;
import com.hxkj.admin.service.setting.IDictDataService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.SettingDictDataParam;
import com.hxkj.admin.validate.setting.DictDataParam;
import com.hxkj.admin.vo.setting.DictDataVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -16,34 +18,72 @@ import java.util.Map;
public class DictDataController {
@Resource
IDictDataService iSettingDictDataService;
IDictDataService iDictDataService;
/**
* 字典数据列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
return AjaxResult.success();
PageResult<DictDataVo> list = iDictDataService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 字典数据详情
*
* @author fzr
* @param id 主键
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
return AjaxResult.success();
DictDataVo vo = iDictDataService.detail(id);
return AjaxResult.success(vo);
}
/**
* 字典数据新增
*
* @author fzr
* @param dictDataParam 参数
* @return Object
*/
@PostMapping("/add")
public Object add(@Validated(value = SettingDictDataParam.create.class)
@RequestBody SettingDictDataParam settingDictDataParam) {
public Object add(@Validated(value = DictDataParam.create.class) @RequestBody DictDataParam dictDataParam) {
iDictDataService.add(dictDataParam);
return AjaxResult.success();
}
/**
* 字典数据编辑
*
* @author fzr
* @param dictDataParam 参数
* @return Object
*/
@PostMapping("/edit")
public Object edit(@Validated(value = SettingDictDataParam.update.class)
@RequestBody SettingDictDataParam settingDictDataParam) {
public Object edit(@Validated(value = DictDataParam.update.class) @RequestBody DictDataParam dictDataParam) {
iDictDataService.edit(dictDataParam);
return AjaxResult.success();
}
/**
* 字典数据删除
*
* @author fzr
* @param dictDataParam 参数
* @return Object
*/
@PostMapping("/del")
public Object del(@Validated(value = SettingDictDataParam.delete.class)
@RequestBody SettingDictDataParam settingDictDataParam) {
public Object del(@Validated(value = DictDataParam.delete.class) @RequestBody DictDataParam dictDataParam) {
iDictDataService.del(dictDataParam.getId());
return AjaxResult.success();
}

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

@ -1,40 +1,89 @@
package com.hxkj.admin.controller.setting;
import com.hxkj.admin.service.setting.IDictTypeService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.DictTypeParam;
import com.hxkj.admin.vo.setting.DictTypeVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@RestController
@RequestMapping("api/setting/dict/type")
public class DictTypeController {
@Resource
IDictTypeService iDictTypeService;
/**
* 字典类型列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
return AjaxResult.success();
PageResult<DictTypeVo> list = iDictTypeService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 字典类型详情
*
* @author fzr
* @param id 主键
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
return AjaxResult.success();
DictTypeVo vo = iDictTypeService.detail(id);
return AjaxResult.success(vo);
}
/**
* 字典类型新增
*
* @author fzr
* @param dictTypeParam 参数
* @return Object
*/
@PostMapping("/add")
public Object add() {
public Object add(@Validated(value = DictTypeParam.create.class) @RequestBody DictTypeParam dictTypeParam) {
iDictTypeService.add(dictTypeParam);
return AjaxResult.success();
}
/**
* 字典类型编辑
*
* @author fzr
* @param dictTypeParam 参数
* @return Object
*/
@PostMapping("/edit")
public Object edit() {
public Object edit(@Validated(value = DictTypeParam.update.class) @RequestBody DictTypeParam dictTypeParam) {
iDictTypeService.edit(dictTypeParam);
return AjaxResult.success();
}
/**
* 字典类型删除
*
* @author fzr
* @param dictTypeParam 参数
* @return Object
*/
@PostMapping("/del")
public Object del() {
public Object del(@Validated(value = DictTypeParam.delete.class) @RequestBody DictTypeParam dictTypeParam) {
iDictTypeService.del(dictTypeParam.getId());
return AjaxResult.success();
}

44
server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java
View File

@ -1,7 +1,8 @@
package com.hxkj.admin.service.setting;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.SettingDictDataParam;
import com.hxkj.admin.validate.setting.DictDataParam;
import com.hxkj.admin.vo.setting.DictDataVo;
import com.hxkj.common.core.PageResult;
import java.util.Map;
@ -11,14 +12,47 @@ import java.util.Map;
*/
public interface IDictDataService {
PageResult<Object> list(PageParam pageParam, Map<String, String> params);
/**
* 字典数据列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
PageResult<DictDataVo> list(PageParam pageParam, Map<String, String> params);
Object detail(Integer id);
/**
* 字典数据详情
*
* @author fzr
* @param id 主键
* @return DictDataVo
*/
DictDataVo detail(Integer id);
void add(SettingDictDataParam settingDictDataParam);
/**
* 字典数据新增
*
* @author fzr
* @param dictDataParam 参数
*/
void add(DictDataParam dictDataParam);
void edit(SettingDictDataParam settingDictDataParam);
/**
* 字典数据编辑
*
* @author fzr
* @param dictDataParam 参数
*/
void edit(DictDataParam dictDataParam);
/**
* 字典数据删除
*
* @author fzr
* @param id 主键
*/
void del(Integer id);
}

51
server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictTypeService.java
View File

@ -1,7 +1,58 @@
package com.hxkj.admin.service.setting;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.DictTypeParam;
import com.hxkj.admin.vo.setting.DictTypeVo;
import com.hxkj.common.core.PageResult;
import java.util.Map;
/**
* 字典类型服务接口类
*/
public interface IDictTypeService {
/**
* 字典类型列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
PageResult<DictTypeVo> list(PageParam pageParam, Map<String, String> params);
/**
* 字典类型详情
*
* @author fzr
* @param id 主键
* @return DictDataVo
*/
DictTypeVo detail(Integer id);
/**
* 字典类型新增
*
* @author fzr
* @param dictTypeParam 参数
*/
void add(DictTypeParam dictTypeParam);
/**
* 字典类型编辑
*
* @author fzr
* @param dictTypeParam 参数
*/
void edit(DictTypeParam dictTypeParam);
/**
* 字典类型删除
*
* @author fzr
* @param id 主键
*/
void del(Integer id);
}

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

@ -1,10 +1,172 @@
package com.hxkj.admin.service.setting.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.setting.IDictDataService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.DictDataParam;
import com.hxkj.admin.vo.setting.DictDataVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.setting.DictData;
import com.hxkj.common.mapper.setting.DictDataMapper;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
* 字典数据服务实现类
*/
@Service
public class DictDataServiceImpl {
public class DictDataServiceImpl implements IDictDataService {
@Resource
DictDataMapper dictDataMapper;
/**
* 字典数据列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
@Override
public PageResult<DictDataVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
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");
dictDataMapper.setSearch(queryWrapper, params, new String[]{
"like:key:str",
"=:status:int",
});
IPage<DictData> iPage = dictDataMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<DictDataVo> list = new LinkedList<>();
for (DictData dictData : iPage.getRecords()) {
DictDataVo vo = new DictDataVo();
BeanUtils.copyProperties(dictData, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 字典数据详情
*
* @author fzr
* @param id 主键
* @return DictDataVo
*/
@Override
public DictDataVo detail(Integer id) {
DictData dictData = dictDataMapper.selectOne(new QueryWrapper<DictData>()
.select("id,type_id,name,value,remark,sort,status,create_time,update_time")
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(dictData, "字典数据不存在！");
DictDataVo vo = new DictDataVo();
BeanUtils.copyProperties(dictData, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime()));
return vo;
}
/**
* 字典数据新增
*
* @author fzr
* @param dictDataParam 参数
*/
@Override
public void add(DictDataParam dictDataParam) {
Assert.isNull(dictDataMapper.selectOne(new QueryWrapper<DictData>()
.select("id")
.eq("name", dictDataParam.getName())
.eq("is_delete", 0)
.last("limit 1")), "字典数据已存在！");
DictData model = new DictData();
model.setTypeId(dictDataParam.getTypeId());
model.setName(dictDataParam.getName());
model.setValue(dictDataParam.getValue());
model.setRemark(dictDataParam.getRemark());
model.setSort(dictDataParam.getSort());
model.setStatus(dictDataParam.getStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
dictDataMapper.insert(model);
}
/**
* 字典数据编辑
*
* @author fzr
* @param dictDataParam 参数
*/
@Override
public void edit(DictDataParam dictDataParam) {
DictData model = dictDataMapper.selectOne(new QueryWrapper<DictData>()
.eq("id", dictDataParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "字典数据不存在！");
Assert.isNull(dictDataMapper.selectOne(new QueryWrapper<DictData>()
.select("id")
.ne("id", dictDataParam.getId())
.eq("name", dictDataParam.getName())
.eq("is_delete", 0)
.last("limit 1")), "字典数据已存在！");
model.setName(dictDataParam.getName());
model.setValue(dictDataParam.getValue());
model.setRemark(dictDataParam.getRemark());
model.setSort(dictDataParam.getSort());
model.setStatus(dictDataParam.getStatus());
model.setUpdateTime(System.currentTimeMillis() / 1000);
dictDataMapper.updateById(model);
}
/**
* 字典数据删除
*
* @author fzr
* @param id 主键
*/
@Override
public void del(Integer id) {
DictData model = dictDataMapper.selectOne(new QueryWrapper<DictData>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "字典数据不存在！");
model.setId(id);
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
dictDataMapper.updateById(model);
}
}

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

@ -1,10 +1,171 @@
package com.hxkj.admin.service.setting.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.setting.IDictTypeService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.setting.DictTypeParam;
import com.hxkj.admin.vo.setting.DictTypeVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.setting.DictType;
import com.hxkj.common.mapper.setting.DictTypeMapper;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
* 字典类型服务实现类
*/
@Service
public class DictTypeServiceImpl {
public class DictTypeServiceImpl implements IDictTypeService {
@Resource
DictTypeMapper dictTypeMapper;
/**
* 字典类型列表
*
* @author fzr
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
@Override
public PageResult<DictTypeVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
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");
dictTypeMapper.setSearch(queryWrapper, params, new String[]{
"like:dictName@dict_name:str",
"like:dictType@dict_type:str",
"=:dictStatus@dict_status:int",
});
IPage<DictType> iPage = dictTypeMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<DictTypeVo> list = new LinkedList<>();
for (DictType dictType : iPage.getRecords()) {
DictTypeVo vo = new DictTypeVo();
BeanUtils.copyProperties(dictType, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 字典类型详情
*
* @author fzr
* @param id 主键
* @return DictDataVo
*/
@Override
public DictTypeVo detail(Integer id) {
DictType dictType = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.select("id,dict_name,dict_type,dict_remark,dict_status,create_time,update_time")
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(dictType, "字典类型不存在！");
DictTypeVo vo = new DictTypeVo();
BeanUtils.copyProperties(dictType, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime()));
return vo;
}
/**
* 字典类型新增
*
* @author fzr
* @param dictTypeParam 参数
*/
@Override
public void add(DictTypeParam dictTypeParam) {
Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.select("id")
.eq("dict_name", dictTypeParam.getDictName())
.eq("dict_type", dictTypeParam.getDictType())
.eq("is_delete", 0)
.last("limit 1")), "字典类型已存在！");
DictType model = new DictType();
model.setDictName(dictTypeParam.getDictName());
model.setDictType(dictTypeParam.getDictType());
model.setDictRemark(dictTypeParam.getDictRemark());
model.setDictStatus(dictTypeParam.getDictStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
dictTypeMapper.insert(model);
}
/**
* 字典类型编辑
*
* @author fzr
* @param dictTypeParam 参数
*/
@Override
public void edit(DictTypeParam dictTypeParam) {
DictType model = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.eq("id", dictTypeParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "字典类型不存在！");
Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.ne("id", dictTypeParam.getId())
.eq("dict_name", dictTypeParam.getDictName())
.eq("dict_type", dictTypeParam.getDictType())
.eq("is_delete", 0)
.last("limit 1")), "字典类型已存在！");
model.setDictName(dictTypeParam.getDictName());
model.setDictType(dictTypeParam.getDictType());
model.setDictRemark(dictTypeParam.getDictRemark());
model.setDictStatus(dictTypeParam.getDictStatus());
model.setUpdateTime(System.currentTimeMillis() / 1000);
dictTypeMapper.updateById(model);
}
/**
* 字典类型删除
*
* @author fzr
* @param id 主键
*/
@Override
public void del(Integer id) {
DictType model = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.select("id")
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "字典类型不存在！");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
dictTypeMapper.updateById(model);
}
}

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

@ -104,16 +104,16 @@ public class SystemLogServerImpl implements ISystemLogServer {
IPage<SystemLogLogin> iPage = logLoginMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
List<LogLoginVo> voList = new LinkedList<>();
List<LogLoginVo> list = new LinkedList<>();
for (SystemLogLogin item : iPage.getRecords()) {
LogLoginVo vo = new LogLoginVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
voList.add(vo);
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), voList);
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
}

6
server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictDataParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictDataParam.java
View File

@ -17,7 +17,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SettingDictDataParam implements Serializable {
public class DictDataParam implements Serializable {
private static final long serialVersionUID = 1L;
@ -31,8 +31,8 @@ public class SettingDictDataParam implements Serializable {
@IDMust(message = "typeId参数必传且需大于0", groups = {create.class, update.class})
private Integer typeId;
@NotNull(message = "key参数缺失", groups = {create.class, update.class})
private String key;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
private String name;
@NotNull(message = "value参数缺失", groups = {create.class, update.class})
@Length(max = 100, message = "键名不能超出100个字符", groups = {create.class, update.class})

4
server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictTypeParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictTypeParam.java
View File

@ -16,7 +16,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SettingDictTypeParam implements Serializable {
public class DictTypeParam implements Serializable {
private static final long serialVersionUID = 1L;
@ -40,6 +40,6 @@ public class SettingDictTypeParam implements Serializable {
@NotNull(message = "dictStatus参数缺失")
@IntegerContains(values = {0, 1}, message = "dictStatus参数不在合法值内", groups = {create.class, update.class})
private String dictStatus;
private Integer dictStatus;
}

10
server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java
View File

@ -12,4 +12,14 @@ public class DictDataVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer typeId;
private String name;
private String value;
private String remark;
private Integer sort;
private Integer status;
private String createTime;
private String updateTime;
}

8
server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java
View File

@ -12,4 +12,12 @@ public class DictTypeVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String dictName;
private String dictType;
private String dictRemark;
private Integer dictStatus;
private String createTime;
private String updateTime;
}

2
server/like-common/src/main/java/com/hxkj/common/entity/setting/DictData.java
View File

@ -17,7 +17,7 @@ public class DictData implements Serializable {
@TableId(value="id", type= IdType.AUTO)
private Integer id; // 主键
private Integer typeId; // 类型
private String key; // 键名
private String name; // 键名
private String value; // 数值
private String remark; // 备注
private Integer sort; // 排序