Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-22 0fd34e51dadbf9598188b0e061b658139e6d6257

 src/main/java/com/moral/controller/ScreenController.java

@@ -61,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.大屏接口

 */

@@ -68,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

@@ -534,4 +540,19 @@
   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);

   }



}