From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 203 insertions(+), 20 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 7fa419f..68065d5 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,6 +1,7 @@
package com.doumee.service.business.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -11,11 +12,10 @@
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.admin.response.MemberInfoDTO;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.MemberRoleJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.response.DeviceRoleVO;
import com.doumee.service.business.DeviceRoleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,11 +23,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.MemberService;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
+import lombok.extern.slf4j.Slf4j;
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;
@@ -43,24 +45,40 @@
* @date 2023/11/30 15:33
*/
@Service
+@Slf4j
public class DeviceRoleServiceImpl implements DeviceRoleService {
@Autowired
private DeviceRoleMapper deviceRoleMapper;
@Autowired
- private MemberService memberService;
+ private MemberCardMapper memberCardMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
+ @Autowired
+ private MemberRoleJoinMapper memberRoleMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Override
public Integer create(DeviceRole deviceRole) {
-
+ if(Objects.isNull(deviceRole)
+ || StringUtils.isBlank(deviceRole.getName())
+ || Objects.isNull(deviceRole.getType())
+ || Objects.isNull(deviceRole.getIsDefault())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
if(null != deviceRole.getType()) {
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if(null != newDeviceRole) {
+ if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole updateDeviceRole = new DeviceRole();
// 鑻ョ幇鍦ㄦ柊澧炴暟鎹缃粯璁ら棬绂佺粍锛涢偅涔堝厛鎶婁箣鍓嶇殑榛樿闂ㄧ缁勭姸鎬佹敼涓轰笉鏄粯璁ょ殑
updateDeviceRole.setId(newDeviceRole.getId());
@@ -113,12 +131,16 @@
@Override
public void updateById(DeviceRole deviceRole) {
+ DeviceRole model = deviceRoleMapper.selectById(deviceRole.getId());
+ if(model == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
DeviceRole newDeviceRole = null;
if(null != deviceRole.getType()) {
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if(null != newDeviceRole) {
+ if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole update = new DeviceRole();
update.setEdirot(loginUserInfo.getId().toString());
update.setEditDate(new Date());
@@ -126,9 +148,167 @@
update.setIsDefault(Constants.ONE);
deviceRoleMapper.updateById(update);
}
- deviceRoleMapper.updateById(deviceRole);
+ int t = deviceRoleMapper.updateById(deviceRole);
+ if(t>0){
+ Thread tt = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ startUpdateMemberEmpower(model,deviceRole);
+ }catch (Exception e){
+ log.error("======闂ㄧ鍒嗙粍淇敼锛屾洿鏂颁汉鍛樻潈闄愬け璐�==="+e.getMessage());
+ }
+ }
+ });
+ tt.start();
+ }
+ }
+ @Override
+ public void updateMemberRole(DeviceRole deviceRole) {
+ deviceRole.setType("2");
+ deviceRole.setIsdeleted(Constants.ZERO);
+ List<DeviceRole> list =findList(deviceRole);
+ if(list == null || list.size()==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ for(DeviceRole model :list){
+ updateMemberRoleDO(model);
+ }
+ }
+ public void updateMemberRoleDO(DeviceRole model) {
+ if(model.getDoorIds() == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String[] newIds =StringUtils.defaultString(model.getDoorIds()).split(",");
+ List<Integer> allids = getChangeIdsByArray(new String[]{},newIds);//鏈�鏂拌澶�
+ List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getRoleId,model.getId())
+ .eq(MemberRole::getIsdeleted,Constants.ZERO)
+ );
+ if(memberRoleList!=null && memberRoleList.size()>0) {
+ int num =1;
+ for (MemberRole memberRole : memberRoleList) {
+ Member member = memberMapper.selectById(memberRole.getMemberId());
+ if(member==null || member.getIsdeleted().equals(Constants.ONE)){
+ continue;
+ }
+ List<Integer> addIds = new ArrayList<>();
+ for(Integer did : allids){
+ Empower empower = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getDeviceId,did )
+ .orderByDesc(Empower::getId)
+ .last("limit 1"));
+ if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
+ addIds.add(did);
+ }
+ }
+ try {
+ HkSyncOrgUserToHKServiceImpl.dealChangeDeviceRoleEmpower(member,addIds,null,deviceRoleMapper,empowerMapper,deviceMapper);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ System.out.println("姝ｅ湪澶勭悊銆�"+model.getName()+"銆�======闂ㄧ鏁版嵁銆�"+addIds.size()+"銆�====杩涘害锛氥��"+num+"|"+memberRoleList.size()+"銆�");
+ num ++;
+ }
+ }
}
+ /**
+ * 鏇存柊璇ユ潈闄愪笅鐩稿叧鐨勪汉鍛樻渶鏂板叏鏂颁笅鍙�
+ * @param model
+ * @param deviceRole
+ */
+ private void startUpdateMemberEmpower(DeviceRole model, DeviceRole deviceRole) {
+ String[] ids = StringUtils.defaultString(model.getDoorIds()).split(",");
+ String[] newIds =StringUtils.defaultString(deviceRole.getDoorIds()).split(",");
+ List<Integer> delIds = getChangeIdsByArray(newIds,ids);//鍒犻櫎鐨勮澶�
+ List<Integer> addIds = getChangeIdsByArray(ids,newIds);//鏈�鏂拌澶�
+ if((addIds==null ||addIds.size()==0)&&( delIds ==null || delIds.size() == 0 )){
+ //濡傛灉娌℃湁鍙樺寲锛屼笉鍋氬鐞�
+ return;
+ }
+ List<Integer> allids = getChangeIdsByArray(new String[]{},newIds);//鏈�鏂拌澶�
+ List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getRoleId,model.getId())
+ .eq(MemberRole::getIsdeleted,Constants.ZERO)
+ );
+ if(memberRoleList!=null && memberRoleList.size()>0){
+ for(MemberRole memberRole : memberRoleList){
+ //濡傛灉鏈変汉鍛樻巿鏉冧簡璇ユ潈闄�
+ Member member = memberMapper.selectById(memberRole.getMemberId());
+ if(member==null || member.getIsdeleted().equals(Constants.ONE)){
+ continue;
+ }
+ MPJLambdaWrapper<MemberRole> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(DeviceRole.class,DeviceRole::getId,MemberRole::getRoleId );
+ queryWrapper.selectAll(MemberRole.class)
+ .selectAs(DeviceRole::getDoorIds, MemberRole::getDoorIds)
+ .eq(MemberRole::getMemberId,memberRole.getMemberId())
+ .eq(MemberRole::getIsdeleted,Constants.ZERO)
+ .ne(MemberRole::getRoleId,deviceRole.getId());
+ List<MemberRole> tLis = memberRoleMapper.selectJoinList(MemberRole.class,queryWrapper);
+ List<Integer> actDelIds = getActChangeDoorIds(tLis,delIds);
+ List<Integer> actAddIds = getActChangeDoorIds(tLis,allids);
+ HkSyncOrgUserToHKServiceImpl.dealChangeDeviceRoleEmpower(member,actAddIds,actDelIds,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+ }
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛褰撳墠鏈�鏂扮殑闂ㄧ瑙掕壊锛屾煡璇㈠疄闄呭簲璇ュ垹闄ゆ垨鑰呭鍔犵殑闂ㄧ鐐规潈闄�
+ * @param tLis
+ * @param changeIds
+ * @return
+ */
+ private List<Integer> getActChangeDoorIds(List<MemberRole> tLis, List<Integer> changeIds) {
+ List<Integer> list = new ArrayList<>();
+ for(MemberRole memberRole : tLis){
+ String[] ids = StringUtils.defaultString(memberRole.getDoorIds()).split(",");
+ if(ids!=null && ids.length>0){
+ for (String s:ids){
+ try {
+ list.add(Integer.parseInt(s));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ List<Integer> actList = new ArrayList<>();
+ if(list.size()>0){
+ Flag:
+ for (Integer t : changeIds){
+ for (Integer tt : list){
+ if(Constants.equalsInteger(t,tt)){
+ continue Flag;
+ }
+ }
+ actList.add(t);
+ }
+ }
+ return actList;
+ }
+
+ private List<Integer> getChangeIdsByArray(String[] ids, String[] newIds) {
+ List<Integer> list = new ArrayList<>();
+ if(newIds!=null){
+ FLAG :
+ for(String s :newIds){
+ for(String s1 :ids){
+ if(StringUtils.equals(s,s1)){
+ continue FLAG;
+ }
+ }
+ try {
+ list.add(Integer.parseInt(s));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ return list;
+ }
@Override
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
@@ -164,7 +344,8 @@
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
- .eq(DeviceRole::getType,type);
+ .eq(DeviceRole::getType,type)
+ .last(" limit 1");
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
return getDeviceRole;
@@ -202,6 +383,8 @@
IPage<DeviceRole> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<DeviceRole> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.select("*,(select count(1) from member_role b where b.isdeleted=0 and b.role_id=device_role.id) as memberNum");
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(DeviceRole::getId, pageWrap.getModel().getId());
}
@@ -226,7 +409,7 @@
queryWrapper.lambda().eq(DeviceRole::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(DeviceRole::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(DeviceRole::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getIsDefault() != null) {
queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
@@ -234,10 +417,9 @@
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])
+ queryWrapper.lambda().and(p-> p.eq(DeviceRole::getType, types[0])
.or()
- .eq(DeviceRole::getType, types[1]);
+ .eq(DeviceRole::getType, types[1]));
}else {
queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
}
@@ -264,15 +446,16 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ queryWrapper.lambda().orderByAsc( DeviceRole::getName);
IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
if(null != newPage && newPage.getRecords().size() > 0) {
- List<DeviceRole> deviceRoleList = newPage.getRecords();
- for (DeviceRole dto:deviceRoleList) {
+ 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));
- }
+ dto.setMemberNum( memberMapper.selectCount(new QueryWrapper<>(member)));
+ }*/
newPage.setRecords(deviceRoleList);
}
return PageData.from(newPage);
--
Gitblit v1.9.3