From cdec9062c85f52d43e8d74e82cbcf9f8606ebb01 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 30 Jan 2024 16:39:59 +0800
Subject: [PATCH] chore:设备在线率接口提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 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 b009485..3616d86 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
@@ -1,20 +1,27 @@
package com.moral.api.service.impl;
+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.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.vo.user.QxUser;
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.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;
/**
* <p>
@@ -30,8 +37,6 @@
@Autowired
OrganizationMapper organizationMapper;
- @Autowired
- private DeviceService deviceService;
@Override
@@ -46,31 +51,6 @@
return organizationMapper.selectById(id);
}
- /**
- * ������������������������
- *
- * @return
- */
- @Override
- public List<Organization> getOrganizations() {
- QueryWrapper<Organization> wrapper = new QueryWrapper<>();
- wrapper.select("id","name");
- QxUser user = UserHelper.getCurrentUser();
- Integer organizationId = user.getOrganizationId();
- if (organizationId!=24){
- wrapper.eq("id",user.getOrganizationId());
- }
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- List<Organization> organizations = organizationMapper.selectList(wrapper);
- for (int i=0; i<organizations.size(); i++) {
- List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
- if (ObjectUtils.isEmpty(macs)){
- organizations.remove(i);
- i--;
- }
- }
- return organizations;
- }
/**
@@ -95,4 +75,35 @@
return;
}
}
+
+ @Override
+ public List<Integer> orgIdList(Integer organizationId) {
+ return this.baseMapper.orgIdList(organizationId);
+ }
+
+ /**
+ * ������id������������������
+ *
+ * @param
+ * @return
+ */
+ @Override
+ public List<Organization> getOrganizationId() {
+ //������������������
+ 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");
+ ArrayList<Organization> rsList = new ArrayList<>();
+ if (organizationId==24){
+ LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Organization::getParentId,organizationId);
+ wrapper.eq(Organization::getIsDelete,Constants.NOT_DELETE);
+ List<Organization> organizations = organizationMapper.selectList(wrapper);
+ rsList.addAll(organizations);
+ }else {
+ Organization organizationById = this.getOrganizationById(organizationId);
+ rsList.add(organizationById);
+ }
+ return rsList;
+ }
}
--
Gitblit v1.8.0