From 8ba6add88e9d5c408110dfcf80bf14e8d8df7c79 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 07 Jan 2022 09:15:13 +0800
Subject: [PATCH] 修改污染警报定时任务,实现数据分表
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java
index 358a13b..5356d1e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java
@@ -1,9 +1,16 @@
package com.moral.api.pojo.vo.Version;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.moral.api.entity.Sensor;
+import com.moral.api.entity.Version;
+import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.vo.sensor.SensorVO;
+import com.moral.util.DateUtils;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -30,4 +37,44 @@
private String desc;
private List<SensorVO> sensors;
+
+ public static VersionVO convert(VersionDTO dto){
+ return convertToQueryPage(dto);
+ }
+
+ private static VersionVO convertToQueryPage(VersionDTO dto) {
+ VersionVO vo = new VersionVO();
+ Version version = dto.getVersion();
+ Integer id = version.getId();
+ String desc = version.getDesc();
+ String name = version.getName();
+ Date createTime = version.getCreateTime();
+ Date updateTime = version.getUpdateTime();
+ List<Sensor> sensors = version.getSensors();
+ List<SensorVO> sensorVOS = new ArrayList<>();
+ if(!ObjectUtils.isEmpty(sensors)){
+ for (Sensor sensor : sensors) {
+ SensorVO sensorVO = convertToSensorVO(sensor);
+ sensorVOS.add(sensorVO);
+ }
+ }
+ vo.setId(id);
+ vo.setDesc(desc);
+ vo.setName(name);
+ vo.setCreateTime(DateUtils.dateToDateString(createTime,"yyyy-MM-dd"));
+ vo.setUpdateTime(DateUtils.dateToDateString(updateTime,"yyyy-MM-dd"));
+ vo.setSensors(sensorVOS);
+ return vo;
+ }
+
+ private static SensorVO convertToSensorVO(Sensor sensor) {
+ SensorVO vo = new SensorVO();
+ vo.setName(sensor.getName());
+ vo.setId(sensor.getId());
+ vo.setUnit(sensor.getUnit());
+ vo.setUpper(sensor.getUpper());
+ vo.setLower(sensor.getLower());
+ vo.setUnitKey(sensor.getUnitKey());
+ return vo;
+ }
}
--
Gitblit v1.8.0