From f600872a54da4b41ed137c3361f685604e47ee9d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 17:18:23 +0800
Subject: [PATCH] 编辑 设备 redis里组织id清空bug修复。
---
src/main/java/com/moral/service/AreaService.java | 2 +-
src/main/java/com/moral/service/impl/AreaServiceImpl.java | 2 +-
src/main/java/com/moral/controller/ScreenController.java | 3 +--
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 41 +++++++++++++++++++++--------------------
src/main/java/com/moral/controller/AreaController.java | 6 ++++--
5 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/controller/AreaController.java b/src/main/java/com/moral/controller/AreaController.java
index ebafd16..4a2a58b 100644
--- a/src/main/java/com/moral/controller/AreaController.java
+++ b/src/main/java/com/moral/controller/AreaController.java
@@ -1,6 +1,5 @@
package com.moral.controller;
-import com.moral.common.bean.Constants;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Area;
import com.moral.entity.City;
@@ -20,7 +19,10 @@
public class AreaController {
@Resource
AreaService areaService;
-
+ @GetMapping("getfullnames")
+ public ResultBean<String> getFullNames(Integer code){
+ return new ResultBean<>(areaService.queryFullNameByCode(code));
+ }
@GetMapping("get-provinces")
public ResultBean<List<Province>> getProvinces(){
ResultBean<List<Province>> resultBean = new ResultBean<>();
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f7d72e0..dadbe33 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -36,7 +36,6 @@
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.Constants;
@@ -374,7 +373,7 @@
@RequestMapping(value = "/map-page", method = RequestMethod.GET)
public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
Account account = accountService.getAccountById(accountId);
- String regionName = areaService.selectFullNameByCode(code);
+ String regionName = areaService.queryFullNameByCode(code);
if(account!=null&®ionName!=null){
//������������
regionName = regionName.replace(" ","");
diff --git a/src/main/java/com/moral/service/AreaService.java b/src/main/java/com/moral/service/AreaService.java
index 104bcd8..9df15cd 100644
--- a/src/main/java/com/moral/service/AreaService.java
+++ b/src/main/java/com/moral/service/AreaService.java
@@ -11,5 +11,5 @@
List<City> getCities(int provinceCode);
List<Area> getAreas(int cityCode);
- String selectFullNameByCode(Integer code);
+ String queryFullNameByCode(Integer code);
}
diff --git a/src/main/java/com/moral/service/impl/AreaServiceImpl.java b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
index 339ea54..fbf3730 100644
--- a/src/main/java/com/moral/service/impl/AreaServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AreaServiceImpl.java
@@ -48,7 +48,7 @@
* @return
*/
@Override
- public String selectFullNameByCode(Integer code){
+ public String queryFullNameByCode(Integer code){
String codeStr = code.toString();
String fullName = "";
// ���������������code
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f6b20ef..53ef55d 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
@@ -273,26 +273,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){
@@ -358,7 +359,7 @@
deviceMapper.updateByPrimaryKeySelective(device);
}
//������redis���������������
- refreshDeviceInRedis(device);
+ refreshDeviceInRedis(device.getMac());
}
catch (Exception ex){
throw ex;
--
Gitblit v1.8.0