新增大屏登陆接口

ZhuDongming

2019-12-27 47a26c3365cfe2a9705aea8ae0887086f521ef7b

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

@@ -21,6 +21,7 @@
import java.util.stream.Collectors;



import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.collections.MapUtils;

import org.apache.commons.net.ftp.FTPClient;

import org.apache.log4j.Logger;

import org.dom4j.Document;

@@ -203,6 +204,58 @@
            resultMap.put("accountId", -1);

        } else {

            resultMap = accountService.screenLogin(parameters);

            // 添加返回行政区信息字符串操作

            Object orgId = resultMap.get("orgId");

            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {

                StringBuilder areaNamesBuilder = new StringBuilder("中国");

                if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {

                    Organization organization = organizationService.getOrganizationById((Integer) orgId);

                    if (organization.getAreaNames() != null) {

                        Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());

                        List<String> names = areaNameMap.entrySet().stream().filter(item -> {

                            return item.getValue() != null;

                        }).map(item -> {

                            return item.getValue();

                        }).collect(Collectors.toList());

                        AreaNames areaNames = organization.getAreaNames();

                        areaNamesBuilder.append("/");

                        areaNamesBuilder.append(String.join("/", names));

                    }

                    // 企业用户

                    if (organization.getRank() != null && organization.getRank() == 0) {

                        resultMap.put("type", "enterprise");

                    } else {

                        resultMap.put("type", "government");

                    }

                    Number mapAreaCode = null;

                    if (organization.getVillageCode() != null) {

                        mapAreaCode = organization.getVillageCode();

                    } else if (organization.getTownCode() != null) {

                        mapAreaCode = organization.getTownCode();

                    } else if (organization.getAreaCode() != null) {

                        mapAreaCode = organization.getAreaCode();

                    } else if (organization.getCityCode() != null) {

                        mapAreaCode = organization.getCityCode();

                    } else if (organization.getProvinceCode() != null) {

                        mapAreaCode = organization.getProvinceCode();

                    }

                    resultMap.put("mapAreaCode", mapAreaCode.toString());

                }

                resultMap.put("mapPath", areaNamesBuilder.toString());

            }

        }

        return resultMap;

    }



    @GetMapping("loginNew")

    public Map<String, Object> screenLoginNew(HttpServletRequest request) {

        Map<String, Object> resultMap = new HashMap<String, Object>();

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

        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {

            resultMap.put("msg", "用户名及密码不允许为空！");

            resultMap.put("accountId", -1);

        } else {

            resultMap = accountService.screenLoginNew(parameters);

            // 添加返回行政区信息字符串操作

            Object orgId = resultMap.get("orgId");

            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {

@@ -541,6 +594,12 @@
            model.setViewName("403");

            return model;

        }

    }



    @GetMapping("/getSensorsMap")

    public List<Map<String, String>> getSensorsMapOnly(String mac) {

        List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);

        return sensorsMapList;

    }



    @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)

@@ -1030,10 +1089,11 @@
        String monitor_point_id = (String) parameters.get("monitor_point_id");

        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);

        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);

        System.out.println(sensorUnitList);

        System.out.println("list:" + list);

        System.out.println("sensorUnitList:" + sensorUnitList);

        for (Map<String, Object> sensorMap : list) {

            for (Map<String, Object> sensorUnitMap : sensorUnitList) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {

                    sensorMap.put("unit", sensorUnitMap.get("name"));

                }

            }

@@ -1056,7 +1116,7 @@
        String intoTime = parameters.get("time").toString();

        Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);

        DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");

        String alterTime = df1.format(date.getTime()-15*24*60*60*1000);

        String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);

        parameters.put("time", alterTime);

        ParameterUtils.getTimeType4Time(parameters);

        String monitor_point_id = (String) parameters.get("monitorPoint");

@@ -1075,15 +1135,15 @@
        Map<String, Object> weatherMap = new HashMap<>();

        Map<String, Object> tempMap = new HashMap<>();

        Boolean tf = false;

        for(int i=0;i<sensorKeys.length;i++) {

           if(sensorKeys[i].equals("e7")) {

              tf = true;

           }

        for (int i = 0; i < sensorKeys.length; i++) {

            if (sensorKeys[i].equals("e7")) {

                tf = true;

            }

        }

        if (tf) {

            weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);

            tempMap = TempAllocationUtils.tempAllocation(weatherMap);

      }

        }

        //获取单位信息

        Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);



@@ -1091,9 +1151,9 @@
            String time = map.get("time").toString();

            time = time.substring(time.length() - 2);

            map.put("time", Integer.valueOf(time));

            if (tempMap!=null) {

               map.put("temp", tempMap.get(map.get("time").toString()));

         }

            if (tempMap != null) {

                map.put("temp", tempMap.get(map.get("time").toString()));

            }

            List<Number> values = new ArrayList<Number>();

            List<String> units = new ArrayList<String>();

            for (String string : sensorKeys) {

@@ -1209,7 +1269,13 @@
        LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);

        int month = timeLocalDateTime.getMonth().getValue();

        Point dirPoint = historyHourlyService.getDirPoint(parameters);

        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);

        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);

        if (MapUtils.isEmpty(getPollutionSourceData)) {

            getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);

        }

        if (MapUtils.isEmpty(getPollutionSourceData)) {

            getPollutionSourceData = new HashMap<>();

        }

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

        Device device = deviceService.getDeviceByMac(mac, false);

        JSONObject params = new JSONObject();