设备时间更新。组织删除过滤

fengxiang

2017-10-31 81c8f5d05b7d7ca94db552de4d07d0e6491f51b0

设备时间更新。组织删除过滤

 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);

@@ -556,7 +559,7 @@
        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);