forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

!135 service层不应该返回R对象，保持统一性 

Merge pull request !135 from zhangran/master
This commit is contained in:
zhangran 2021-07-15 09:16:55 +00:00 committed by Gitee
parent 838ca1a1e5 3104a263d1
commit 58349dae42
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java
View File

@ -163,7 +163,8 @@ public class DictController {
@SysLog("修改字典项")
@PutMapping("/item")
public R updateById(@RequestBody SysDictItem sysDictItem) {
return sysDictItemService.updateDictItem(sysDictItem);
sysDictItemService.updateDictItem(sysDictItem);
return R.ok();
}
/**
@ -174,7 +175,8 @@ public class DictController {
@SysLog("删除字典项")
@DeleteMapping("/item/{id}")
public R removeDictItemById(@PathVariable Integer id) {
return sysDictItemService.removeDictItem(id);
sysDictItemService.removeDictItem(id);
return R.ok();
}
}

5
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java
View File

@ -17,7 +17,6 @@ package com.pig4cloud.pig.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pig4cloud.pig.admin.api.entity.SysDictItem;
import com.pig4cloud.pig.common.core.util.R;
/**
* 字典项
@ -32,13 +31,13 @@ public interface SysDictItemService extends IService<SysDictItem> {
* @param id 字典项ID
* @return
*/
R removeDictItem(Integer id);
void removeDictItem(Integer id);
/**
* 更新字典项
* @param item 字典项
* @return
*/
R updateDictItem(SysDictItem item);
void updateDictItem(SysDictItem item);
}

9
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java
View File

@ -23,7 +23,6 @@ import com.pig4cloud.pig.admin.service.SysDictItemService;
import com.pig4cloud.pig.admin.service.SysDictService;
import com.pig4cloud.pig.common.core.constant.CacheConstants;
import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum;
import com.pig4cloud.pig.common.core.util.R;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
@ -48,13 +47,13 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
*/
@Override
@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
public R removeDictItem(Integer id) {
public void removeDictItem(Integer id) {
// 根据ID查询字典ID
SysDictItem dictItem = this.getById(id);
SysDict dict = dictService.getById(dictItem.getDictId());
// 系统内置
Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystem()), "系统内置字典项目不能删除");
return R.ok(this.removeById(id));
this.removeById(id);
}
/**
@ -64,12 +63,12 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
*/
@Override
@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
public R updateDictItem(SysDictItem item) {
public void updateDictItem(SysDictItem item) {
// 查询字典
SysDict dict = dictService.getById(item.getDictId());
// 系统内置
Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystem()), "系统内置字典项目不能修改");
return R.ok(this.updateById(item));
this.updateById(item);
}
}

2
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java
View File

@ -51,7 +51,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
* @return
*/
@Override
public List findRolesByUserId(Integer userId) {
public List<SysRole> findRolesByUserId(Integer userId) {
return baseMapper.listRolesByUserId(userId);
}