From 423f27b076fcd75df04005ae00e47ec26192434a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 09:03:58 +0800
Subject: [PATCH] 实体更新
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 86 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f6b20ef..a3c9565 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -105,7 +105,7 @@
deviceMapper.updateByPrimaryKeySelective(device);
}
//������redis������������
- refreshDeviceInRedis(device);
+ refreshDeviceInRedis(device.getMac());
}
@Override
@@ -181,7 +181,7 @@
*
* @param map
* map��� ������ ������id���4������������
- * @return
+ * @return ������������������������
*/
@Override
public List<Device> query(Map<String, Object> map) {
@@ -196,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){
@@ -218,7 +236,7 @@
* @param mpId
* @param pageSize
* @param pageNo
- * @return
+ * @return ���������������������
*/
@Override
public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {
@@ -273,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());
- device.setOrganizationIds(orgIds);
- }
- String key = "device_"+device.getMac();
+ 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){
@@ -331,15 +350,28 @@
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()]));
}
}
@@ -358,7 +390,7 @@
deviceMapper.updateByPrimaryKeySelective(device);
}
//������redis���������������
- refreshDeviceInRedis(device);
+ refreshDeviceInRedis(device.getMac());
}
catch (Exception ex){
throw ex;
--
Gitblit v1.8.0