From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Sat, 10 Oct 2020 11:29:36 +0800 Subject: [PATCH] update --- src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 73 +++++++++++++++++++++++++++++++----- 1 files changed, 62 insertions(+), 11 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..4dce55d 100644 --- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java +++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java @@ -1,22 +1,24 @@ package com.moral.service.impl; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + import com.moral.common.bean.PageBean; -import com.moral.common.util.ExampleUtil; import com.moral.common.util.MyBatisBaseMapUtil; +import com.moral.common.util.RedisUtils; import com.moral.entity.DeviceVersion; import com.moral.entity.DeviceVersionSensor; 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; +import tk.mybatis.mapper.entity.Example; @Service public class DeviceVersionServiceImpl implements DeviceVersionService { @@ -25,14 +27,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); } } @@ -45,20 +51,31 @@ 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); } } } + + @Resource + private RedisUtils redisUtils; @Override public void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds){ Example example = new Example(DeviceVersionSensor.class); example.or().andEqualTo("deviceVersionId",deviceVersionId); deviceVersionSensorMapper.deleteByExample(example); + redisUtils.remove("deviceVersion_" + deviceVersionId); if(sensorIds!=null && sensorIds.length >0){ List<DeviceVersionSensor> deviceVersionSensorList = new ArrayList<DeviceVersionSensor>(); for(int sensorId:sensorIds){ @@ -69,6 +86,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){ @@ -81,4 +118,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