From eb53aef53bdab3eb452b95276b575bb45e616316 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 14:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 7449ddc..e34a72e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -5,8 +5,12 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.RoleListRequest;
+import com.doumee.core.model.openapi.response.DeviceListResponse;
+import com.doumee.core.model.openapi.response.RoleListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.DeviceRole;
@@ -16,17 +20,19 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -39,6 +45,7 @@
@Autowired
private DeviceRoleMapper deviceRoleMapper;
+
@Override
public Integer create(DeviceRole deviceRole) {
@@ -49,7 +56,7 @@
.eq(DeviceRole::getStatus,Constants.ONE);
List<DeviceRole> deviceRoles = deviceRoleMapper.selectList(query);
if (CollectionUtils.isNotEmpty(deviceRoles) && Constants.equalsInteger(Constants.ONE,deviceRole.getStatus())){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"绠＄悊鍐呴儴鍛樺伐鍙兘鏈変竴涓粯璁ら棬绂佺粍");
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
@@ -106,7 +113,7 @@
.eq(DeviceRole::getStatus,Constants.ONE);
List<DeviceRole> deviceRoles = deviceRoleMapper.selectList(query);
if (CollectionUtils.isNotEmpty(deviceRoles) && Constants.equalsInteger(Constants.ONE,deviceRole.getStatus())){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"绠＄悊鍐呴儴鍛樺伐鍙兘鏈変竴涓粯璁ら棬绂佺粍");
}
deviceRole.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
deviceRoleMapper.updateById(deviceRole);
@@ -121,7 +128,7 @@
.eq(DeviceRole::getStatus,Constants.ONE);
List<DeviceRole> deviceRoles = deviceRoleMapper.selectList(query);
if (CollectionUtils.isNotEmpty(deviceRoles) && Constants.equalsInteger(Constants.ONE,deviceRole.getStatus())){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"绠＄悊鍐呴儴鍛樺伐鍙兘鏈変竴涓粯璁ら棬绂佺粍");
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
DeviceRole update = new DeviceRole();
@@ -248,4 +255,9 @@
}
+
+
+
+
+
}
--
Gitblit v1.9.3