From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/BaseRolePageServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/BaseRolePageServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/BaseRolePageServiceImpl.java
index 1476eb9..ed212a9 100644
--- a/src/main/java/com/nanometer/smartlab/service/BaseRolePageServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/BaseRolePageServiceImpl.java
@@ -34,13 +34,13 @@
BaseRolePageDao baseRolePageDao;
@Transactional(propagation = Propagation.REQUIRED)
- public List<BaseRolePage> getBaseRolePageList(String roleId, String pageId) {
+ public List<BaseRolePage> getBaseRolePageList(Long roleId, Long pageId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
- if (StringUtils.isNotBlank(roleId)) {
+ if (roleId!=null) {
params.put("roleId", roleId);
}
- if (StringUtils.isNotBlank(pageId)) {
+ if (pageId!=null) {
params.put("pageId", pageId);
}
return this.baseRolePageDao.getBaseRolePageList(params);
@@ -53,9 +53,9 @@
@Transactional(propagation = Propagation.REQUIRED)
public BaseRolePage insertBaseRolePage(BaseRolePage baseRolePage) {
try {
- if (baseRolePage.getId() == null) {
- baseRolePage.setId(IDUtils.uuid());
- }
+// if (baseRolePage.getId() == null) {
+// baseRolePage.setId(IDUtils.uuid());
+// }
this.baseRolePageDao.insertBaseRolePage(baseRolePage);
return baseRolePage;
} catch (DuplicateKeyException ex) {
@@ -71,7 +71,26 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public boolean deleteBaseRolePage(String roleId) {
+ public void batchInsertBaseRolePage(List<BaseRolePage> baseRolePages) {
+ try {
+// if (baseRolePage.getId() == null) {
+// baseRolePage.setId(IDUtils.uuid());
+// }
+ this.baseRolePageDao.batchInsertBaseRolePage(baseRolePages);
+ } catch (DuplicateKeyException ex) {
+ logger.warn(ex.getMessage(), ex);
+ throw new AlarmException(AlarmCode.DATA_DUPLICATE, MessageUtil.getMessage(AlarmCode.DATA_DUPLICATE.getCode()));
+ } catch (DataIntegrityViolationException ex) {
+ logger.warn(ex.getMessage(), ex);
+ throw new AlarmException(AlarmCode.DATA_CONFICT, MessageUtil.getMessage(AlarmCode.DATA_CONFICT.getCode()));
+ } catch (DataAccessException ex) {
+ logger.error(ex.getMessage(), ex);
+ throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), ex);
+ }
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public boolean deleteBaseRolePage(Long roleId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("roleId", roleId);
--
Gitblit v1.9.2