From 7486f185f3a48b75f163a99ecd7546b525018dd0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 17 May 2018 10:03:48 +0800
Subject: [PATCH] 行业 优化
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 53ef55d..a009a42 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -181,7 +181,7 @@
*
* @param map
* map��� ������ ������id���4������������
- * @return
+ * @return ������������������������
*/
@Override
public List<Device> query(Map<String, Object> map) {
@@ -196,7 +196,7 @@
* @param deviceName
* @param pageSize
* @param pageNo
- * @return
+ * @return ���������������������
*/
@Override
public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
@@ -218,7 +218,7 @@
* @param mpId
* @param pageSize
* @param pageNo
- * @return
+ * @return ���������������������
*/
@Override
public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {
@@ -332,15 +332,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()]));
}
}
--
Gitblit v1.8.0