xufenglei
2018-06-15 33e323fb0e6959bf838867fc5582fbcd4749abb1
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;
@@ -62,6 +61,11 @@
import com.moral.service.MonitorPointService;
import com.moral.service.SensorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
 * The Class ScreenController.大屏接口
 */
@@ -69,6 +73,7 @@
@RequestMapping("/screen")
//@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
@Api(tags = "Screen", description = "大屏相关")
public class ScreenController {
   public  static Logger log = Logger.getLogger(ScreenController.class);
    @Resource
@@ -177,14 +182,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 +379,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 +530,29 @@
      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));
   }
   @GetMapping("region_ranking_data")
   @ApiOperation(value = "获取排名数据", notes = "获取排名数据")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "regionCode", value = "区域码", required = true, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "dimension", value = "维度(profession、region、monitorPoint选一)", required = true, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "accountId", value = "账户id", required = true, paramType = "query", dataType = "int"),
   })
   public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){
      Map<String, Object> parameters = getParametersStartingWith(request, null);
      List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
      return new ResultBean<List<Map<String, Object>>>(list);
   }
}