|
@@ -1,5 +1,6 @@
|
|
|
package com.xy.service;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -10,8 +11,10 @@ import com.xy.collections.list.JArrayList;
|
|
|
import com.xy.collections.list.JList;
|
|
|
import com.xy.dto.SysDictDto;
|
|
|
import com.xy.entity.SysDict;
|
|
|
+import com.xy.entity.SysDictLog;
|
|
|
import com.xy.entity.SysDictRedis;
|
|
|
import com.xy.mapper.SysDictMapper;
|
|
|
+import com.xy.sys.EnumSysDictOperateType;
|
|
|
import com.xy.utils.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -47,6 +50,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
|
|
|
public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
|
|
|
|
|
|
private RedisService<SysDictRedis> redisService;
|
|
|
+ private SysDictLogServiceImpl sysDictLogService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -90,6 +94,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
|
SysDict sysDict = copy(SysDict.class, save)
|
|
|
.createUserTime(AuthorizeUtils.getLoginId(Long.class));
|
|
|
save(sysDict);
|
|
|
+ //日志
|
|
|
+ SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
|
|
|
+ sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.ADD);
|
|
|
//刷新redis
|
|
|
refuRedis(sysDict);
|
|
|
return R.ok();
|
|
@@ -112,6 +119,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
|
updateById(obj);
|
|
|
//修改子字典
|
|
|
update(new SysDict().setPaterCode(obj.getCode()), new LambdaQueryWrapper<SysDict>().eq(SysDict::getPaterCode, sysDict.getCode()));
|
|
|
+ //日志
|
|
|
+ SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
|
|
|
+ sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.UPDATE);
|
|
|
//刷新redis
|
|
|
refuRedis(obj);
|
|
|
return R.ok();
|
|
@@ -125,6 +135,14 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
|
List<Integer> ids = del.getId();
|
|
|
List<SysDict> list = list(new LambdaQueryWrapper<SysDict>().in(SysDict::getId, ids));
|
|
|
removeBatchByIds(ids);
|
|
|
+ //日志
|
|
|
+ if (CollUtil.isNotEmpty(list)) {
|
|
|
+ list.forEach(sysDict -> {
|
|
|
+ SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
|
|
|
+ sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.DEL);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
//删除子字典
|
|
|
JList<SysDict> paters = new JArrayList<>(list).filter().isNull(SysDict::getPaterCode).list();
|
|
|
JList<SysDict> paters2 = new JArrayList<>(list).filter().eq(SysDict::getPaterCode, "").list();
|
|
@@ -133,6 +151,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
|
}
|
|
|
if (Emptys.check(paters)) {
|
|
|
JList<String> codes = paters.getProperty(SysDict::getCode);
|
|
|
+ if (CollUtil.isNotEmpty(paters)) {
|
|
|
+ paters.forEach(sysDict -> {
|
|
|
+ SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
|
|
|
+ sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.DEL);
|
|
|
+ });
|
|
|
+ }
|
|
|
remove(new LambdaQueryWrapper<SysDict>().in(SysDict::getPaterCode, codes));
|
|
|
}
|
|
|
//刷新redis
|