From d7e663d304a2ccb565a24362b116ddaa9da9941a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:56:43 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 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 8c9e5ba..1eb177e 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
@@ -27,7 +27,6 @@
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;
@@ -56,8 +55,8 @@
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
if(null != newDeviceRole) {
@@ -66,8 +65,7 @@
updateDeviceRole.setId(newDeviceRole.getId());
updateDeviceRole.setEdirot(loginUserInfo.getId().toString());
updateDeviceRole.setEditDate(new Date());
- updateDeviceRole.setIsdeleted(Constants.ONE);
- updateDeviceRole.setStatus(Constants.ZERO);
+ updateDeviceRole.setIsDefault(Constants.ONE);
deviceRoleMapper.updateById(updateDeviceRole);
}
DeviceRole insert = new DeviceRole();
@@ -78,7 +76,7 @@
insert.setIsdeleted(Constants.ZERO);
insert.setRemark(deviceRole.getRemark());
insert.setName(deviceRole.getName());
- insert.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ insert.setIsDefault(deviceRole.getIsDefault());
insert.setType(deviceRole.getType());
insert.setDoorIds(deviceRole.getDoorIds());
insert.setDoorNames(deviceRole.getDoorNames());
@@ -114,7 +112,19 @@
@Override
public void updateById(DeviceRole deviceRole) {
- deviceRole.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(null != newDeviceRole) {
+ DeviceRole update = new DeviceRole();
+ update.setEdirot(loginUserInfo.getId().toString());
+ update.setEditDate(new Date());
+ update.setId(newDeviceRole.getId());
+ update.setIsDefault(Constants.ONE);
+ deviceRoleMapper.updateById(update);
+ }
deviceRoleMapper.updateById(deviceRole);
}
@@ -122,8 +132,8 @@
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
List<DeviceRole> deviceRoleList = new ArrayList<>();
@@ -149,12 +159,11 @@
}
}
- private DeviceRole getDeviceRole(Integer status, Integer type) {
+ private DeviceRole getDeviceRole(String type) {
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
- .eq(DeviceRole::getType,type)
- .eq(DeviceRole::getStatus,status);
+ .eq(DeviceRole::getType,type);
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
return getDeviceRole;
@@ -221,8 +230,16 @@
if (pageWrap.getModel().getIsDefault() != null) {
queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
}
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getType())) {
+ if(pageWrap.getModel().getType().length() > 1) {
+ String[] types = pageWrap.getModel().getType().split(",");
+ queryWrapper.lambda()
+ .eq(DeviceRole::getType, types[0])
+ .or()
+ .eq(DeviceRole::getType, types[1]);
+ }else {
+ queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ }
}
if (pageWrap.getModel().getDoorIds() != null) {
queryWrapper.lambda().eq(DeviceRole::getDoorIds, pageWrap.getModel().getDoorIds());
@@ -252,7 +269,7 @@
for (DeviceRole dto:deviceRoleList) {
Member member = new Member();
member.setIsdeleted(Constants.ZERO);
- member.setRoleId(dto.getId());
+ member.setRoleIdParam("["+dto.getId()+"]");
dto.setMemberNum((int) memberService.count(member));
}
newPage.setRecords(deviceRoleList);
@@ -271,7 +288,7 @@
List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.eq(DeviceRole::getType,type)
.eq(DeviceRole::getIsdeleted, Constants.ZERO)
- .eq(DeviceRole::getStatus, Constants.ZERO)
+ .eq(DeviceRole::getStatus, Constants.ONE)
);
List<DeviceRoleVO> deviceRoleVOList = new ArrayList<>();
for (DeviceRole deviceRole:deviceRoleList) {
--
Gitblit v1.9.3