From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 8ea3288..9f15f47 100644
--- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
@@ -1,23 +1,25 @@
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.mapper.DeviceVersionMapper;
+import com.moral.mapper.DeviceVersionSensorMapper;
import com.moral.service.DeviceVersionService;
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;
@Service
public class DeviceVersionServiceImpl implements DeviceVersionService {
@Resource
private DeviceVersionMapper deviceVersionMapper;
+ @Resource
+ private DeviceVersionSensorMapper deviceVersionSensorMapper;
private static Class ENTITY_CLASS = DeviceVersion.class;
public PageBean queryByPageBean(PageBean pageBean){
return MyBatisBaseMapUtil.queryPage(deviceVersionMapper,pageBean,ENTITY_CLASS);
@@ -41,11 +43,38 @@
if(ids.length==1){
deviceVersionMapper.deleteByPrimaryKey(ids[0]);
}else{
- Example example = new Example(DeviceVersion.class);
+ Example example = new Example(ENTITY_CLASS);
example.or().andIn("id", Arrays.asList(ids));
deviceVersionMapper.deleteByExample(example);
}
}
}
+ @Override
+ public void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds){
+ Example example = new Example(DeviceVersionSensor.class);
+ example.or().andEqualTo("deviceVersionId",deviceVersionId);
+ deviceVersionSensorMapper.deleteByExample(example);
+ if(sensorIds!=null && sensorIds.length >0){
+ List<DeviceVersionSensor> deviceVersionSensorList = new ArrayList<DeviceVersionSensor>();
+ for(int sensorId:sensorIds){
+ DeviceVersionSensor deviceVersionSensor = new DeviceVersionSensor();
+ deviceVersionSensor.setDeviceVersionId(deviceVersionId);
+ deviceVersionSensor.setSensorId(sensorId);
+ deviceVersionSensorList.add(deviceVersionSensor);
+ }
+ deviceVersionSensorMapper.insertList(deviceVersionSensorList);
+ }
+ }
+ @Override
+ public List<Integer> getSensorIds(int deviceVersionId){
+ DeviceVersionSensor deviceVersionSensor = new DeviceVersionSensor();
+ deviceVersionSensor.setDeviceVersionId(deviceVersionId);
+ List<DeviceVersionSensor> deviceVersionSensorList = deviceVersionSensorMapper.select(deviceVersionSensor);
+ List<Integer> sensorIds = new ArrayList<>();
+ for(DeviceVersionSensor dvSensor:deviceVersionSensorList ){
+ sensorIds.add(dvSensor.getSensorId());
+ }
+ return sensorIds;
+ }
}
--
Gitblit v1.8.0