test

沈斌

2018-02-28 9e74359927be420258b454e8914d7cf4f6a11bf9

 src/main/java/com/moral/monitor/controller/ApiController.java

@@ -1,6 +1,11 @@
package com.moral.monitor.controller;



import java.sql.Connection;

import java.sql.DriverManager;

import java.sql.SQLException;

import java.sql.Statement;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -59,8 +64,8 @@
                             @RequestParam(value ="longitude")  String longitude,

                             @RequestParam(value ="latitude")  String latitude,

                             @RequestParam(value ="mac")  String mac,

                             @RequestParam(value ="mpointId")  String monitorpoint,

                             @RequestParam(value ="orgId")  String ownerId

                             @RequestParam(value ="monitorpoint")  String monitorpoint,

                             @RequestParam(value ="ownerId")  String ownerId

                             ){

        //插入或更新设备表信息

        ApiData apiData = new ApiData();

@@ -81,6 +86,8 @@
       equipment.setMac(mac);

       equipment.setMonitorpoint(monitorpoint);

       equipment.setOwnerId(ownerId);

       //添加时间

       equipment.setTime(new Date());

          EquipmentExample example = new EquipmentExample();

          example.or().andMacEqualTo(mac);

          long count = equipmentService.queryCountByExample(example);

@@ -96,11 +103,38 @@
            equipmentService.updateByMac(equipment);

            apiData.setMessage("更新设备成功");

            apiData.setErrno(0);



            /////////////////////////////////////////////////////////

            // 更新 - 新版本后台数据库

            updateLocation(device_name, address, mac, longitude, latitude);

            /////////////////////////////////////////////////////////

        }

        return apiData;

    }





    public void updateLocation(String device, String address, String mac, String lng, String lat) {

        Connection conn = null;

        String sql;

        String url = "jdbc:mysql://47.96.19.115:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC&user=root&password=xOlx8z9L7Pt6y9YI";

        try {

            Class.forName("com.mysql.jdbc.Driver");

            conn = DriverManager.getConnection(url);

            Statement stmt = conn.createStatement();

            sql = "UPDATE device SET `name`='" + device + "', address='" + address + "', longitude='" + lng + "', latitude='" + lat + "' WHERE mac='" + mac + "'";

            int result = stmt.executeUpdate(sql);

            System.out.println("Update the location of the equipment: " + result);

        } catch (SQLException e) {

            e.printStackTrace();

        } catch (Exception e) {

            e.printStackTrace();

        } finally {

            try {

                conn.close();

            } catch (SQLException e) {

                e.printStackTrace();

            }

        }

    }



    //1登录

    @RequestMapping(value = "accountlogin")

@@ -524,20 +558,20 @@
       try {

           if(!StringUtils.isEmpty(areaName)) {

              MonitorPointExample example =   new MonitorPointExample();

              example.or().andTbAreaNameEqualTo(areaName);

//              example.or().andTbAreaNameEqualTo(areaName);

              List<MonitorPoint> list = monitorpointService.queryListByExample(example);

              if(list!=null&&list.size()>0) {

                 apiData.setErrno(0);

                 apiData.setMessage("根据areaName获取数据成功");

                 apiData.setMessage("根据县级市(或行政区)名称获取数据成功");

                 apiData.setData(JSON.toJSONString(list));

              }else {

                 apiData.setErrno(0);

                 apiData.setMessage("根据areaName未获取到数据");

                 apiData.setMessage("该县级市(或行政区)未设置检测点");

                 apiData.setData(null);

              }

           }else {

             apiData.setErrno(0);

             apiData.setMessage("areaName不能为空");

             apiData.setMessage("县级市(或行政区)名称不能为空");

             apiData.setData(null);

           }

      } catch (Exception e) {

@@ -556,20 +590,20 @@
       try {

           if(!StringUtils.isEmpty(areaName)) {

              OrganizationExample example =   new OrganizationExample();

              example.or().andTbAreaNameEqualTo(areaName);

              example.or().andTbAreaNameEqualTo(areaName).andEnableEqualTo(1);

              List<Organization> list = organizationService.queryListByExample(example);

              if(list!=null&&list.size()>0) {

                 apiData.setErrno(0);

                 apiData.setMessage("根据areaName获取数据成功");

                 apiData.setMessage("该县级市(或行政区)名称获取数据成功");

                 apiData.setData(JSON.toJSONString(list));

              }else {

                 apiData.setErrno(0);

                 apiData.setMessage("根据areaName未获取到数据");

                 apiData.setMessage("该县级市(或行政区)未设置组织机构");

                 apiData.setData(null);

              }

           }else {

             apiData.setErrno(0);

             apiData.setMessage("areaName不能为空");

             apiData.setMessage("县级市(或行政区)名称不能为空");

             apiData.setData(null);

           }

      } catch (Exception e) {