diff --git a/src/main/java/net/irext/decoder/IRDecoderApplication.java b/src/main/java/net/irext/decoder/IRDecoderApplication.java
index 559e64c..8967ec3 100644
--- a/src/main/java/net/irext/decoder/IRDecoderApplication.java
+++ b/src/main/java/net/irext/decoder/IRDecoderApplication.java
@@ -1,5 +1,6 @@
package net.irext.decoder;
+import net.irext.decoder.model.RemoteIndex;
import org.apache.ibatis.type.MappedTypes;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
@@ -16,7 +17,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 2018-12-08: created by strawmanbobi
*/
-@MapperScan("net.irext.decoder.mybatis.springbootmybatis.mapper")
+@MappedTypes(RemoteIndex.class)
+@MapperScan("net.irext.decoder.mapper")
@SpringBootApplication
public class IRDecoderApplication {
diff --git a/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java b/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java
index d9cec27..3f66b60 100644
--- a/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java
+++ b/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java
@@ -1,5 +1,6 @@
package net.irext.decoder.businesslogic;
+import net.irext.decoder.mapper.RemoteIndexMapper;
import net.irext.decoder.model.RemoteIndex;
import org.springframework.stereotype.Controller;
@@ -18,14 +19,20 @@ public class IndexLogic {
private static IndexLogic indexLogic;
- public static IndexLogic getInstance() {
+ private RemoteIndexMapper remoteIndexMapper;
+
+ public static IndexLogic getInstance(RemoteIndexMapper remoteIndexMapper) {
if (null == indexLogic) {
- indexLogic = new IndexLogic();
+ indexLogic = new IndexLogic(remoteIndexMapper);
}
return indexLogic;
}
+ public IndexLogic(RemoteIndexMapper remoteIndexMapper) {
+ this.remoteIndexMapper = remoteIndexMapper;
+ }
+
public RemoteIndex getRemoteIndex(int indexId) {
- return null;
+ return remoteIndexMapper.getRemoteIndexById(indexId);
}
}
diff --git a/src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java b/src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java
new file mode 100644
index 0000000..4ed58d7
--- /dev/null
+++ b/src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java
@@ -0,0 +1,22 @@
+package net.irext.decoder.mapper;
+
+import net.irext.decoder.model.RemoteIndex;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * Filename: RemoteIndexMapper.java
+ * Revised: Date: 2018-12-08
+ * Revision: Revision: 1.0
+ *
+ * Description: CollectRemote Mybatis Mapper
+ *
+ * Revision log:
+ * 2018-12-08: created by strawmanbobi
+ */
+@Mapper
+public interface RemoteIndexMapper {
+
+ @Select("SELECT * FROM remote_index WHERE id = #{id}")
+ RemoteIndex getRemoteIndexById(int id);
+}
diff --git a/src/main/java/net/irext/decoder/service/IRDecodeService.java b/src/main/java/net/irext/decoder/service/IRDecodeService.java
index 4a168f9..a79e687 100644
--- a/src/main/java/net/irext/decoder/service/IRDecodeService.java
+++ b/src/main/java/net/irext/decoder/service/IRDecodeService.java
@@ -2,6 +2,7 @@ package net.irext.decoder.service;
import net.irext.decoder.businesslogic.DecodeLogic;
import net.irext.decoder.businesslogic.IndexLogic;
+import net.irext.decoder.mapper.RemoteIndexMapper;
import net.irext.decoder.model.RemoteIndex;
import net.irext.decoder.request.CloseRequest;
import net.irext.decoder.request.DecodeRequest;
@@ -28,8 +29,10 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/irext")
public class IRDecodeService extends AbstractBaseService {
- public IRDecodeService() {
+ private RemoteIndexMapper remoteIndexMapper;
+ public IRDecodeService(RemoteIndexMapper remoteIndexMapper) {
+ this.remoteIndexMapper = remoteIndexMapper;
}
@PostMapping("/open")
@@ -38,7 +41,7 @@ public class IRDecodeService extends AbstractBaseService {
int indexId = openRequest.getIndexId();
ServiceResponse response = new ServiceResponse();
- RemoteIndex index = IndexLogic.getInstance().getRemoteIndex(indexId);
+ RemoteIndex index = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(indexId);
if (null == index) {
response.setStatus(new Status(Constants.ERROR_CODE_NETWORK_ERROR, ""));
return response;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index eaa4811..11b9cc7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,8 @@
server.port=8082
spring.redis.host=localhost
-spring.redis.port=6379
\ No newline at end of file
+spring.redis.port=6379
+
+spring.datasource.url=jdbc:mysql://localhost:3306/irext
+spring.datasource.username=root
+spring.datasource.password=root
\ No newline at end of file