From 9b33e93fccddea356c3d686684fc58ceb176ff39 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:01:26 +0800
Subject: [PATCH] 增加 省市区 查询条件
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 104 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 79cf204..5ae279f 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -1,20 +1,30 @@
package com.moral.service.impl;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
-import com.moral.common.util.*;
-import org.springframework.stereotype.Service;
-
+import com.moral.common.util.ExampleUtil;
+import com.moral.common.util.RedisUtils;
+import com.moral.common.util.StringUtils;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
+import com.moral.mapper.DeviceMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.service.MonitorPointService;
+
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
@@ -22,6 +32,8 @@
public class MonitorPointServiceImpl implements MonitorPointService {
@Resource
private MonitorPointMapper monitorPointMapper;
+ @Resource
+ private DeviceMapper deviceMapper;
@Resource
RedisUtils redisUtils;
private static Class ENTITY_CLASS = MonitorPoint.class;
@@ -34,13 +46,14 @@
public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){
List<MonitorPoint> monitorPointList = monitorPointMapper.selectByMap(params);
for(MonitorPoint monitorPoint:monitorPointList){
- loadStateFromRedis(monitorPoint);
+ Integer state = getStateFromRedis(monitorPoint.getId());
+ monitorPoint.setState(state);
}
return monitorPointList;
}
- private void loadStateFromRedis(MonitorPoint monitorPoint){
+ private Integer getStateFromRedis(Integer monitorPointId){
StringBuilder key = new StringBuilder();
- key.append("*_").append(monitorPoint.getId()).append("_*");
+ key.append("state_").append(monitorPointId).append("_*");
List<Map> stateList = redisUtils.getList(key.toString(),Map.class);
int state = -1;
if(stateList!=null){
@@ -50,7 +63,7 @@
}
}
state = state==-1?4:state;
- monitorPoint.setState(state);
+ return state;
}
@Override
public PageBean queryByPageBean(PageBean pageBean) {
@@ -82,13 +95,42 @@
monitorPointMapper.insertSelective(monitorPoint);
}else{
monitorPointMapper.updateByPrimaryKeySelective(monitorPoint);
+ // ������������������������������ ���redis���������������
+ refreshDevicesInRedis(monitorPoint.getId());
}
}
catch (Exception ex){
throw ex;
}
}
+ /*
+ ������������������������������ ���redis���������������
+ */
+ private void refreshDevicesInRedis(int monitorPointId){
+ Device device = new Device();
+ device.setMonitorPointId(monitorPointId);
+ List<Device> deviceList = deviceMapper.select(device);
+ if (!CollectionUtils.isEmpty(deviceList)){
+ List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(monitorPointId);
+ if (!CollectionUtils.isEmpty(orgIds)){
+ deviceList.stream().forEach(dev ->{
+ if(!StringUtils.isNullOrEmpty(dev.getMac())){
+ String key = "device_"+dev.getMac();
+ // ��������������������� ������������redis
+ Device simpleDevice = new Device();
+ simpleDevice.setId(dev.getId());
+ simpleDevice.setDeviceVersion(dev.getDeviceVersion());
+ simpleDevice.setMac(dev.getMac());
+ simpleDevice.setMonitorPointId(dev.getMonitorPointId());
+ // ������������������������������������������������������������������
+ simpleDevice.setOrganizationIds(orgIds);
+ redisUtils.set(key,simpleDevice);
+ }
+ });
+ }
+ }
+ }
@Override
public void deleteByIds(Integer... ids) {
MonitorPoint monitorPoint = new MonitorPoint();
@@ -112,9 +154,63 @@
Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
- example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");
+ example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE)
+ .andCondition("getPY(" + getReplaceStr("name") + ") like ", "%" + name + "%");
List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
return monitorPoints;
}
+
+ private String getReplaceStr(String name){
+ List<String[]> list = new ArrayList<String[]>();
+ list.add(new String[]{"���",""});
+ list.add(new String[]{"���",""});
+ for (String[] string : list) {
+ name = replace(name,string[0],string[1]);
+ }
+ return name;
+ }
+
+ private String replace(String name,String fromStr,String toStr){
+ return "REPLACE (" + name + ",'" + fromStr + "','" + toStr + "')";
+ }
+
+ /**
+ *
+ * @param idList
+ * @return {id:,state:}
+ */
+ @Override
+ public List<Map<String, String>> queryMonitroPointsState(List<Integer> idList) {
+ List<Map<String, String>> list = idList.stream().map( id -> {
+ Integer state = getStateFromRedis(id);
+ Map<String,String> stateMap = new HashMap<>();
+ stateMap.put("id",id.toString());
+ stateMap.put("state",state.toString());
+ return stateMap;
+ }).collect(Collectors.toList());
+ return list;
+ }
+
+ @Override
+ public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId) {
+ Example example = new Example(MonitorPoint.class);
+ Criteria criteria = example.createCriteria();
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ if (Constants.isNotSpecialOrgId(orgId)) {
+ criteria.andEqualTo("organizationId", orgId);
+ }
+ example.orderBy("name").asc();
+ return monitorPointMapper.selectByExample(example);
+ }
+ @Override
+ public List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters) {
+ Example example = new Example(MonitorPoint.class);
+ Criteria criteria = example.createCriteria();
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ criteria.andEqualTo(parameters.get("name").toString(), parameters.get("value"));
+ return monitorPointMapper.selectByExample(example);
+ }
}
--
Gitblit v1.8.0