From f76c68a87261cf2396a64c7125324c24483d4623 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 六月 2026 09:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 980aa3e..2432369 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/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;
/**
* 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -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
@@ -298,7 +300,11 @@
continue FLAG;
}
}
- list.add(Integer.parseInt(s));
+ try {
+ list.add(Integer.parseInt(s));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
}
return list;
@@ -371,6 +377,7 @@
@Override
public List<DeviceRole> findList(DeviceRole deviceRole) {
+ deviceRole.setIsdeleted(Constants.ZERO);
QueryWrapper<DeviceRole> wrapper = new QueryWrapper<>(deviceRole);
return deviceRoleMapper.selectList(wrapper);
}
@@ -381,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());
}
--
Gitblit v1.9.3