update大屏年，月数据查询接口

jinpengyong

2020-12-23 8fb013a6d6707929799e9f7a8a82f311cbca29ae

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

@@ -64,7 +64,8 @@
    OrganizationSensorsService organizationSensorsService;
    @Resource
    MapPathService mapPathService;

    @Resource
    HistoryService historyService;


    @GetMapping("test")
@@ -79,7 +80,7 @@
    /**
     * @Description: 登陆接口
     * @Param: [parameters]
     * @return: java.util.Map<java.lang.String                               ,                               java.lang.Object>
     * @return: java.util.Map<java.lang.String                                                               ,                                                               java.lang.Object>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
@@ -103,7 +104,7 @@
    /**
     * @Description: 退出接口
     * @Param: [request]
     * @return: java.util.Map<java.lang.String                               ,                               java.lang.Object>
     * @return: java.util.Map<java.lang.String                                                               ,                                                               java.lang.Object>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
@@ -118,6 +119,9 @@
        return resultMap;
    }

    public static void main(String[] args) {

    }

    @UserLoginToken
    @GetMapping("getAccountInfo")
@@ -140,7 +144,7 @@
    /**
     * @Description: 获取传感器平均值
     * @Param: [request]
     * @return: com.moral.common.bean.ResultBean<java.util.List                               <                               java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>>
     * @return: com.moral.common.bean.ResultBean<java.util.List                                                               <                                                               java.util.Map                                                               <                                                               java.lang.String                                                               ,                                                               java.lang.Object>>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
@@ -169,7 +173,7 @@
    /**
     * @Description: 获取某个站点设备信息
     * @Param: [request]
     * @return: com.moral.common.bean.ResultBean<java.util.List                               <                               com.moral.entity.MonitorPoint>>
     * @return: com.moral.common.bean.ResultBean<java.util.List                                                               <                                                               com.moral.entity.MonitorPoint>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
@@ -185,7 +189,7 @@
    /**
     * @Description: 获取坐标接口，前端用于建点
     * @Param: [request]
     * @return: com.moral.common.bean.ResultBean<java.util.List                               <                               com.moral.entity.Device>>
     * @return: com.moral.common.bean.ResultBean<java.util.List                                                               <                                                               com.moral.entity.Device>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
@@ -200,11 +204,12 @@
    /**
     * @Description: 根据monitorId获取该站点下每一台设备具体传感器的五分钟平均值
     * @Param: []
     * @return: com.moral.common.bean.ResultBean<java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>
     * @return: com.moral.common.bean.ResultBean<java.util.Map                                                               <                                                               java.lang.String                                                               ,                                                               java.lang.Object>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */

    @UserLoginToken
    @GetMapping("fiveMinuteAvgDataNew")
    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) {
        //获取参数，传感器和regionCode
@@ -218,14 +223,15 @@
        //根据orgId获取该站点下所有设备mac集合
        String accountId = WebTokenUtils.getIdBytoken(token);
        Account account = accountService.getAccountById(Integer.parseInt(accountId));
        parameters.put("organizationId",account.getOrganizationId());
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
        if(ObjectUtils.isEmpty(monitorPoints))
        parameters.put("organizationId", account.getOrganizationId());
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegionNew(parameters);
        if (ObjectUtils.isEmpty(monitorPoints))
            return ResultBean.fail("该账号对应地区无站点");

        List<Device> devices = new ArrayList<>();
        for (MonitorPoint monitorPoint : monitorPoints) {
             devices.addAll(monitorPoint.getDevices());
            if (!ObjectUtils.isEmpty(monitorPoint.getDevices()))
                devices.addAll(monitorPoint.getDevices());
        }
        if (ObjectUtils.isEmpty(devices))
            return ResultBean.fail("该账号对应地区无设备");
@@ -398,7 +404,7 @@
    /**
     * @Description: 根据mac号获取单台设备信息，特殊客户只显示客户需要的传感器信息
     * @Param: [request]
     * @return: com.moral.common.bean.ResultBean<java.util.Map   <   java.lang.String   ,   java.lang.Object>>
     * @return: com.moral.common.bean.ResultBean<java.util.Map       <       java.lang.String       ,       java.lang.Object>>
     * @Author: 下雨听风
     * @Date: 2020/10/22
     */
@@ -474,7 +480,7 @@
    /**
     * @Description: 根据token获取用户地图
     * @Param: [request]
     * @return: com.moral.common.bean.ResultBean<java.util.List   <   com.moral.entity.WebProvince>>
     * @return: com.moral.common.bean.ResultBean<java.util.List       <       com.moral.entity.WebProvince>>
     * @Author: 下雨听风
     * @Date: 2020/11/27
     */
@@ -489,26 +495,67 @@
        return new ResultBean<>(mapPath);
    }

    /**
    * @Description: 获取用户站点信息
            * @Param: [request]
            * @return: com.moral.common.bean.ResultBean<java.util.List<com.moral.entity.MonitorPoint>>
            * @Author: 下雨听风
            * @Date: 2020/12/8
            */
    @UserLoginToken
    @GetMapping("monitor-points")
    public ResultBean<List<MonitorPoint>> getmMnitorPoints(HttpServletRequest request){
    public ResultBean<List<MonitorPoint>> getmMnitorPoints(HttpServletRequest request) {
        String accountId = WebTokenUtils.getIdBytoken(request.getHeader("token"));
        Account account = accountService.getAccountById(Integer.parseInt(accountId));
        String regionCode = request.getParameter("regionCode");
        Map<String,Object> paramMap = new HashMap<>();
        paramMap.put("organizationId",account.getOrganizationId());
        paramMap.put("regionCode",regionCode);
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("organizationId", account.getOrganizationId());
        paramMap.put("regionCode", regionCode);
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
        if (ObjectUtils.isEmpty(monitorPoints))
            return new ResultBean<>("无对应站点设备信息", ResultBean.FAIL);
        return new ResultBean<>(monitorPoints);
        return new ResultBean<List<MonitorPoint>>(monitorPoints);
    }


    /**
    * @Description: 获取一个设备某一个传感器的月平均值
            * @Param: [datas, devices]
            * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
            * @Author: 下雨听风
            * @Date: 2020/12/8
            */
    @UserLoginToken
    @GetMapping("sensor-monthAvg")
    public ResultBean<Map<String, Object>> getSensorMonthAvgByMac(HttpServletRequest request){
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        if ((!parameters.containsKey("mac"))||(!parameters.containsKey("macKey")))
            return ResultBean.fail("参数为null");
        Map<String, Object> result = historyMinutelyService.getAverageBySensor(parameters);
        return new ResultBean<Map<String, Object>>(result);
    }

    /**
    * @Description: 获取单台设备一个小时的AQI
            * @Param: [request]
            * @return: com.moral.common.bean.ResultBean<java.util.Map<java.lang.String,java.lang.Object>>
            * @Author: 下雨听风
            * @Date: 2020/12/8
            */
    @UserLoginToken
    @GetMapping("hourly-aqi")
    public ResultBean<Map<String, Object>> getHourlyAQI(HttpServletRequest request){
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        if (!parameters.containsKey("mac"))
            return ResultBean.fail("参数为null");
        Map<String, Object> result = historyService.gitHourlyAQIByMacAndTimeslot(parameters);
        return new ResultBean<Map<String, Object>>(result);
    }


    /**
     * @Description: 返回结果添加设备经纬度以及state
     * @Param: [datas, devices]
     * @return: java.util.List<java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */