From 57c6426cc8273656214738b3aef2f09995dc3c4b Mon Sep 17 00:00:00 2001
From: insanity <insanity@loafle.com>
Date: Thu, 28 Jun 2018 15:40:01 +0900
Subject: [PATCH] SensorService

---
 pom.xml                                       |  2 +-
 .../service/central/sensor/SensorService.java | 29 +++++--------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index aedfae0..52cba03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.loafle.overflow</groupId>
     <artifactId>commons-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.103-SNAPSHOT</version>
+    <version>1.0.104-SNAPSHOT</version>
     <name>com.loafle.overflow.commons-java</name>
 
     <properties>
diff --git a/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java b/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java
index 04d9025..99d0b22 100644
--- a/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java
+++ b/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java
@@ -2,10 +2,9 @@ package com.loafle.overflow.service.central.sensor;
 
 import com.loafle.overflow.core.annotation.WebappAPI;
 import com.loafle.overflow.core.exception.OverflowException;
-import com.loafle.overflow.core.model.PageParams;
+import com.loafle.overflow.model.meta.MetaDisplayItemMapping;
 import com.loafle.overflow.model.sensor.Sensor;
-import com.loafle.overflow.model.sensor.SensorItem;
-import org.springframework.data.domain.Page;
+import com.loafle.overflow.model.sensorconfig.Target;
 
 import java.util.List;
 
@@ -14,35 +13,23 @@ import java.util.List;
  */
 public interface SensorService {
   @WebappAPI
-  Sensor regist(Sensor sensor, Long targetID) throws OverflowException;
+  Sensor regist(Sensor sensor, List<MetaDisplayItemMapping> metaDisplayItemMappings) throws OverflowException;
 
   @WebappAPI
   Sensor read(Long id) throws OverflowException;
 
   @WebappAPI
-  void remove(Long id, Long targetID) throws OverflowException;
+  void remove(Long id) throws OverflowException;
 
   @WebappAPI
-  Page<Sensor> readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException;
+  List<Sensor> readAll() throws OverflowException;
 
   @WebappAPI
-  Page<Sensor> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException;
+  List<Sensor> readAllByTargetID(Long targetID) throws OverflowException;
 
   @WebappAPI
-  Page<Sensor> readAllByInfraID(Long infraID, PageParams pageParams) throws OverflowException;
+  List<Sensor> readAllByTargetIn(List<Target> targets) throws OverflowException;
 
   @WebappAPI
-  Page<Sensor> readAllByTargetID(Long targetID, PageParams pageParams) throws OverflowException;
-
-  Sensor increaseSensorItemCount(Long id) throws OverflowException;
-  
-  Sensor decreaseSensorItemCount(Long id) throws OverflowException;
-
-
-  @WebappAPI
-  Sensor registSensorConfig(Sensor sensor, List<SensorItem> sensorItemList, String etcJson) throws OverflowException;
-
-  @WebappAPI
-  String generateSensorConfig(Sensor sensor) throws OverflowException;
-
+  List<Sensor> readAllByTargetInfraProbeID(Long probeID) throws OverflowException;
 }