diff --git a/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java b/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java index 418473a..91f5b95 100644 --- a/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java +++ b/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java @@ -32,7 +32,7 @@ public class IndexingLogic { private CityMapper cityMapper; @Autowired - private OperatorMapper operatorMapper; + private StbOperatorMapper stbOperatorMapper; @Autowired private RemoteIndexMapper remoteIndexMapper; @@ -81,11 +81,12 @@ public class IndexingLogic { } public List listCities(String provincePrefix) { - return cityMapper.listCities(provincePrefix); + String provincePrefixText = provincePrefix + "__00"; + return cityMapper.listCities(provincePrefixText); } public List listOperators(String cityCode) { - return operatorMapper.listOperators(cityCode); + return stbOperatorMapper.listOperators(cityCode); } public List listRemoteIndexes(int categoryId, int brandId, String cityCode, int from, int count) { @@ -105,7 +106,7 @@ public class IndexingLogic { } RemoteIndex remote = remoteIndexList.get(0); - String downloadPath = "/data/irext/"; + String downloadPath = "/home/strawmanbobi/"; String fileName = IR_BIN_FILE_PREFIX + remote.getRemoteMap() + IR_BIN_FILE_SUFFIX; String localFilePath = downloadPath + fileName; return new File(localFilePath); diff --git a/src/main/java/net/irext/server/service/mapper/CityMapper.java b/src/main/java/net/irext/server/service/mapper/CityMapper.java index 1d93ba9..0e0110b 100644 --- a/src/main/java/net/irext/server/service/mapper/CityMapper.java +++ b/src/main/java/net/irext/server/service/mapper/CityMapper.java @@ -23,7 +23,7 @@ public interface CityMapper { @ResultMap("BaseResultMap") List listProvinces(); - @Select("SELECT * FROM city WHERE code like '#{provincePrefix}__00' and code not like '__0000'") + @Select("SELECT * FROM city WHERE code LIKE #{provincePrefix} AND code NOT LIKE '__0000'") @ResultMap("BaseResultMap") List listCities(String provincePrefix); } diff --git a/src/main/java/net/irext/server/service/mapper/OperatorMapper.java b/src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java similarity index 83% rename from src/main/java/net/irext/server/service/mapper/OperatorMapper.java rename to src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java index 14d56e7..d2fb0cc 100644 --- a/src/main/java/net/irext/server/service/mapper/OperatorMapper.java +++ b/src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java @@ -8,17 +8,17 @@ import org.apache.ibatis.annotations.Select; import java.util.List; /** - * Filename: OperatorMapper.java + * Filename: StbOperatorMapper.java * Revised: Date: 2019-06-21 * Revision: Revision: 1.0 *

- * Description: OperatorMapper + * Description: StbOperatorMapper *

* Revision log: * 2019-06-21: created by strawmanbobi */ @Mapper -public interface OperatorMapper { +public interface StbOperatorMapper { @Select("SELECT * FROM stb_operator WHERE city_code = #{cityCode}") @ResultMap("BaseResultMap") List listOperators(String cityCode);