From a370cd1277689094b126eb6f0490c4ba69c7baee Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Tue, 03 Jul 2018 14:09:39 +0800 Subject: [PATCH] 监控站页面布局返回接口 优化 --- src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java index ac912aa..8af2ad5 100644 --- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java +++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java @@ -1,19 +1,16 @@ package com.moral.service.impl; import com.moral.common.bean.PageBean; -import com.moral.common.util.ExampleUtil; import com.moral.common.util.MyBatisBaseMapUtil; import com.moral.entity.DeviceVersion; import com.moral.entity.DeviceVersionSensor; +import com.moral.entity.Sensor; import com.moral.mapper.DeviceVersionMapper; import com.moral.mapper.DeviceVersionSensorMapper; import com.moral.service.DeviceVersionService; -import org.springframework.data.mongodb.core.aggregation.ArrayOperators; import org.springframework.stereotype.Service; import tk.mybatis.mapper.entity.Example; - import javax.annotation.Resource; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -70,6 +67,9 @@ deviceVersionSensorMapper.insertList(deviceVersionSensorList); } } + public List<DeviceVersion> getVersionsByOrgId(int organizationId){ + return null; + } @Override public List<Integer> getSensorIds(int deviceVersionId){ DeviceVersionSensor deviceVersionSensor = new DeviceVersionSensor(); @@ -81,4 +81,18 @@ } return sensorIds; } + @Override + public List<DeviceVersion> queryByOrgId(Integer organizationId){ + return this.deviceVersionMapper.selectListByOrgId(organizationId); + } + @Override + public List<DeviceVersion> queryByMpointId(Integer mpointId){ + return this.deviceVersionMapper.selectListByMpointId(mpointId); + } + + @Override + public DeviceVersion queryVersionById(Integer versionId) { + return deviceVersionMapper.selectByPrimaryKey(versionId); + } + } -- Gitblit v1.8.0