update mac变为name

ZhuDongming

2020-04-14 954cc0fbfdf943c2a26c30ac828f302b0f586133

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

@@ -18,6 +18,7 @@
import java.util.List;

import java.util.Map;

import java.util.Optional;

import java.util.Set;

import java.util.stream.Collectors;



import org.apache.commons.collections.CollectionUtils;

@@ -1339,4 +1340,66 @@
        return new ResultBean<List<Map<String, Object>>>(returnList);

    }



    @GetMapping("/carTrajectory")

    @ApiOperation(value = "显示走航车轨迹", notes = "显示走航车轨迹")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "mac", value = "设备mac（格式：p5dnd7a0392082）", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "startTime", value = "开始时间(格式：2020-03-19-14)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "endTime", value = "结束时间(格式：2020-03-19-17)", required = true, paramType = "query", dataType = "String")

    })

    public ModelAndView carTrajectory(ModelAndView model, HttpServletRequest request) throws Exception {

        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);

        String st = parameters.get("startTime").toString();

        String startYearAndDay = st.substring(0, st.lastIndexOf("-"));

        String startHour = st.substring(st.lastIndexOf("-") + 1);

        String startTime = startYearAndDay + " " + startHour + ":00:00";

        String et = parameters.get("endTime").toString();

        String endYearAndDay = et.substring(0, et.lastIndexOf("-"));

        String endHour = et.substring(et.lastIndexOf("-") + 1);

        String endTime = endYearAndDay + " " + endHour + ":00:00";

        parameters.put("startTime", startTime);

        parameters.put("endTime", endTime);

        String mac = parameters.get("mac").toString();

        if (mac != null && mac.length() != 0) {

            List<List<Map<String, Object>>> sensorData = historyService.getCarSensorData(parameters);

            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);

            List<Map<String, Object>> sensorList = new ArrayList<>();

            if (sensorData.size() == 3) {

                sensorList = sensorData.get(0);

            }

            JSONObject params = new JSONObject();

            params.put("sensorInfo", sensorList);

            params.put("sensorsMap", sensorsMap);

            String paramsJson = params.toJSONString();

            model.addObject("carTrajectoryParams", paramsJson);

            model.setViewName("cartrajectory");

            return model;

        } else {

            StringBuilder msg = new StringBuilder();

            msg.append(" param[0] mac:");

            msg.append(mac);

            log.warn(msg);

            model.setViewName("403");

            return model;

        }

    }



    @GetMapping("device-excel")

    @ApiOperation(value = "获取设备数据报表", notes = "获取设备数据报表")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "organizationId", value = "登录账号的组织id(如99)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "time", value = "时间(格式：2020-04-09或2019-04)", required = true, paramType = "query", dataType = "String")})

    public ResultBean<List<Map<String, Object>>> getDevicesDataToExcel(HttpServletRequest request) throws Exception {

        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);

        ParameterUtils.getTimeType4Time(parameters);

        parameters.put("sensorKeys", Arrays.asList(parameters.get("sensorKey")));

        Object organizationId = parameters.get("organizationId");

        Set<Integer> organizationIds = organizationService.getChildOrganizationIds(Integer.valueOf(organizationId.toString()));

        List<String> macList = deviceService.getMacsByOrganizationId(new ArrayList<>(organizationIds));

        parameters.put("macs", macList);

        List<Map<String, Object>> list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);

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

    }



}