From 9437c74510c25be9d2413821c65fcf6ca4e6d21a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 31 Aug 2018 08:35:26 +0800
Subject: [PATCH] 获取优良天数
---
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
index 9f15f47..1de644f 100644
--- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
@@ -4,6 +4,7 @@
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;
@@ -12,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
@Service
@@ -21,14 +23,18 @@
@Resource
private DeviceVersionSensorMapper deviceVersionSensorMapper;
private static Class ENTITY_CLASS = DeviceVersion.class;
+ @Override
public PageBean queryByPageBean(PageBean pageBean){
return MyBatisBaseMapUtil.queryPage(deviceVersionMapper,pageBean,ENTITY_CLASS);
}
+ @Override
public void addOrModify(DeviceVersion deviceVersion){
try{
if(deviceVersion.getId()==null){
+ deviceVersion.setUpdateTime(new Date());
deviceVersionMapper.insertSelective(deviceVersion);
}else{
+ deviceVersion.setUpdateTime(new Date());
deviceVersionMapper.updateByPrimaryKeySelective(deviceVersion);
}
}
@@ -41,11 +47,18 @@
public void deleteByIds(Integer... ids) {
if(ids!=null&&ids.length>0){
if(ids.length==1){
- deviceVersionMapper.deleteByPrimaryKey(ids[0]);
+ DeviceVersion deviceVersion = new DeviceVersion();
+ deviceVersion.setId(ids[0]);
+ deviceVersion.setIsDelete(true);
+ deviceVersion.setUpdateTime(new Date());
+ deviceVersionMapper.updateByPrimaryKeySelective(deviceVersion);
}else{
+ DeviceVersion deviceVersion = new DeviceVersion();
+ deviceVersion.setIsDelete(true);
+ deviceVersion.setUpdateTime(new Date());
Example example = new Example(ENTITY_CLASS);
example.or().andIn("id", Arrays.asList(ids));
- deviceVersionMapper.deleteByExample(example);
+ deviceVersionMapper.updateByExampleSelective(deviceVersion,example);
}
}
@@ -66,6 +79,26 @@
deviceVersionSensorMapper.insertList(deviceVersionSensorList);
}
}
+ public List<DeviceVersion> getVersionsByOrgId(int organizationId){
+ return null;
+ }
+
+ @Override
+ public Integer queryMaxVersionNo() {
+ Example example = new Example(DeviceVersion.class);
+ example.orderBy("version").desc();
+ List<DeviceVersion> deviceVersionList = deviceVersionMapper.selectByExample(example);
+ if(deviceVersionList.size()>0){
+ return deviceVersionList.get(0).getVersion();
+ }
+ return null;
+ }
+ @Override
+ public DeviceVersion queryByVersionNo(int versionNo) {
+ DeviceVersion query = new DeviceVersion();
+ query.setVersion(versionNo);
+ return deviceVersionMapper.selectOne(query);
+ }
@Override
public List<Integer> getSensorIds(int deviceVersionId){
DeviceVersionSensor deviceVersionSensor = new DeviceVersionSensor();
@@ -77,4 +110,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