diff --git a/package/irext-decode-service-1.0.0.jar b/package/irext-decode-service-1.0.0.jar deleted file mode 100644 index 912b148..0000000 Binary files a/package/irext-decode-service-1.0.0.jar and /dev/null differ diff --git a/src/main/java/net/irext/decodesdk/IRDecode.java b/src/main/java/net/irext/decode/sdk/IRDecode.java similarity index 95% rename from src/main/java/net/irext/decodesdk/IRDecode.java rename to src/main/java/net/irext/decode/sdk/IRDecode.java index 9df7fe6..be4f794 100644 --- a/src/main/java/net/irext/decodesdk/IRDecode.java +++ b/src/main/java/net/irext/decode/sdk/IRDecode.java @@ -1,8 +1,8 @@ -package net.irext.decodesdk; +package net.irext.decode.sdk; -import net.irext.decodesdk.bean.ACStatus; -import net.irext.decodesdk.bean.TemperatureRange; -import net.irext.decodesdk.utils.Constants; +import net.irext.decode.sdk.bean.ACStatus; +import net.irext.decode.sdk.bean.TemperatureRange; +import net.irext.decode.sdk.utils.Constants; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.ServletContext; diff --git a/src/main/java/net/irext/decodesdk/bean/ACStatus.java b/src/main/java/net/irext/decode/sdk/bean/ACStatus.java similarity index 96% rename from src/main/java/net/irext/decodesdk/bean/ACStatus.java rename to src/main/java/net/irext/decode/sdk/bean/ACStatus.java index 076fe5d..9756e59 100644 --- a/src/main/java/net/irext/decodesdk/bean/ACStatus.java +++ b/src/main/java/net/irext/decode/sdk/bean/ACStatus.java @@ -1,6 +1,6 @@ -package net.irext.decodesdk.bean; +package net.irext.decode.sdk.bean; -import net.irext.decodesdk.utils.Constants; +import net.irext.decode.sdk.utils.Constants; /** * Filename: ACStatus.java diff --git a/src/main/java/net/irext/decodesdk/bean/TemperatureRange.java b/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java similarity index 96% rename from src/main/java/net/irext/decodesdk/bean/TemperatureRange.java rename to src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java index 00dd70a..d7a848a 100644 --- a/src/main/java/net/irext/decodesdk/bean/TemperatureRange.java +++ b/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java @@ -1,4 +1,4 @@ -package net.irext.decodesdk.bean; +package net.irext.decode.sdk.bean; /** * Filename: TemperatureRange.java diff --git a/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so b/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so new file mode 100755 index 0000000..52936f9 Binary files /dev/null and b/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so differ diff --git a/src/main/java/net/irext/decodesdk/utils/Constants.java b/src/main/java/net/irext/decode/sdk/utils/Constants.java similarity index 96% rename from src/main/java/net/irext/decodesdk/utils/Constants.java rename to src/main/java/net/irext/decode/sdk/utils/Constants.java index 4650c1a..a0ec40b 100644 --- a/src/main/java/net/irext/decodesdk/utils/Constants.java +++ b/src/main/java/net/irext/decode/sdk/utils/Constants.java @@ -1,4 +1,4 @@ -package net.irext.decodesdk.utils; +package net.irext.decode.sdk.utils; /** * Filename: Constants.java @@ -19,6 +19,8 @@ public class Constants { public static final int ERROR_CODE_INVALID_CATEGORY = 2; public static final int ERROR_CODE_INVALID_BRAND = 3; public static final int ERROR_CODE_INVALID_PARAMETER = 4; + public static final int ERROR_CODE_INVALID_CITY = 5; + public static final int ERROR_CODE_INVALID_OPERATOR = 6; public static final int ERROR_CODE_INVALID_SESSION = 20; diff --git a/src/main/java/net/irext/decoder/Constants.java b/src/main/java/net/irext/decode/service/Constants.java similarity index 99% rename from src/main/java/net/irext/decoder/Constants.java rename to src/main/java/net/irext/decode/service/Constants.java index 276ed1d..afcb297 100644 --- a/src/main/java/net/irext/decoder/Constants.java +++ b/src/main/java/net/irext/decode/service/Constants.java @@ -1,4 +1,4 @@ -package net.irext.decoder; +package net.irext.decode.service; /** * Filename: Constants.java diff --git a/src/main/java/net/irext/decoder/IRDecoderApplication.java b/src/main/java/net/irext/decode/service/IRDecoderApplication.java similarity index 89% rename from src/main/java/net/irext/decoder/IRDecoderApplication.java rename to src/main/java/net/irext/decode/service/IRDecoderApplication.java index bd9ec28..2552f7a 100644 --- a/src/main/java/net/irext/decoder/IRDecoderApplication.java +++ b/src/main/java/net/irext/decode/service/IRDecoderApplication.java @@ -1,6 +1,6 @@ -package net.irext.decoder; +package net.irext.decode.service; -import net.irext.decoder.model.RemoteIndex; +import net.irext.decode.service.model.RemoteIndex; import org.apache.ibatis.type.MappedTypes; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/net/irext/decoder/RedisConfig.java b/src/main/java/net/irext/decode/service/RedisConfig.java similarity index 90% rename from src/main/java/net/irext/decoder/RedisConfig.java rename to src/main/java/net/irext/decode/service/RedisConfig.java index 0e1dbc5..6f35546 100644 --- a/src/main/java/net/irext/decoder/RedisConfig.java +++ b/src/main/java/net/irext/decode/service/RedisConfig.java @@ -1,8 +1,8 @@ -package net.irext.decoder; +package net.irext.decode.service; -import net.irext.decoder.queue.MessagePublisher; -import net.irext.decoder.queue.MessagePublisherImpl; -import net.irext.decoder.queue.MessageSubscriber; +import net.irext.decode.service.queue.MessagePublisher; +import net.irext.decode.service.queue.MessagePublisherImpl; +import net.irext.decode.service.queue.MessageSubscriber; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/net/irext/decoder/alioss/OSSHelper.java b/src/main/java/net/irext/decode/service/alioss/OSSHelper.java similarity index 98% rename from src/main/java/net/irext/decoder/alioss/OSSHelper.java rename to src/main/java/net/irext/decode/service/alioss/OSSHelper.java index a5c9a16..b013edc 100644 --- a/src/main/java/net/irext/decoder/alioss/OSSHelper.java +++ b/src/main/java/net/irext/decode/service/alioss/OSSHelper.java @@ -1,4 +1,4 @@ -package net.irext.decoder.alioss; +package net.irext.decode.service.alioss; import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.Bucket; diff --git a/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java b/src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java similarity index 92% rename from src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java rename to src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java index a40f9b7..a0e8336 100644 --- a/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java +++ b/src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java @@ -1,14 +1,14 @@ -package net.irext.decoder.businesslogic; +package net.irext.decode.service.businesslogic; -import net.irext.decoder.alioss.OSSHelper; -import net.irext.decoder.cache.IDecodeSessionRepository; -import net.irext.decoder.cache.IIRBinaryRepository; -import net.irext.decoder.model.RemoteIndex; -import net.irext.decoder.utils.FileUtil; -import net.irext.decoder.utils.LoggerUtil; -import net.irext.decoder.utils.MD5Util; -import net.irext.decodesdk.IRDecode; -import net.irext.decodesdk.bean.ACStatus; +import net.irext.decode.service.alioss.OSSHelper; +import net.irext.decode.service.cache.IDecodeSessionRepository; +import net.irext.decode.service.cache.IIRBinaryRepository; +import net.irext.decode.service.model.RemoteIndex; +import net.irext.decode.service.utils.FileUtil; +import net.irext.decode.service.utils.LoggerUtil; +import net.irext.decode.service.utils.MD5Util; +import net.irext.decode.sdk.IRDecode; +import net.irext.decode.sdk.bean.ACStatus; import org.apache.commons.io.IOUtils; import javax.servlet.ServletContext; diff --git a/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java b/src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java similarity index 87% rename from src/main/java/net/irext/decoder/businesslogic/IndexLogic.java rename to src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java index b0afd2f..8e15e9f 100644 --- a/src/main/java/net/irext/decoder/businesslogic/IndexLogic.java +++ b/src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java @@ -1,7 +1,7 @@ -package net.irext.decoder.businesslogic; +package net.irext.decode.service.businesslogic; -import net.irext.decoder.mapper.RemoteIndexMapper; -import net.irext.decoder.model.RemoteIndex; +import net.irext.decode.service.mapper.RemoteIndexMapper; +import net.irext.decode.service.model.RemoteIndex; import org.springframework.stereotype.Controller; import java.util.List; diff --git a/src/main/java/net/irext/decoder/cache/IDecodeSessionRepository.java b/src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java similarity index 92% rename from src/main/java/net/irext/decoder/cache/IDecodeSessionRepository.java rename to src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java index 5820541..93f68b5 100644 --- a/src/main/java/net/irext/decoder/cache/IDecodeSessionRepository.java +++ b/src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java @@ -1,4 +1,4 @@ -package net.irext.decoder.cache; +package net.irext.decode.service.cache; import java.util.Map; diff --git a/src/main/java/net/irext/decoder/cache/IIRBinaryRepository.java b/src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java similarity index 84% rename from src/main/java/net/irext/decoder/cache/IIRBinaryRepository.java rename to src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java index abffd0b..4ff28ad 100644 --- a/src/main/java/net/irext/decoder/cache/IIRBinaryRepository.java +++ b/src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java @@ -1,6 +1,6 @@ -package net.irext.decoder.cache; +package net.irext.decode.service.cache; -import net.irext.decoder.model.RemoteIndex; +import net.irext.decode.service.model.RemoteIndex; import java.util.Map; diff --git a/src/main/java/net/irext/decoder/cache/impl/DecodeSessionRepositoryImpl.java b/src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java similarity index 93% rename from src/main/java/net/irext/decoder/cache/impl/DecodeSessionRepositoryImpl.java rename to src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java index a538bfe..25a1921 100644 --- a/src/main/java/net/irext/decoder/cache/impl/DecodeSessionRepositoryImpl.java +++ b/src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java @@ -1,6 +1,6 @@ -package net.irext.decoder.cache.impl; +package net.irext.decode.service.cache.impl; -import net.irext.decoder.cache.IDecodeSessionRepository; +import net.irext.decode.service.cache.IDecodeSessionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decoder/cache/impl/IRBinaryRepositoryImpl.java b/src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java similarity index 90% rename from src/main/java/net/irext/decoder/cache/impl/IRBinaryRepositoryImpl.java rename to src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java index 3820a61..19964ca 100644 --- a/src/main/java/net/irext/decoder/cache/impl/IRBinaryRepositoryImpl.java +++ b/src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java @@ -1,7 +1,7 @@ -package net.irext.decoder.cache.impl; +package net.irext.decode.service.cache.impl; -import net.irext.decoder.cache.IIRBinaryRepository; -import net.irext.decoder.model.RemoteIndex; +import net.irext.decode.service.cache.IIRBinaryRepository; +import net.irext.decode.service.model.RemoteIndex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java b/src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java similarity index 86% rename from src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java rename to src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java index a5c429c..56750c2 100644 --- a/src/main/java/net/irext/decoder/mapper/RemoteIndexMapper.java +++ b/src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java @@ -1,6 +1,6 @@ -package net.irext.decoder.mapper; +package net.irext.decode.service.mapper; -import net.irext.decoder.model.RemoteIndex; +import net.irext.decode.service.model.RemoteIndex; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/net/irext/decoder/model/DecodeSession.java b/src/main/java/net/irext/decode/service/model/DecodeSession.java similarity index 95% rename from src/main/java/net/irext/decoder/model/DecodeSession.java rename to src/main/java/net/irext/decode/service/model/DecodeSession.java index a060038..0540b5a 100644 --- a/src/main/java/net/irext/decoder/model/DecodeSession.java +++ b/src/main/java/net/irext/decode/service/model/DecodeSession.java @@ -1,4 +1,4 @@ -package net.irext.decoder.model; +package net.irext.decode.service.model; /** * Filename: DecodeSession.java diff --git a/src/main/java/net/irext/decoder/model/IRBinary.java b/src/main/java/net/irext/decode/service/model/IRBinary.java similarity index 94% rename from src/main/java/net/irext/decoder/model/IRBinary.java rename to src/main/java/net/irext/decode/service/model/IRBinary.java index 277596e..6aabe66 100644 --- a/src/main/java/net/irext/decoder/model/IRBinary.java +++ b/src/main/java/net/irext/decode/service/model/IRBinary.java @@ -1,4 +1,4 @@ -package net.irext.decoder.model; +package net.irext.decode.service.model; /** * Filename: IRBinary.java diff --git a/src/main/java/net/irext/decoder/model/RemoteIndex.java b/src/main/java/net/irext/decode/service/model/RemoteIndex.java similarity index 99% rename from src/main/java/net/irext/decoder/model/RemoteIndex.java rename to src/main/java/net/irext/decode/service/model/RemoteIndex.java index 97797f3..a655c39 100644 --- a/src/main/java/net/irext/decoder/model/RemoteIndex.java +++ b/src/main/java/net/irext/decode/service/model/RemoteIndex.java @@ -1,4 +1,4 @@ -package net.irext.decoder.model; +package net.irext.decode.service.model; import java.io.Serializable; diff --git a/src/main/java/net/irext/decoder/queue/MessagePublisher.java b/src/main/java/net/irext/decode/service/queue/MessagePublisher.java similarity index 88% rename from src/main/java/net/irext/decoder/queue/MessagePublisher.java rename to src/main/java/net/irext/decode/service/queue/MessagePublisher.java index 6fd9210..ce06f08 100644 --- a/src/main/java/net/irext/decoder/queue/MessagePublisher.java +++ b/src/main/java/net/irext/decode/service/queue/MessagePublisher.java @@ -1,4 +1,4 @@ -package net.irext.decoder.queue; +package net.irext.decode.service.queue; /** * Filename: MessagePublisher.java diff --git a/src/main/java/net/irext/decoder/queue/MessagePublisherImpl.java b/src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java similarity index 96% rename from src/main/java/net/irext/decoder/queue/MessagePublisherImpl.java rename to src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java index 61757af..c1df8c5 100644 --- a/src/main/java/net/irext/decoder/queue/MessagePublisherImpl.java +++ b/src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java @@ -1,4 +1,4 @@ -package net.irext.decoder.queue; +package net.irext.decode.service.queue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decoder/queue/MessageSubscriber.java b/src/main/java/net/irext/decode/service/queue/MessageSubscriber.java similarity index 95% rename from src/main/java/net/irext/decoder/queue/MessageSubscriber.java rename to src/main/java/net/irext/decode/service/queue/MessageSubscriber.java index 471b5fe..ecdce73 100644 --- a/src/main/java/net/irext/decoder/queue/MessageSubscriber.java +++ b/src/main/java/net/irext/decode/service/queue/MessageSubscriber.java @@ -1,4 +1,4 @@ -package net.irext.decoder.queue; +package net.irext.decode.service.queue; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/src/main/java/net/irext/decoder/request/CloseRequest.java b/src/main/java/net/irext/decode/service/request/CloseRequest.java similarity index 93% rename from src/main/java/net/irext/decoder/request/CloseRequest.java rename to src/main/java/net/irext/decode/service/request/CloseRequest.java index 3a718ac..9839fbe 100644 --- a/src/main/java/net/irext/decoder/request/CloseRequest.java +++ b/src/main/java/net/irext/decode/service/request/CloseRequest.java @@ -1,4 +1,4 @@ -package net.irext.decoder.request; +package net.irext.decode.service.request; /** * Filename: CloseRequest.java diff --git a/src/main/java/net/irext/decoder/request/DecodeRequest.java b/src/main/java/net/irext/decode/service/request/DecodeRequest.java similarity index 73% rename from src/main/java/net/irext/decoder/request/DecodeRequest.java rename to src/main/java/net/irext/decode/service/request/DecodeRequest.java index 9c3eb4f..38a0c37 100644 --- a/src/main/java/net/irext/decoder/request/DecodeRequest.java +++ b/src/main/java/net/irext/decode/service/request/DecodeRequest.java @@ -1,6 +1,6 @@ -package net.irext.decoder.request; +package net.irext.decode.service.request; -import net.irext.decodesdk.bean.ACStatus; +import net.irext.decode.sdk.bean.ACStatus; /** * Filename: DecodeRequest.java @@ -14,14 +14,14 @@ import net.irext.decodesdk.bean.ACStatus; */ public class DecodeRequest { - private int indexId; + private int remoteIndexId; private ACStatus acStatus; private int keyCode; private int changeWindDir; private String sessionId; - public DecodeRequest(int indexId, ACStatus acStatus, int keyCode, int changeWindDir) { - this.indexId = indexId; + public DecodeRequest(int remoteIndexId, ACStatus acStatus, int keyCode, int changeWindDir) { + this.remoteIndexId = remoteIndexId; this.acStatus = acStatus; this.keyCode = keyCode; this.changeWindDir = changeWindDir; @@ -31,12 +31,12 @@ public class DecodeRequest { } - public int getIndexId() { - return indexId; + public int getRemoteIndexId() { + return remoteIndexId; } - public void setIndexId(int indexId) { - this.indexId = indexId; + public void setRemoteIndexId(int remoteIndexId) { + this.remoteIndexId = remoteIndexId; } public ACStatus getAcStatus() { diff --git a/src/main/java/net/irext/decoder/request/OpenRequest.java b/src/main/java/net/irext/decode/service/request/OpenRequest.java similarity index 93% rename from src/main/java/net/irext/decoder/request/OpenRequest.java rename to src/main/java/net/irext/decode/service/request/OpenRequest.java index 9eb4d0d..b4339eb 100644 --- a/src/main/java/net/irext/decoder/request/OpenRequest.java +++ b/src/main/java/net/irext/decode/service/request/OpenRequest.java @@ -1,4 +1,4 @@ -package net.irext.decoder.request; +package net.irext.decode.service.request; /** * Filename: OpenRequest.java diff --git a/src/main/java/net/irext/decoder/response/DecodeResponse.java b/src/main/java/net/irext/decode/service/response/DecodeResponse.java similarity index 93% rename from src/main/java/net/irext/decoder/response/DecodeResponse.java rename to src/main/java/net/irext/decode/service/response/DecodeResponse.java index a0bcb4e..10a4be5 100644 --- a/src/main/java/net/irext/decoder/response/DecodeResponse.java +++ b/src/main/java/net/irext/decode/service/response/DecodeResponse.java @@ -1,4 +1,4 @@ -package net.irext.decoder.response; +package net.irext.decode.service.response; /** * Filename: DecodeResponse.java diff --git a/src/main/java/net/irext/decoder/response/ServiceResponse.java b/src/main/java/net/irext/decode/service/response/ServiceResponse.java similarity index 92% rename from src/main/java/net/irext/decoder/response/ServiceResponse.java rename to src/main/java/net/irext/decode/service/response/ServiceResponse.java index f05c80b..5d41ae6 100644 --- a/src/main/java/net/irext/decoder/response/ServiceResponse.java +++ b/src/main/java/net/irext/decode/service/response/ServiceResponse.java @@ -1,4 +1,4 @@ -package net.irext.decoder.response; +package net.irext.decode.service.response; /** * Filename: ServiceResponse.java diff --git a/src/main/java/net/irext/decoder/response/Status.java b/src/main/java/net/irext/decode/service/response/Status.java similarity index 89% rename from src/main/java/net/irext/decoder/response/Status.java rename to src/main/java/net/irext/decode/service/response/Status.java index 37d0c63..0fe4ce5 100644 --- a/src/main/java/net/irext/decoder/response/Status.java +++ b/src/main/java/net/irext/decode/service/response/Status.java @@ -1,6 +1,6 @@ -package net.irext.decoder.response; +package net.irext.decode.service.response; -import net.irext.decoder.Constants; +import net.irext.decode.service.Constants; /** * Filename: Status.java diff --git a/src/main/java/net/irext/decoder/response/StringResponse.java b/src/main/java/net/irext/decode/service/response/StringResponse.java similarity index 93% rename from src/main/java/net/irext/decoder/response/StringResponse.java rename to src/main/java/net/irext/decode/service/response/StringResponse.java index e9720c0..662d9b8 100644 --- a/src/main/java/net/irext/decoder/response/StringResponse.java +++ b/src/main/java/net/irext/decode/service/response/StringResponse.java @@ -1,4 +1,4 @@ -package net.irext.decoder.response; +package net.irext.decode.service.response; /** * Filename: StringResponse.java diff --git a/src/main/java/net/irext/decoder/service/IRDecodeService.java b/src/main/java/net/irext/decode/service/service/IRDecodeService.java similarity index 85% rename from src/main/java/net/irext/decoder/service/IRDecodeService.java rename to src/main/java/net/irext/decode/service/service/IRDecodeService.java index 6911f30..d6c596c 100644 --- a/src/main/java/net/irext/decoder/service/IRDecodeService.java +++ b/src/main/java/net/irext/decode/service/service/IRDecodeService.java @@ -1,24 +1,24 @@ -package net.irext.decoder.service; +package net.irext.decode.service.service; -import net.irext.decoder.businesslogic.DecodeLogic; -import net.irext.decoder.businesslogic.IndexLogic; -import net.irext.decoder.cache.IDecodeSessionRepository; -import net.irext.decoder.cache.IIRBinaryRepository; -import net.irext.decoder.mapper.RemoteIndexMapper; -import net.irext.decoder.model.DecodeSession; -import net.irext.decoder.model.RemoteIndex; -import net.irext.decoder.request.CloseRequest; -import net.irext.decoder.request.DecodeRequest; -import net.irext.decoder.request.OpenRequest; -import net.irext.decoder.response.DecodeResponse; -import net.irext.decoder.response.ServiceResponse; -import net.irext.decoder.response.Status; -import net.irext.decoder.response.StringResponse; -import net.irext.decoder.service.base.AbstractBaseService; -import net.irext.decoder.utils.LoggerUtil; -import net.irext.decoder.utils.MD5Util; -import net.irext.decodesdk.bean.ACStatus; -import net.irext.decodesdk.utils.Constants; +import net.irext.decode.service.businesslogic.DecodeLogic; +import net.irext.decode.service.cache.IDecodeSessionRepository; +import net.irext.decode.service.cache.IIRBinaryRepository; +import net.irext.decode.service.mapper.RemoteIndexMapper; +import net.irext.decode.service.model.DecodeSession; +import net.irext.decode.service.model.RemoteIndex; +import net.irext.decode.service.request.CloseRequest; +import net.irext.decode.service.request.DecodeRequest; +import net.irext.decode.service.request.OpenRequest; +import net.irext.decode.service.utils.LoggerUtil; +import net.irext.decode.service.utils.MD5Util; +import net.irext.decode.service.businesslogic.IndexLogic; +import net.irext.decode.service.response.DecodeResponse; +import net.irext.decode.service.response.ServiceResponse; +import net.irext.decode.service.response.Status; +import net.irext.decode.service.response.StringResponse; +import net.irext.decode.service.service.base.AbstractBaseService; +import net.irext.decode.sdk.bean.ACStatus; +import net.irext.decode.sdk.utils.Constants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PostMapping; @@ -108,7 +108,7 @@ public class IRDecodeService extends AbstractBaseService { @PostMapping("/decode") public DecodeResponse irDecode(@RequestBody DecodeRequest decodeRequest) { try { - int indexId = decodeRequest.getIndexId(); + int indexId = decodeRequest.getRemoteIndexId(); ACStatus acStatus = decodeRequest.getAcStatus(); int keyCode = decodeRequest.getKeyCode(); int changeWindDir = decodeRequest.getChangeWindDir(); diff --git a/src/main/java/net/irext/decoder/service/base/AbstractBaseService.java b/src/main/java/net/irext/decode/service/service/base/AbstractBaseService.java similarity index 86% rename from src/main/java/net/irext/decoder/service/base/AbstractBaseService.java rename to src/main/java/net/irext/decode/service/service/base/AbstractBaseService.java index ea7f037..f594109 100644 --- a/src/main/java/net/irext/decoder/service/base/AbstractBaseService.java +++ b/src/main/java/net/irext/decode/service/service/base/AbstractBaseService.java @@ -1,8 +1,8 @@ -package net.irext.decoder.service.base; +package net.irext.decode.service.service.base; -import net.irext.decoder.Constants; -import net.irext.decoder.response.ServiceResponse; -import net.irext.decoder.response.Status; +import net.irext.decode.service.Constants; +import net.irext.decode.service.response.ServiceResponse; +import net.irext.decode.service.response.Status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/net/irext/decoder/utils/FileUtil.java b/src/main/java/net/irext/decode/service/utils/FileUtil.java similarity index 98% rename from src/main/java/net/irext/decoder/utils/FileUtil.java rename to src/main/java/net/irext/decode/service/utils/FileUtil.java index 2859b07..5354da7 100644 --- a/src/main/java/net/irext/decoder/utils/FileUtil.java +++ b/src/main/java/net/irext/decode/service/utils/FileUtil.java @@ -1,4 +1,4 @@ -package net.irext.decoder.utils; +package net.irext.decode.service.utils; import java.io.*; diff --git a/src/main/java/net/irext/decoder/utils/LoggerUtil.java b/src/main/java/net/irext/decode/service/utils/LoggerUtil.java similarity index 95% rename from src/main/java/net/irext/decoder/utils/LoggerUtil.java rename to src/main/java/net/irext/decode/service/utils/LoggerUtil.java index b0a3644..28aea64 100644 --- a/src/main/java/net/irext/decoder/utils/LoggerUtil.java +++ b/src/main/java/net/irext/decode/service/utils/LoggerUtil.java @@ -1,4 +1,4 @@ -package net.irext.decoder.utils; +package net.irext.decode.service.utils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/irext/decoder/utils/MD5Util.java b/src/main/java/net/irext/decode/service/utils/MD5Util.java similarity index 97% rename from src/main/java/net/irext/decoder/utils/MD5Util.java rename to src/main/java/net/irext/decode/service/utils/MD5Util.java index c79acf0..a2ecb88 100644 --- a/src/main/java/net/irext/decoder/utils/MD5Util.java +++ b/src/main/java/net/irext/decode/service/utils/MD5Util.java @@ -1,4 +1,4 @@ -package net.irext.decoder.utils; +package net.irext.decode.service.utils; import java.security.MessageDigest; diff --git a/src/main/java/net/irext/decodesdk/libs/libirda_decoder.so b/src/main/java/net/irext/decodesdk/libs/libirda_decoder.so deleted file mode 100644 index 5215a19..0000000 Binary files a/src/main/java/net/irext/decodesdk/libs/libirda_decoder.so and /dev/null differ diff --git a/src/main/resources/net/irext/decoder/mapper/RemoteIndexMapper.xml b/src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml similarity index 92% rename from src/main/resources/net/irext/decoder/mapper/RemoteIndexMapper.xml rename to src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml index 8d50f1f..fef5e82 100644 --- a/src/main/resources/net/irext/decoder/mapper/RemoteIndexMapper.xml +++ b/src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml @@ -1,7 +1,7 @@ - - + +