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

优化代码

This commit is contained in:
TinyAnts 2022-09-28 09:38:52 +08:00
parent 4b58de936c
commit 235ab92413
13 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java
View File

@ -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<String, String> params) {
Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
List<DictDataVo> list = iSettingDictDataService.all(params);
List<SettingDictDataVo> list = iSettingDictDataService.all(params);
return AjaxResult.success(list);
}
@ -51,7 +51,7 @@ public class DictDataController {
public AjaxResult list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
PageResult<DictDataVo> list = iSettingDictDataService.list(pageParam, params);
PageResult<SettingDictDataVo> 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);
}

8
server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java
View File

@ -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<DictTypeVo> list = iSettingDictTypeService.all();
List<SettingDictTypeVo> list = iSettingDictTypeService.all();
return AjaxResult.success(list);
}
@ -47,7 +47,7 @@ public class DictTypeController {
@GetMapping("/list")
public AjaxResult list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<DictTypeVo> list = iSettingDictTypeService.list(pageParam, params);
PageResult<SettingDictTypeVo> 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);
}

8
server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java
View File

@ -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<NoticeListVo> list = iSettingNoticeService.list(recipient);
List<SettingNoticeListVo> 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);
}

8
server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java
View File

@ -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<DictDataVo>
*/
List<DictDataVo> all(Map<String, String> params);
List<SettingDictDataVo> all(Map<String, String> params);
/**
* 字典数据列表
@ -29,7 +29,7 @@ public interface ISettingDictDataService {
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
PageResult<DictDataVo> list(PageParam pageParam, Map<String, String> params);
PageResult<SettingDictDataVo> list(PageParam pageParam, Map<String, String> params);
/**
* 字典数据详情
@ -38,7 +38,7 @@ public interface ISettingDictDataService {
* @param id 主键
* @return DictDataVo
*/
DictDataVo detail(Integer id);
SettingDictDataVo detail(Integer id);
/**
* 字典数据新增

8
server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java
View File

@ -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<DictTypeVo>
*/
List<DictTypeVo> all();
List<SettingDictTypeVo> all();
/**
* 字典类型列表
@ -29,7 +29,7 @@ public interface ISettingDictTypeService {
* @param params 搜索参数
* @return PageResult<DictDataVo>
*/
PageResult<DictTypeVo> list(PageParam pageParam, Map<String, String> params);
PageResult<SettingDictTypeVo> list(PageParam pageParam, Map<String, String> params);
/**
* 字典类型详情
@ -38,7 +38,7 @@ public interface ISettingDictTypeService {
* @param id 主键
* @return DictDataVo
*/
DictTypeVo detail(Integer id);
SettingDictTypeVo detail(Integer id);
/**
* 字典类型新增

8
server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java
View File

@ -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<NoticeSettingListVo>
*/
List<NoticeListVo> list(Integer recipient);
List<SettingNoticeListVo> list(Integer recipient);
/**
* 通知设置详情
@ -27,7 +27,7 @@ public interface ISettingNoticeService {
* @param id 主键
* @return NoticeDetailVo
*/
NoticeDetailVo detail(Integer id);
SettingNoticeDetailVo detail(Integer id);
/**
* 通知设置保存

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

@ -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<DictDataVo>
*/
@Override
public List<DictDataVo> all(Map<String, String> params) {
public List<SettingDictDataVo> all(Map<String, String> params) {
DictType dictType = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
.eq("dict_type", params.get("dictType"))
.eq("is_delete", 0)
@ -63,9 +63,9 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
List<DictData> dictDataList = dictDataMapper.selectList(queryWrapper);
List<DictDataVo> list = new LinkedList<>();
List<SettingDictDataVo> 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<DictDataVo>
*/
@Override
public PageResult<DictDataVo> list(PageParam pageParam, Map<String, String> params) {
public PageResult<SettingDictDataVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -110,9 +110,9 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
IPage<DictData> iPage = dictDataMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<DictDataVo> list = new LinkedList<>();
List<SettingDictDataVo> 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<DictData>()
.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()));

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

@ -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<DictTypeVo>
*/
@Override
public List<DictTypeVo> all() {
public List<SettingDictTypeVo> 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);
@ -44,9 +44,9 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
List<DictType> dictTypeList = dictTypeMapper.selectList(queryWrapper);
List<DictTypeVo> list = new LinkedList<>();
List<SettingDictTypeVo> 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<DictDataVo>
*/
@Override
public PageResult<DictTypeVo> list(PageParam pageParam, Map<String, String> params) {
public PageResult<SettingDictTypeVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -83,9 +83,9 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
IPage<DictType> iPage = dictTypeMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<DictTypeVo> list = new LinkedList<>();
List<SettingDictTypeVo> 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<DictType>()
.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()));

14
server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java
View File

@ -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<NoticeSettingListVo>
*/
@Override
public List<NoticeListVo> list(Integer recipient) {
public List<SettingNoticeListVo> list(Integer recipient) {
QueryWrapper<NoticeSetting> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("recipient", recipient);
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc("id");
List<NoticeSetting> noticeSettings = noticeSettingMapper.selectList(queryWrapper);
List<NoticeListVo> list = new LinkedList<>();
List<SettingNoticeListVo> list = new LinkedList<>();
for (NoticeSetting n : noticeSettings) {
NoticeListVo vo = new NoticeListVo();
SettingNoticeListVo vo = new SettingNoticeListVo();
BeanUtils.copyProperties(n, vo);
Map<String, String> 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<NoticeSetting>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
NoticeDetailVo vo = new NoticeDetailVo();
SettingNoticeDetailVo vo = new SettingNoticeDetailVo();
BeanUtils.copyProperties(noticeSetting, vo);
Map<String, Object> systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice());

2
server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictDataVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictDataVo.java
View File

@ -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;

2
server/like-admin/src/main/java/com/mdd/admin/vo/setting/DictTypeVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingDictTypeVo.java
View File

@ -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;

5
server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeDetailVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeDetailVo.java
View File

@ -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;

2
server/like-admin/src/main/java/com/mdd/admin/vo/setting/NoticeListVo.java → server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java
View File

@ -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;