From 643bde4fc2446be7b059a03d20a66781953bb9a7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 11:40:05 +0800
Subject: [PATCH] screen-api 增加根据组织id获取型号接口
---
/dev/null | 34 -----------------
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 33 ++++++++++++++--
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 10 +++++
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 7 ---
screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java | 10 -----
screen-manage/src/main/java/com/moral/api/service/VersionService.java | 9 ++++
6 files changed, 48 insertions(+), 55 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
index 06dc0d5..e87b805 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
@@ -121,4 +121,14 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+ @GetMapping("queryByOrgId")
+ public ResultMessage queryByOrganizationId(Integer organizationId){
+
+ VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java
deleted file mode 100644
index b0c53b2..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.moral.api.pojo.dto.organizationUnitAlarm;
-
-/**
- * @ClassName OrganizationUnitAlramDTO
- * @Description TODO
- * @Author ���������
- * @Date 2021/6/17 14:01
- * @Version TODO
- **/
-public class OrganizationUnitAlarmDTO {
-
- /*
- * ���������
- * */
- private Integer code;
-
- /*
- * ������������
- * */
- private String msg;
-
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmInsertForm.java
deleted file mode 100644
index 63e006d..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmInsertForm.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.moral.api.pojo.form.organizationUnitAlarm;
-
-import com.moral.api.entity.OrganizationUnitAlarm;
-import lombok.Data;
-import org.springframework.util.ObjectUtils;
-
-import java.util.List;
-
-/**
- * @ClassName OrganizationUnitAlarmInsertForm
- * @Description TODO
- * @Author ���������
- * @Date 2021/6/17 14:12
- * @Version TODO
- **/
-@Data
-public class OrganizationUnitAlarmInsertForm {
-
- private List<OrganizationUnitAlarm> organizationUnitAlarms;
-
- public boolean valid(){
- if(ObjectUtils.isEmpty(organizationUnitAlarms))
- return false;
- for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {
- if(ObjectUtils.isEmpty(organizationUnitAlarm.getOrganizationId())||
- ObjectUtils.isEmpty(organizationUnitAlarm.getVersionId())||
- ObjectUtils.isEmpty(organizationUnitAlarm.getSensorCode())||
- ObjectUtils.isEmpty(organizationUnitAlarm.getUnitKey())||
- ObjectUtils.isEmpty(organizationUnitAlarm.getShowUnitKey()));
- return false;
- }
- return true;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java b/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
index 03814e2..6a6b4c5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
@@ -2,8 +2,6 @@
import com.moral.api.entity.OrganizationUnitAlarm;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
-import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmInsertForm;
/**
* <p>
@@ -15,12 +13,4 @@
*/
public interface OrganizationUnitAlarmService extends IService<OrganizationUnitAlarm> {
- /**
- * @Description: ������������������������������������������
- * @Param: [organizationInsertForm]
- * @return: com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO
- * @Author: ���������
- * @Date: 2021/6/17
- */
- OrganizationUnitAlarmDTO insertOrganizationUnitAlarm(OrganizationUnitAlarmInsertForm organizationInsertForm);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/VersionService.java b/screen-manage/src/main/java/com/moral/api/service/VersionService.java
index 77b4031..6843630 100644
--- a/screen-manage/src/main/java/com/moral/api/service/VersionService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/VersionService.java
@@ -71,4 +71,13 @@
*/
VersionQueryDTO queryVersionById(VersionQueryByIdForm form);
+ /**
+ * @Description: ������������id������������
+ * @Param: [organizationId]
+ * @return: com.moral.api.pojo.dto.version.VersionQueryDTO
+ * @Author: ���������
+ * @Date: 2021/6/18
+ */
+ VersionQueryDTO queryByOrganizationId(Integer organizationId);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index e321a69..6bb3570 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -2,8 +2,6 @@
import com.moral.api.entity.OrganizationUnitAlarm;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
-import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
-import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmInsertForm;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -19,9 +17,4 @@
@Service
public class OrganizationUnitAlarmServiceImpl extends ServiceImpl<OrganizationUnitAlarmMapper, OrganizationUnitAlarm> implements OrganizationUnitAlarmService {
- @Override
- public OrganizationUnitAlarmDTO insertOrganizationUnitAlarm(OrganizationUnitAlarmInsertForm organizationInsertForm) {
-
- return null;
- }
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
index 1078b72..26f3540 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.User;
-import com.moral.api.entity.Version;
-import com.moral.api.entity.VersionSensorUnit;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
@@ -44,6 +42,8 @@
VersionSensorUnitMapper versionSensorUnitMapper;
@Autowired
SensorMapper sensorMapper;
+ @Autowired
+ OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -260,5 +260,30 @@
return dto;
}
+ @Override
+ public VersionQueryDTO queryByOrganizationId(Integer organizationId) {
+ //������������������
+ VersionQueryDTO dto = new VersionQueryDTO();
+ //������������id
+ QueryWrapper<OrganizationUnitAlarm> queryVersionIdsWrapper = new QueryWrapper<>();
+ queryVersionIdsWrapper.select("DISTINCT version_id").eq("is_delete",Constants.NOT_DELETE).eq("organization_id",organizationId);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryVersionIdsWrapper);
+ List<Integer> versionIds = new ArrayList<>();
+ for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {
+ versionIds.add(organizationUnitAlarm.getVersionId());
+ }
+ //������������id������������
+ List<Version> versions = new ArrayList<>();
+ if(!ObjectUtils.isEmpty(versionIds))
+ versions = versionMapper.selectBatchIds(versionIds);
+ //������������������
+ List<VersionDTO> versionDTOS = new ArrayList<>();
+ versions.forEach(value->versionDTOS.add(new VersionDTO(value)));
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ dto.setVersionDTOS(versionDTOS);
+ return dto;
+ }
+
}
--
Gitblit v1.8.0