编辑 设备 redis里组织id清空bug修复。

fengxiang

2018-05-15 f600872a54da4b41ed137c3361f685604e47ee9d

 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;

@@ -177,14 +176,16 @@
                 alarmLevelMap.entrySet().stream().forEach(entry -> {

                     //当 increment都为0时，替换为默认值

                     AlarmSensorLevel alarmSensorLevel = entry.getValue();

                     boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);

                     if(isAllZero){

                         AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());

                         if(defaultAlarmSensorLevel!=null){

                             alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());

                         }else{

                             List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);

                             alarmSensorLevel.setIncrement(tempList);

                     if(alarmSensorLevel.getIncrement()!=null){

                         boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);

                         if(isAllZero){

                             AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());

                             if(defaultAlarmSensorLevel!=null){

                                 alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());

                             }else{

                                 List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);

                                 alarmSensorLevel.setIncrement(tempList);

                             }

                         }

                     }

                 });

@@ -372,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&&regionName!=null){

          //去除空格

            regionName = regionName.replace(" ","");