test

沈斌

2017-11-07 f0aa3d758d72891edb08f8e3ac14ffcd95fbb30c

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

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



import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -81,6 +82,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);

@@ -528,16 +531,16 @@
              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 +559,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) {