From 26bada56d6b3fbbad87b324d484aa84d46c3def3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 十二月 2023 10:35:04 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 225392d..b802f7d 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
@@ -15,12 +15,14 @@
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;
@@ -45,6 +47,8 @@
@Autowired
private DeviceRoleMapper deviceRoleMapper;
+ @Autowired
+ private MemberService memberService;
@Override
@@ -52,8 +56,8 @@
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus());
+ if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
if(null != newDeviceRole) {
@@ -118,8 +122,8 @@
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ZERO == deviceRole.getIsDefault()) {
- newDeviceRole = getDeviceRole(deviceRole.getIsDefault());
+ if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
List<DeviceRole> deviceRoleList = new ArrayList<>();
@@ -145,10 +149,11 @@
}
}
- private DeviceRole getDeviceRole(Integer status) {
+ private DeviceRole getDeviceRole(Integer status, Integer 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);
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
@@ -234,9 +239,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());
@@ -244,7 +246,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
--
Gitblit v1.9.3