From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 8f75d49..bc6608c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -2,23 +2,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.config.Interceptor.UserHelper;
-import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
-import com.moral.api.pojo.vo.user.QxUser;
+import com.moral.api.pojo.vo.device.DeviceVO;
+import com.moral.api.pojo.vo.monitorPoint.MonitorPointVos;
import com.moral.api.service.DeviceService;
-import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.util.TokenUtils;
-
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -36,6 +34,13 @@
@Autowired
OrganizationMapper organizationMapper;
+
+ @Autowired
+ MonitorPointMapper monitorPointMapper;
+
+
+ @Autowired
+ DeviceMapper deviceMapper;
@@ -107,4 +112,45 @@
}
return rsList;
}
+
+ /**
+ * ������������������
+ * @return
+ */
+ @Override
+ public List<Organization> queryDevices() {
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer organizationId = (Integer) orgInfo.get("id");
+ LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Organization::getId,Organization::getAddress,Organization::getAreaName,Organization::getName);
+ wrapper.eq(Organization::getIsDelete,Constants.NOT_DELETE);
+ wrapper.orderByDesc(Organization::getCreateTime);
+ List<Organization> organizations;
+ if (organizationId==24){
+ wrapper.eq(Organization::getParentId,organizationId);
+ organizations = organizationMapper.selectList(wrapper);
+ }else {
+ wrapper.eq(Organization::getId,organizationId);
+ organizations = organizationMapper.selectList(wrapper);
+ }
+ if (CollectionUtils.isNotEmpty(organizations)){
+ organizations.forEach(it ->{
+ //������������
+// QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
+// queryMonitorPointsWrapper.eq("organization_id", it.getId());
+// queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
+// List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
+ List<MonitorPointVos> monitorPoints = monitorPointMapper.getMonitorPoint(it.getId());
+ //���������������������������
+ for (MonitorPointVos monitorPoint : monitorPoints) {
+// List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPoint.getId());
+ List<DeviceVO> listVo = deviceMapper.getListVo(monitorPoint.getId());
+ monitorPoint.setMonitorPoint(listVo);
+ }
+ it.setMonitorPoint(monitorPoints);
+ } );
+ }
+ return organizations;
+ }
}
--
Gitblit v1.8.0