实体更新

xufenglei

2018-06-12 423f27b076fcd75df04005ae00e47ec26192434a

 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,10 +373,8 @@
   @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(" ","");

         Object sensors = sensorService.queryAll();

         JSONObject params = new JSONObject();

         params.put("regionCode",code);

@@ -525,4 +524,14 @@
      List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);

      return new ResultBean<List<Map<String, Object>>>(list);

   }



   /**

    * 根据监控点id获取所属设备version数据集

    * @param mptid

    * @return

    */

   @GetMapping("getvers")

   public ResultBean<List<Integer>> getVersions(Integer mptid){

      return  new ResultBean<>(monitorPointService.queryVersionsById(mptid));

   }

}