From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 138 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 46 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 a5b0b7d..7fa419f 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
@@ -1,25 +1,28 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
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.erp.model.openapi.request.RoleListRequest;
+import com.doumee.core.erp.model.openapi.response.DeviceListResponse;
+import com.doumee.core.erp.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;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.DeviceRoleVO;
import com.doumee.service.business.DeviceRoleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.MemberService;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -44,24 +47,29 @@
@Autowired
private DeviceRoleMapper deviceRoleMapper;
+ @Autowired
+ private MemberService memberService;
@Override
public Integer create(DeviceRole deviceRole) {
- QueryWrapper<DeviceRole> query = new QueryWrapper<>();
- query.lambda()
- .eq(DeviceRole::getIsdeleted,Constants.ZERO)
- .eq(DeviceRole::getType,deviceRole.getType())
- .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(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ // 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
-
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(null != newDeviceRole) {
+ DeviceRole updateDeviceRole = new DeviceRole();
+ // 鑻ョ幇鍦ㄦ柊澧炴暟鎹缃粯璁ら棬绂佺粍锛涢偅涔堝厛鎶婁箣鍓嶇殑榛樿闂ㄧ缁勭姸鎬佹敼涓轰笉鏄粯璁ょ殑
+ updateDeviceRole.setId(newDeviceRole.getId());
+ updateDeviceRole.setEdirot(loginUserInfo.getId().toString());
+ updateDeviceRole.setEditDate(new Date());
+ updateDeviceRole.setIsDefault(Constants.ONE);
+ deviceRoleMapper.updateById(updateDeviceRole);
+ }
DeviceRole insert = new DeviceRole();
-
insert.setCreator(loginUserInfo.getId().toString());
insert.setCreateDate(new Date());
insert.setEdirot(loginUserInfo.getId().toString());
@@ -69,7 +77,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());
@@ -105,39 +113,61 @@
@Override
public void updateById(DeviceRole deviceRole) {
-
- QueryWrapper<DeviceRole> query = new QueryWrapper<>();
- query.lambda()
- .eq(DeviceRole::getIsdeleted,Constants.ZERO)
- .eq(DeviceRole::getType,deviceRole.getType())
- .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(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
- deviceRole.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ 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);
}
@Override
public void updateStatusById(DeviceRole deviceRole) {
- QueryWrapper<DeviceRole> query = new QueryWrapper<>();
- query.lambda()
- .eq(DeviceRole::getIsdeleted,Constants.ZERO)
- .eq(DeviceRole::getType,deviceRole.getType())
- .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(),"鍚屼竴涓敤鎴风被鍨嬶紝鍙兘鏈変竴涓粯璁よ鑹�");
+ // 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- DeviceRole update = new DeviceRole();
- update.setEdirot(loginUserInfo.getId().toString());
- update.setEditDate(new Date());
- update.setId(deviceRole.getId());
- update.setStatus(deviceRole.getStatus());
- update.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
- deviceRoleMapper.updateById(update);
+ List<DeviceRole> deviceRoleList = new ArrayList<>();
+ if(null != newDeviceRole) {
+ DeviceRole update = new DeviceRole();
+ update.setEdirot(loginUserInfo.getId().toString());
+ update.setEditDate(new Date());
+ update.setId(newDeviceRole.getId());
+ update.setStatus(newDeviceRole.getStatus());
+ update.setIsDefault(Constants.ONE);
+ deviceRoleList.add(update);
+ }
+ DeviceRole updateTwo = new DeviceRole();
+ updateTwo.setEdirot(loginUserInfo.getId().toString());
+ updateTwo.setEditDate(new Date());
+ updateTwo.setId(deviceRole.getId());
+ updateTwo.setStatus(deviceRole.getStatus());
+ updateTwo.setIsDefault(deviceRole.getIsDefault());
+ deviceRoleList.add(updateTwo);
+ // 鏈�澶�2鏉★紝鎵�鏈夊氨娌℃湁鍐欐壒閲忎慨鏀逛簡
+ for (DeviceRole data:deviceRoleList) {
+ deviceRoleMapper.updateById(data);
+ }
+ }
+
+ 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);
+ // 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
+ DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
+ return getDeviceRole;
}
@Override
@@ -201,8 +231,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());
@@ -219,9 +257,6 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(DeviceRole::getStatus, pageWrap.getModel().getStatus());
}
-
- queryWrapper.select("t_aa.*," +
- "(SELECT count(DISTINCT `KEY`) FROM `test` WHERE `test`.`key` = `t_aa`.id ) ");
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -229,7 +264,18 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(deviceRoleMapper.selectPage(page, queryWrapper));
+ IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
+ if(null != newPage && newPage.getRecords().size() > 0) {
+ List<DeviceRole> deviceRoleList = newPage.getRecords();
+ for (DeviceRole dto:deviceRoleList) {
+ Member member = new Member();
+ member.setIsdeleted(Constants.ZERO);
+ member.setRoleIdParam("["+dto.getId()+"]");
+ dto.setMemberNum((int) memberService.count(member));
+ }
+ newPage.setRecords(deviceRoleList);
+ }
+ return PageData.from(newPage);
}
@Override
@@ -243,7 +289,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