From d461a9e12841ba0e345fdb03eb8caaccb3b0da8e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:46:48 +0800
Subject: [PATCH] fix：修改测试环境redis
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 35 ++++++++---------------------------
1 files changed, 8 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..9b03888 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,10 +2,13 @@
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;
@@ -30,8 +33,6 @@
@Autowired
OrganizationMapper organizationMapper;
- @Autowired
- private DeviceService deviceService;
@Override
@@ -46,31 +47,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 +71,9 @@
return;
}
}
+
+ @Override
+ public List<Integer> orgIdList(Integer organizationId) {
+ return this.baseMapper.orgIdList(organizationId);
+ }
}
--
Gitblit v1.8.0