diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java index 5b8c5b04..f19092b3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.service.setting.ISettingDictDataService; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictDataParam; -import com.mdd.admin.vo.setting.DictDataVo; +import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.utils.StringUtil; @@ -35,7 +35,7 @@ public class DictDataController { @GetMapping("/all") public AjaxResult all(@RequestParam Map params) { Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失"); - List list = iSettingDictDataService.all(params); + List list = iSettingDictDataService.all(params); return AjaxResult.success(list); } @@ -51,7 +51,7 @@ public class DictDataController { public AjaxResult list(@Validated PageParam pageParam, @RequestParam Map params) { Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失"); - PageResult list = iSettingDictDataService.list(pageParam, params); + PageResult list = iSettingDictDataService.list(pageParam, params); return AjaxResult.success(list); } @@ -64,7 +64,7 @@ public class DictDataController { */ @GetMapping("/detail") public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - DictDataVo vo = iSettingDictDataService.detail(id); + SettingDictDataVo vo = iSettingDictDataService.detail(id); return AjaxResult.success(vo); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java index 6c942a43..94a14eb5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java @@ -3,7 +3,7 @@ package com.mdd.admin.controller.setting; import com.mdd.admin.service.setting.ISettingDictTypeService; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictTypeParam; -import com.mdd.admin.vo.setting.DictTypeVo; +import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; @@ -32,7 +32,7 @@ public class DictTypeController { */ @GetMapping("/all") public AjaxResult all() { - List list = iSettingDictTypeService.all(); + List list = iSettingDictTypeService.all(); return AjaxResult.success(list); } @@ -47,7 +47,7 @@ public class DictTypeController { @GetMapping("/list") public AjaxResult list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iSettingDictTypeService.list(pageParam, params); + PageResult list = iSettingDictTypeService.list(pageParam, params); return AjaxResult.success(list); } @@ -60,7 +60,7 @@ public class DictTypeController { */ @GetMapping("/detail") public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - DictTypeVo vo = iSettingDictTypeService.detail(id); + SettingDictTypeVo vo = iSettingDictTypeService.detail(id); return AjaxResult.success(vo); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java index 9192b2c7..79fb4288 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.setting; import com.mdd.admin.service.setting.ISettingNoticeService; -import com.mdd.admin.vo.setting.NoticeDetailVo; -import com.mdd.admin.vo.setting.NoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeDetailVo; +import com.mdd.admin.vo.setting.SettingNoticeListVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; @@ -31,7 +31,7 @@ public class NoticeController { */ @GetMapping("/list") public AjaxResult list(@RequestParam Integer recipient) { - List list = iSettingNoticeService.list(recipient); + List list = iSettingNoticeService.list(recipient); return AjaxResult.success(list); } @@ -44,7 +44,7 @@ public class NoticeController { */ @GetMapping("/detail") public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - NoticeDetailVo vo = iSettingNoticeService.detail(id); + SettingNoticeDetailVo vo = iSettingNoticeService.detail(id); return AjaxResult.success(vo); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java index 756a605d..4317db32 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java @@ -2,7 +2,7 @@ package com.mdd.admin.service.setting; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictDataParam; -import com.mdd.admin.vo.setting.DictDataVo; +import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.PageResult; import java.util.List; @@ -19,7 +19,7 @@ public interface ISettingDictDataService { * @author fzr * @return List */ - List all(Map params); + List all(Map params); /** * 字典数据列表 @@ -29,7 +29,7 @@ public interface ISettingDictDataService { * @param params 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, Map params); /** * 字典数据详情 @@ -38,7 +38,7 @@ public interface ISettingDictDataService { * @param id 主键 * @return DictDataVo */ - DictDataVo detail(Integer id); + SettingDictDataVo detail(Integer id); /** * 字典数据新增 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java index 5a66ebb3..b8b0effc 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java @@ -2,7 +2,7 @@ package com.mdd.admin.service.setting; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictTypeParam; -import com.mdd.admin.vo.setting.DictTypeVo; +import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.PageResult; import java.util.List; @@ -19,7 +19,7 @@ public interface ISettingDictTypeService { * @author fzr * @return List */ - List all(); + List all(); /** * 字典类型列表 @@ -29,7 +29,7 @@ public interface ISettingDictTypeService { * @param params 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, Map params); /** * 字典类型详情 @@ -38,7 +38,7 @@ public interface ISettingDictTypeService { * @param id 主键 * @return DictDataVo */ - DictTypeVo detail(Integer id); + SettingDictTypeVo detail(Integer id); /** * 字典类型新增 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java index ae576db0..4447fb6e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java @@ -1,7 +1,7 @@ package com.mdd.admin.service.setting; -import com.mdd.admin.vo.setting.NoticeDetailVo; -import com.mdd.admin.vo.setting.NoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeDetailVo; +import com.mdd.admin.vo.setting.SettingNoticeListVo; import java.util.List; import java.util.Map; @@ -18,7 +18,7 @@ public interface ISettingNoticeService { * @param recipient 1=用户, 2=平台 * @return List */ - List list(Integer recipient); + List list(Integer recipient); /** * 通知设置详情 @@ -27,7 +27,7 @@ public interface ISettingNoticeService { * @param id 主键 * @return NoticeDetailVo */ - NoticeDetailVo detail(Integer id); + SettingNoticeDetailVo detail(Integer id); /** * 通知设置保存 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java index 1787665a..b71def96 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.service.setting.ISettingDictDataService; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictDataParam; -import com.mdd.admin.vo.setting.DictDataVo; +import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.setting.DictData; import com.mdd.common.entity.setting.DictType; @@ -41,7 +41,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * @return List */ @Override - public List all(Map params) { + public List all(Map params) { DictType dictType = dictTypeMapper.selectOne(new QueryWrapper() .eq("dict_type", params.get("dictType")) .eq("is_delete", 0) @@ -63,9 +63,9 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { List dictDataList = dictDataMapper.selectList(queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (DictData dictData : dictDataList) { - DictDataVo vo = new DictDataVo(); + SettingDictDataVo vo = new SettingDictDataVo(); BeanUtils.copyProperties(dictData, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime())); @@ -85,7 +85,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -110,9 +110,9 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { IPage iPage = dictDataMapper.selectPage(new Page<>(page, limit), queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (DictData dictData : iPage.getRecords()) { - DictDataVo vo = new DictDataVo(); + SettingDictDataVo vo = new SettingDictDataVo(); BeanUtils.copyProperties(dictData, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime())); @@ -131,7 +131,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * @return DictDataVo */ @Override - public DictDataVo detail(Integer id) { + public SettingDictDataVo detail(Integer id) { DictData dictData = dictDataMapper.selectOne(new QueryWrapper() .select("id,type_id,name,value,remark,sort,status,create_time,update_time") .eq("id", id) @@ -140,7 +140,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { Assert.notNull(dictData, "字典数据不存在!"); - DictDataVo vo = new DictDataVo(); + SettingDictDataVo vo = new SettingDictDataVo(); BeanUtils.copyProperties(dictData, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime())); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java index 2b9a8125..94a02695 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.service.setting.ISettingDictTypeService; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.validate.setting.DictTypeParam; -import com.mdd.admin.vo.setting.DictTypeVo; +import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.setting.DictType; import com.mdd.common.mapper.setting.DictTypeMapper; @@ -36,7 +36,7 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * @return List */ @Override - public List all() { + 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); @@ -44,9 +44,9 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { List dictTypeList = dictTypeMapper.selectList(queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (DictType dictType : dictTypeList) { - DictTypeVo vo = new DictTypeVo(); + SettingDictTypeVo vo = new SettingDictTypeVo(); BeanUtils.copyProperties(dictType, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime())); @@ -66,7 +66,7 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -83,9 +83,9 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { IPage iPage = dictTypeMapper.selectPage(new Page<>(page, limit), queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (DictType dictType : iPage.getRecords()) { - DictTypeVo vo = new DictTypeVo(); + SettingDictTypeVo vo = new SettingDictTypeVo(); BeanUtils.copyProperties(dictType, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime())); @@ -104,7 +104,7 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * @return DictDataVo */ @Override - public DictTypeVo detail(Integer id) { + public SettingDictTypeVo detail(Integer id) { DictType dictType = dictTypeMapper.selectOne(new QueryWrapper() .select("id,dict_name,dict_type,dict_remark,dict_status,create_time,update_time") .eq("id", id) @@ -113,7 +113,7 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { Assert.notNull(dictType, "字典类型不存在!"); - DictTypeVo vo = new DictTypeVo(); + SettingDictTypeVo vo = new SettingDictTypeVo(); BeanUtils.copyProperties(dictType, vo); vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime())); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java index 333bdbd1..7355528e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.setting.ISettingNoticeService; -import com.mdd.admin.vo.setting.NoticeDetailVo; -import com.mdd.admin.vo.setting.NoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeDetailVo; +import com.mdd.admin.vo.setting.SettingNoticeListVo; import com.mdd.common.entity.notice.NoticeSetting; import com.mdd.common.mapper.notice.NoticeSettingMapper; import com.mdd.common.utils.TimeUtil; @@ -35,16 +35,16 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { * @return List */ @Override - public List list(Integer recipient) { + public List list(Integer recipient) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("recipient", recipient); queryWrapper.eq("is_delete", 0); queryWrapper.orderByAsc("id"); List noticeSettings = noticeSettingMapper.selectList(queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (NoticeSetting n : noticeSettings) { - NoticeListVo vo = new NoticeListVo(); + SettingNoticeListVo vo = new SettingNoticeListVo(); BeanUtils.copyProperties(n, vo); Map systemMap = ToolsUtil.jsonToMap(n.getSystemNotice()); @@ -74,13 +74,13 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { * */ @Override - public NoticeDetailVo detail(Integer id) { + public SettingNoticeDetailVo detail(Integer id) { NoticeSetting noticeSetting = noticeSettingMapper.selectOne(new QueryWrapper() .eq("id", id) .eq("is_delete", 0) .last("limit 1")); - NoticeDetailVo vo = new NoticeDetailVo(); + SettingNoticeDetailVo vo = new SettingNoticeDetailVo(); BeanUtils.copyProperties(noticeSetting, vo); Map systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice()); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictDataVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictDataVo.java similarity index 90% rename from server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictDataVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictDataVo.java index 20e672d9..2be6d9e0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictDataVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictDataVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 字典数据Vo */ @Data -public class DictDataVo implements Serializable { +public class SettingDictDataVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictTypeVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictTypeVo.java similarity index 90% rename from server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictTypeVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictTypeVo.java index ed31eccb..e7bc87f9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictTypeVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictTypeVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 字典类型Vo */ @Data -public class DictTypeVo implements Serializable { +public class SettingDictTypeVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeDetailVo.java similarity index 80% rename from server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeDetailVo.java index d2031484..2d8d3816 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeDetailVo.java @@ -4,8 +4,11 @@ import lombok.Data; import java.io.Serializable; +/** + * 通知设置详情Vo + */ @Data -public class NoticeDetailVo implements Serializable { +public class SettingNoticeDetailVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java index db9590c8..b174ecc1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 通知设置列表Vo */ @Data -public class NoticeListVo implements Serializable { +public class SettingNoticeListVo implements Serializable { private static final long serialVersionUID = 1L;