Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

2026-06-09 f76c68a87261cf2396a64c7125324c24483d4623

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java

@@ -7,12 +7,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberRoleJoinMapper;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.model.Empower;
@@ -28,12 +29,14 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.Executor;

/**
 * 门禁角色信息表Service实现
@@ -50,11 +53,14 @@
    private MemberCardMapper memberCardMapper;
    @Autowired
    private EmpowerMapper empowerMapper;

    @Autowired
    private DeviceMapper deviceMapper;
    @Autowired
    private MemberRoleJoinMapper memberRoleMapper;

    @Autowired
    @Qualifier("asyncExecutor")
    private Executor asyncExecutor;
    @Autowired
    private MemberMapper memberMapper;

@@ -152,17 +158,13 @@
        }
       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());
                    }
            asyncExecutor.execute(() -> {
                try {
                    startUpdateMemberEmpower(model,deviceRole);
                }catch (Exception e){
                    log.error("======门禁分组修改，更新人员权限失败===", e);
                }
            });
            tt.start();
       }
    }
    @Override
@@ -386,7 +388,7 @@
        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");
        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());
        }