Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-04 71af09a7d35a1146122776bebac8d51c1903beed

Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,9 @@
import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.net.InetAddress;

import java.net.URL;

import java.net.URLConnection;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

@@ -262,7 +265,7 @@
     * 大屏程序在线升级配置读取

     *********************************************/

    private String fileName = "Version.xml";

    private String ip = "121.40.92.176";

    private String ip = "47.96.19.115";

    private String userName = "ftp_user";

    private String userPwd = "qwer1234";

    private int port = 21;

@@ -276,8 +279,9 @@
            ftpClient.connect(ip, port);

            ftpClient.login(userName, userPwd);

            ftpClient.changeWorkingDirectory(path);

            //ftpClient.enterRemotePassiveMode();

            ftpClient.enterLocalPassiveMode();

            //ftpClient.enterLocalActiveMode();



            InputStream ins = ftpClient.retrieveFileStream(fileName);

            BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));

            String line;

@@ -295,6 +299,19 @@
                ftpClient.logout();

                ftpClient.disconnect();

            }



//            String urlStr = "http://www.7drlb.com/apps/Version.xml";

//            URL realUrl = new URL(urlStr);

//            URLConnection connection = realUrl.openConnection();

//            connection.connect();

//            StringBuffer result = new StringBuffer();

//            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));

//            String line;

//            while ((line = in.readLine()) != null) {

//                result.append(line);

//            }

//            String content = result.toString();



            SAXReader saxReader = new SAXReader();

            Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));

            Element root = document.getRootElement();

@@ -306,6 +323,13 @@
        }

        return version;

    }



    public static void main(String[] args) {

        ScreenController sc = new ScreenController();

        Version a = sc.index();

        System.out.println(a.getVer());

    }



    /**

     * 地图接口

     * 开始


 src/main/java/com/moral/service/impl/AlarmServiceImpl.java

@@ -70,6 +70,7 @@
            Map<String, Object> alarmData = alarmDatas.get(0);

            List<String> sensors = (List<String>) parameters.get("sensors");

            List list = new ArrayList();

            if (!ObjectUtils.isEmpty(alarmData)) {

            for (String key : alarmData.keySet()) {

                for (String sensor : sensors) {

                    String[] split = sensor.split("-");

@@ -85,6 +86,7 @@
                    }

                }

            }

            }

            resultMap.put("list", list);

        }

        return resultMap;


 src/main/resources/mapper/AlarmMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.moral.mapper.AlarmMapper">

    <select id="getAlarmData" resultType="java.util.Map">

    <select id="getAlarmData" resultType="java.util.LinkedHashMap">

        SELECT

            <if test="dimension=='monitorPoint'">

                `name`,

@@ -32,11 +32,11 @@
                            </foreach>

                        </when>

                        <otherwise>

                            DATE_FORMAT( h.time, '%Y-%m-%d' ) AS 'time'

                             h.time

                        </otherwise>

                    </choose>

                FROM

                    alarm h, 
                    alarm_daily h, 
                    device d,

                    monitor_point mp 

                WHERE d.monitor_point_id = mp.id 

@@ -68,7 +68,7 @@
                    <if test="dimension=='monitorPoint'">

                        mp.id,

                    </if>

                    DATE_FORMAT( h.time, '%Y-%m-%d' )

                    h.time

            ) a

        <if test="dimension=='monitorPoint'">

            GROUP BY name