updated java package names

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.decode.sdk.bean.ACStatus;
-import net.irext.decodesdk.bean.TemperatureRange;
+import net.irext.decode.sdk.bean.TemperatureRange;
-import net.irext.decodesdk.utils.Constants;
+import net.irext.decode.sdk.utils.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.ServletContext;

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

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

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;
 

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

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;

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.decode.service.queue.MessagePublisher;
-import net.irext.decoder.queue.MessagePublisherImpl;
+import net.irext.decode.service.queue.MessagePublisherImpl;
-import net.irext.decoder.queue.MessageSubscriber;
+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;

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;

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.decode.service.alioss.OSSHelper;
-import net.irext.decoder.cache.IDecodeSessionRepository;
+import net.irext.decode.service.cache.IDecodeSessionRepository;
-import net.irext.decoder.cache.IIRBinaryRepository;
+import net.irext.decode.service.cache.IIRBinaryRepository;
-import net.irext.decoder.model.RemoteIndex;
+import net.irext.decode.service.model.RemoteIndex;
-import net.irext.decoder.utils.FileUtil;
+import net.irext.decode.service.utils.FileUtil;
-import net.irext.decoder.utils.LoggerUtil;
+import net.irext.decode.service.utils.LoggerUtil;
-import net.irext.decoder.utils.MD5Util;
+import net.irext.decode.service.utils.MD5Util;
-import net.irext.decodesdk.IRDecode;
+import net.irext.decode.sdk.IRDecode;
-import net.irext.decodesdk.bean.ACStatus;
+import net.irext.decode.sdk.bean.ACStatus;
 import org.apache.commons.io.IOUtils;
 
 import javax.servlet.ServletContext;

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.decode.service.mapper.RemoteIndexMapper;
-import net.irext.decoder.model.RemoteIndex;
+import net.irext.decode.service.model.RemoteIndex;
 import org.springframework.stereotype.Controller;
 
 import java.util.List;

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;
 

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;
 

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;

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.decode.service.cache.IIRBinaryRepository;
-import net.irext.decoder.model.RemoteIndex;
+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;

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;

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

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

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;
 

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

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;

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;

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

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) {
+    public DecodeRequest(int remoteIndexId, ACStatus acStatus, int keyCode, int changeWindDir) {
-        this.indexId = indexId;
+        this.remoteIndexId = remoteIndexId;
         this.acStatus = acStatus;
         this.keyCode = keyCode;
         this.changeWindDir = changeWindDir;
@@ -31,12 +31,12 @@ public class DecodeRequest {
 
     }
 
-    public int getIndexId() {
+    public int getRemoteIndexId() {
-        return indexId;
+        return remoteIndexId;
     }
 
-    public void setIndexId(int indexId) {
+    public void setRemoteIndexId(int remoteIndexId) {
-        this.indexId = indexId;
+        this.remoteIndexId = remoteIndexId;
     }
 
     public ACStatus getAcStatus() {

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

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

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

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

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

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.decode.service.businesslogic.DecodeLogic;
-import net.irext.decoder.businesslogic.IndexLogic;
+import net.irext.decode.service.cache.IDecodeSessionRepository;
-import net.irext.decoder.cache.IDecodeSessionRepository;
+import net.irext.decode.service.cache.IIRBinaryRepository;
-import net.irext.decoder.cache.IIRBinaryRepository;
+import net.irext.decode.service.mapper.RemoteIndexMapper;
-import net.irext.decoder.mapper.RemoteIndexMapper;
+import net.irext.decode.service.model.DecodeSession;
-import net.irext.decoder.model.DecodeSession;
+import net.irext.decode.service.model.RemoteIndex;
-import net.irext.decoder.model.RemoteIndex;
+import net.irext.decode.service.request.CloseRequest;
-import net.irext.decoder.request.CloseRequest;
+import net.irext.decode.service.request.DecodeRequest;
-import net.irext.decoder.request.DecodeRequest;
+import net.irext.decode.service.request.OpenRequest;
-import net.irext.decoder.request.OpenRequest;
+import net.irext.decode.service.utils.LoggerUtil;
-import net.irext.decoder.response.DecodeResponse;
+import net.irext.decode.service.utils.MD5Util;
-import net.irext.decoder.response.ServiceResponse;
+import net.irext.decode.service.businesslogic.IndexLogic;
-import net.irext.decoder.response.Status;
+import net.irext.decode.service.response.DecodeResponse;
-import net.irext.decoder.response.StringResponse;
+import net.irext.decode.service.response.ServiceResponse;
-import net.irext.decoder.service.base.AbstractBaseService;
+import net.irext.decode.service.response.Status;
-import net.irext.decoder.utils.LoggerUtil;
+import net.irext.decode.service.response.StringResponse;
-import net.irext.decoder.utils.MD5Util;
+import net.irext.decode.service.service.base.AbstractBaseService;
-import net.irext.decodesdk.bean.ACStatus;
+import net.irext.decode.sdk.bean.ACStatus;
-import net.irext.decodesdk.utils.Constants;
+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();

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.decode.service.Constants;
-import net.irext.decoder.response.ServiceResponse;
+import net.irext.decode.service.response.ServiceResponse;
-import net.irext.decoder.response.Status;
+import net.irext.decode.service.response.Status;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

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.*;
 

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;

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;
 

src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.irext.decoder.mapper.RemoteIndexMapper">
+<mapper namespace="net.irext.decode.service.mapper.RemoteIndexMapper">
-    <resultMap id="BaseResultMap" type="net.irext.decoder.model.RemoteIndex">
+    <resultMap id="BaseResultMap" type="net.irext.decode.service.model.RemoteIndex">
         <!--
           WARNING - @mbggenerated
           This element is automatically generated by MyBatis Generator, do not modify.