From ed413ae5e0eeb9ff4b7d8b2274d70e3e1d149278 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 01 Nov 2017 11:43:08 +0800
Subject: [PATCH] 暂停保存数据
---
src/main/java/com/moral/monitor/controller/ApiController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index e551a79..036f436 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/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;
@@ -59,8 +60,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 +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);
--
Gitblit v1.8.0