From 89d69ac261923790e2d46b9bf3748a6cf2f2767b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:22 +0800
Subject: [PATCH] screen-manage 型号查询功能完成
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
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 c716f2e..dc1d8f1 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
@@ -8,11 +8,13 @@
import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
+import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,7 +57,7 @@
//������������������
Page<Version> queryPage = new Page<>(page, size);
NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
- wrapper.like("name",name);
+ wrapper.like("name", name);
wrapper.between("create_time", createStartTime, createEndTime);
wrapper.between("update_time", updateStartTime, updateEndTime);
//������������������������
@@ -66,16 +68,25 @@
wrapper.orderByDesc(ConvertUtils.toLine(order));
}
//������������
- Page<Version> versionsPage = versionMapper.selectPage(queryPage,wrapper);
+ Page<Version> versionsPage = versionMapper.selectPage(queryPage, wrapper);
List<Version> versions = versionsPage.getRecords();
//������������������������������������
List<Integer> versionsIds = new ArrayList<>();
- versions.forEach(value->versionsIds.add(value.getId()));
- if(!ObjectUtils.isEmpty(versionsIds)){
- QueryWrapper<VersionSensorUnit> sensorUnitQueryWrapper = new QueryWrapper<>();
-
+ versions.forEach(value -> versionsIds.add(value.getId()));
+ List<Version> result = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(versionsIds)) {
+ result = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
}
-
- return null;
+ //������������������
+ List<VersionDTO> dtos = new ArrayList<>();
+ result.forEach(value -> dtos.add(new VersionDTO(value)));
+ dto.setVersionDTOS(dtos);
+ dto.setCurrent(versionsPage.getCurrent());
+ dto.setPages(versionsPage.getPages());
+ dto.setSize(versionsPage.getSize());
+ dto.setTotal(versionsPage.getTotal());
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
}
}
--
Gitblit v1.8.0