From bde2512a915e394ab6f3939833469516c473ee0e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 14 Jun 2018 11:49:17 +0800
Subject: [PATCH] EquDeviceAdapter 更新
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 163 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 120 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 58b7dc2..4213c13 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -104,6 +104,8 @@
device.setId(queryDevice.getId());
deviceMapper.updateByPrimaryKeySelective(device);
}
+ //������redis������������
+ refreshDeviceInRedis(device.getMac());
}
@Override
@@ -111,21 +113,43 @@
ValidateUtil.notNull(uid, "param.is.null");
Device device = new Device();
device.setOperateUserId(uid);
- PageHelper.startPage(pageIndex, pageSize);
+ PageHelper.startPage(pageIndex, pageSize,false);
List<Device> devices = deviceMapper.select(device);
return devices;
}
+ /**
+ *
+ * @param mac
+ * @param fromCache
+ * @return ������������������
+ */
+ @Override
+ public Device getDeviceByMac (String mac ,boolean fromCache){
+ if(fromCache){
+ Device device = getDeviceFromRedis(mac);
+ if(device==null) {
+ device = deviceMapper.selectWithOrgIdsByMac(mac);
+ if(device!=null){
+ setDeviceToRedis(mac,device);
+ }
+ }
+ return device;
+ }else {
+ return deviceMapper.selectWithOrgIdsByMac(mac);
+ }
+
+ }
+
+ /**
+ * ���������������������
+ * @param mac
+ * @return
+ */
@Override
public Device getDeviceByMac(String mac) {
- Device device = getDeviceFromRedis(mac);
- if(device==null) {
- device = deviceMapper.selectWithOrgIdsByMac(mac);
- if(device!=null){
- setDeviceToRedis(mac,device);
- }
- }
- return device;
+
+ return getDeviceByMac(mac,true);
}
/*
* ���������������������redis������key
@@ -157,7 +181,7 @@
*
* @param map
* map��� ������ ������id���4������������
- * @return
+ * @return ������������������������
*/
@Override
public List<Device> query(Map<String, Object> map) {
@@ -172,14 +196,32 @@
* @param deviceName
* @param pageSize
* @param pageNo
- * @return
+ * @return ���������������������
*/
@Override
public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
PageHelper.startPage(pageNo,pageSize);
}
- List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);
+ String state = null;
+ switch (deviceName){
+ case "������":
+ state = "0";
+ deviceName = null;break;
+ case "������":
+ state = "1";
+ deviceName = null;break;
+ case "������":
+ state = "2";
+ deviceName = null;break;
+ case "������":
+ state = "3";
+ deviceName = null;break;
+ case "������":
+ state = "4";
+ deviceName = null;break;
+ }
+ List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,state,deviceName);
//���redis������������
loadDeviceState(list);
if(list instanceof Page){
@@ -194,7 +236,7 @@
* @param mpId
* @param pageSize
* @param pageNo
- * @return
+ * @return ���������������������
*/
@Override
public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {
@@ -249,26 +291,27 @@
}
return device;
}
- /*
- ������ redis ���������������
+
+ /**
+ * ������������������������������
+ * ������ redis ���������������
+ * @param mac
*/
- private void refreshDeviceInRedis(Device device){
- if(!StringUtils.isBlank(device.getMac())){
- Device simpleDevice = new Device();
- simpleDevice.setId(device.getId());// id
- simpleDevice.setName(device.getName());// name
- simpleDevice.setAddress(device.getAddress());// address
- simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
- simpleDevice.setMac(device.getMac()); // mac
- simpleDevice.setMonitorPointId(device.getMonitorPointId());// ���������id
- simpleDevice.setOrganizationIds(device.getOrganizationIds());// ������������
- if(device.getMonitorPointId()!=null){
- List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
- simpleDevice.setOrganizationIds(orgIds);
- }
- String key = "device_"+device.getMac();
- redisUtils.set(key,simpleDevice);
- }
+ private void refreshDeviceInRedis(String mac){
+ if(!StringUtils.isBlank(mac)){
+ Device devQuery = new Device();
+ devQuery.setMac(mac);
+ Device device = deviceMapper.selectOne(devQuery);
+ if(device.getMonitorPointId()!=null){
+ List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
+ device.setOrganizationIds(orgIds);
+ }
+ String key = "device_"+mac;
+ redisUtils.set(key,device);
+ }else
+ {
+ log.warn("param mac is null in method [refreshDeviceInRedis]");
+ }
}
@Override
public int countByExample(PageBean pageBean){
@@ -307,34 +350,56 @@
Device device = new Device();
device.setIsDelete(Constants.IS_DELETE_TRUE);
if(ids!=null&&ids.length>0){
+ Example example = new Example(ENTITY_CLASS);
+ example.or().andIn("id", Arrays.asList(ids));
if(ids.length==1){
device.setId(ids[0]);
deviceMapper.updateByPrimaryKeySelective(device);
}else{
- Example example = new Example(ENTITY_CLASS);
- example.or().andIn("id", Arrays.asList(ids));
deviceMapper.updateByExampleSelective(device,example);
}
-
+ List<Device> deviceList = deviceMapper.selectByExample(example);
+ List<String> adjustAndDeviceKeys = deviceList.stream().collect(
+ ArrayList<String>::new,
+ (list,dev) -> {
+ if(!StringUtils.isBlank(dev.getMac())){
+ list.add("device_"+dev.getMac());
+ list.add("adjust_"+dev.getMac());
+ }
+ },
+ (oList,nList)-> {
+ oList.addAll(nList);
+ }
+ );
+ redisUtils.remove(adjustAndDeviceKeys.toArray(new String [adjustAndDeviceKeys.size()]));
}
}
@Override
+ @Transactional
public void addOrModify(Device device){
try{
//mac ���������
- if(StringUtils.isBlank(device.getMac())){
+ if(!StringUtils.isBlank(device.getMac())){
device.setMac(device.getMac().toLowerCase());
}
- if(device.getId()==null){
- device.setState(Constants.DEVICE_STATE_OFFLINE);
- device.setIsDelete(Constants.IS_DELETE_FALSE);
- deviceMapper.insertSelective(device);
- }else{
+ if(device.getId()!=null){
deviceMapper.updateByPrimaryKeySelective(device);
- //������redis���������������
- refreshDeviceInRedis(device);
+ }else{
+ Device deviceQuery = new Device();
+ deviceQuery.setMac(device.getMac());
+ Device deviceResult = deviceMapper.selectOne(deviceQuery);
+ if(deviceResult !=null){
+ device.setId(deviceResult.getId());
+ deviceMapper.updateByPrimaryKeySelective(device);
+ }else {
+ device.setState(Constants.DEVICE_STATE_OFFLINE);
+ device.setIsDelete(Constants.IS_DELETE_FALSE);
+ deviceMapper.insertSelective(device);
+ }
}
+ //������redis���������������
+ refreshDeviceInRedis(device.getMac());
}
catch (Exception ex){
throw ex;
@@ -388,4 +453,16 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {
+
+ return deviceMapper.getDevicesByProfession(parameters);
+ }
+
}
--
Gitblit v1.8.0