From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index fd27610..fcdce43 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -14,6 +14,7 @@
import com.moral.api.service.SysDictTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.CacheUtils;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -22,7 +23,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -72,6 +76,9 @@
deleteDataWrapper.eq("dict_type_id",typeId);
deleteDataWrapper.set("is_delete",Constants.DELETE);
sysDictDataService.update(null,deleteDataWrapper);
+ //������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ LogUtils.saveOperationForManage(request,"������������������:"+type.getName(),Constants.DELETE_OPERATE_TYPE);
//������������������
refreshCache();
//������������������
@@ -79,7 +86,6 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
@Override
@Transactional
@@ -118,10 +124,7 @@
//������������������������
SysDictType sysDictType = form.formConvertEntity();
//������name������������������
- QueryWrapper<SysDictType> existNameWrapper = new QueryWrapper<>();
- existNameWrapper.eq("name",sysDictType.getName());
- existNameWrapper.eq("is_delete",Constants.NOT_DELETE);
- SysDictType existType = sysDictTypeMapper.selectOne(existNameWrapper);
+ SysDictType existType = sysDictTypeMapper.listOne(sysDictType.getName());
if(!ObjectUtils.isEmpty(existType)){
dto.setCode(ResponseCodeEnum.DICTTYPE_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.DICTTYPE_EXIST.getMsg());
@@ -129,6 +132,9 @@
}
//������������
sysDictTypeMapper.insert(sysDictType);
+ //������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ LogUtils.saveOperationForManage(request,"������������������:"+sysDictType.getName(),Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache();
//������������������
--
Gitblit v1.8.0