diff --git a/src/main/java/com/telpo/dipperposition/entity/mongo/IPProvinceEntity.java b/src/main/java/com/telpo/dipperposition/entity/mongo/IpProvinceEntity.java similarity index 82% rename from src/main/java/com/telpo/dipperposition/entity/mongo/IPProvinceEntity.java rename to src/main/java/com/telpo/dipperposition/entity/mongo/IpProvinceEntity.java index d9f27df..42edb3d 100644 --- a/src/main/java/com/telpo/dipperposition/entity/mongo/IPProvinceEntity.java +++ b/src/main/java/com/telpo/dipperposition/entity/mongo/IpProvinceEntity.java @@ -7,7 +7,7 @@ import lombok.ToString; import models.BaseMongoDbEntity; /** - * @program: IPProvinceEntity + * @program: IpProvinceEntity * @description: 位置实体类 * @author: linwl * @create: 2020-07-11 15:33 @@ -15,7 +15,7 @@ import models.BaseMongoDbEntity; @ToString @Getter @Setter -public class IPProvinceEntity extends BaseMongoDbEntity { +public class IpProvinceEntity extends BaseMongoDbEntity { /** Ip */ private String ip; diff --git a/src/main/java/com/telpo/dipperposition/mapper/IpProvinceMapper.java b/src/main/java/com/telpo/dipperposition/mapper/IpProvinceMapper.java index bc428d1..c615355 100644 --- a/src/main/java/com/telpo/dipperposition/mapper/IpProvinceMapper.java +++ b/src/main/java/com/telpo/dipperposition/mapper/IpProvinceMapper.java @@ -1,7 +1,7 @@ package com.telpo.dipperposition.mapper; import com.telpo.dipperposition.annotation.MongoSwitch; -import com.telpo.dipperposition.entity.mongo.IPProvinceEntity; +import com.telpo.dipperposition.entity.mongo.IpProvinceEntity; import db.BaseMongoDbDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -15,51 +15,51 @@ import java.util.List; * @create: 2020-07-20 11:12 */ @Repository -public class IpProvinceMapper extends BaseMongoDbDao { +public class IpProvinceMapper extends BaseMongoDbDao { - private static IpProvinceMapper ipProvinceMapper; +// private static IpProvinceMapper ipProvinceMapper; /** * spring会自动从ioc容器当中根据IPProvinceMapper类型找到iPProvinceMapper, * 当做参数传进来 * */ - @Autowired - public void setIPProvinceMapper(IpProvinceMapper ipProvinceMapper) { - this.ipProvinceMapper = ipProvinceMapper; - } +// @Autowired +// public void setIPProvinceMapper(IpProvinceMapper ipProvinceMapper) { +// this.ipProvinceMapper = ipProvinceMapper; +// } @Override - protected Class getEntityClass() { - return IPProvinceEntity.class; + protected Class getEntityClass() { + return IpProvinceEntity.class; } @MongoSwitch("common") - public void saveIp(IPProvinceEntity entity) { + public void saveIp(IpProvinceEntity entity) { this.save(entity); } @MongoSwitch("common") - public void saveIp(IPProvinceEntity entity, String collectionName) { + public void saveIp(IpProvinceEntity entity, String collectionName) { this.save(entity, collectionName); } @MongoSwitch("common") - public void updateIpFirst(IPProvinceEntity srcObj, IPProvinceEntity targetObj) { + public void updateIpFirst(IpProvinceEntity srcObj, IpProvinceEntity targetObj) { this.updateFirst(srcObj, targetObj); } @Override - public List getPage(IPProvinceEntity object, int start, int size) { + public List getPage(IpProvinceEntity object, int start, int size) { return super.getPage(object, start, size); } @MongoSwitch("common") - public List queryIpList(IPProvinceEntity object) { + public List queryIpList(IpProvinceEntity object) { return this.queryList(object); } @MongoSwitch("common") - public List queryIpList(IPProvinceEntity object, String collectionName) { + public List queryIpList(IpProvinceEntity object, String collectionName) { return this.queryList(object, collectionName); } diff --git a/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java b/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java index 128b778..e335e8f 100644 --- a/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java +++ b/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java @@ -1,7 +1,6 @@ package com.telpo.dipperposition.service; -import com.telpo.dipperposition.entity.mongo.IPProvinceEntity; -import com.telpo.dipperposition.vo.IPProvinceVo; +import com.telpo.dipperposition.entity.mongo.IpProvinceEntity; import org.springframework.beans.factory.annotation.Autowired; /** @@ -20,7 +19,7 @@ public interface IpProvinceService { * @param entity * @return */ - boolean saveIpProvince(IPProvinceEntity entity); + boolean saveIpProvince(IpProvinceEntity entity); /** * 更新IP省份 @@ -30,7 +29,7 @@ public interface IpProvinceService { * @return */ boolean updateIPProvince( - IPProvinceEntity query, IPProvinceEntity update); + IpProvinceEntity query, IpProvinceEntity update); /** * 根据ID移除IP省份记录 @@ -44,5 +43,5 @@ public interface IpProvinceService { * @param ipAddress * 获取IP省份 */ - IPProvinceEntity getIpProvince(String ipAddress); + IpProvinceEntity getIpProvince(String ipAddress); } diff --git a/src/main/java/com/telpo/dipperposition/service/impl/DipperAstPosAsyncTaskServiceImpl.java b/src/main/java/com/telpo/dipperposition/service/impl/DipperAstPosAsyncTaskServiceImpl.java index ef78714..218b1d5 100644 --- a/src/main/java/com/telpo/dipperposition/service/impl/DipperAstPosAsyncTaskServiceImpl.java +++ b/src/main/java/com/telpo/dipperposition/service/impl/DipperAstPosAsyncTaskServiceImpl.java @@ -2,7 +2,7 @@ package com.telpo.dipperposition.service.impl; import com.alibaba.fastjson.JSONObject; import com.telpo.dipperposition.common.*; -import com.telpo.dipperposition.entity.mongo.IPProvinceEntity; +import com.telpo.dipperposition.entity.mongo.IpProvinceEntity; import com.telpo.dipperposition.service.IDipperAstPosAsyncTaskService; import com.telpo.dipperposition.service.IpProvinceService; import lombok.extern.slf4j.Slf4j; @@ -98,7 +98,7 @@ public class DipperAstPosAsyncTaskServiceImpl implements IDipperAstPosAsyncTaskS // 关于IP与省份的关系保存到缓存中 // 使用时,先在缓存中获取匹配信息 // 用mongodb实现 - IPProvinceEntity ipProvinceEntity = ipProvinceService.getIpProvince(ipAddress); + IpProvinceEntity ipProvinceEntity = ipProvinceService.getIpProvince(ipAddress); if (ipProvinceEntity == null) { // 匹配不到,再请求高德IP定位服务。 JSONObject userObj = new JSONObject(); @@ -127,7 +127,7 @@ public class DipperAstPosAsyncTaskServiceImpl implements IDipperAstPosAsyncTaskS public void createIPProvince(String ipAddress, String province) { log.debug("异步创建推送失败任务记录!"); try { - IPProvinceEntity ipProvinceEntity = ipProvinceService.getIpProvince(ipAddress); + IpProvinceEntity ipProvinceEntity = ipProvinceService.getIpProvince(ipAddress); if (ipProvinceEntity == null) { //DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); ipProvinceEntity.setIp(ipAddress); diff --git a/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java b/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java index ebc195b..ab282df 100644 --- a/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java +++ b/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java @@ -1,6 +1,6 @@ package com.telpo.dipperposition.service.impl; -import com.telpo.dipperposition.entity.mongo.IPProvinceEntity; +import com.telpo.dipperposition.entity.mongo.IpProvinceEntity; import com.telpo.dipperposition.mapper.IpProvinceMapper; import com.telpo.dipperposition.service.IpProvinceService; import lombok.extern.slf4j.Slf4j; @@ -33,14 +33,14 @@ public class IpProvinceServiceImpl implements IpProvinceService { this.ipProvinceService = ipProvinceService; } @Override - public boolean saveIpProvince(IPProvinceEntity entity) { + public boolean saveIpProvince(IpProvinceEntity entity) { ipProvinceMapper.saveIp(entity); return true; } @Override public boolean updateIPProvince( - IPProvinceEntity query, IPProvinceEntity update) { + IpProvinceEntity query, IpProvinceEntity update) { ipProvinceMapper.updateIpFirst(query, update); return true; @@ -54,12 +54,12 @@ public class IpProvinceServiceImpl implements IpProvinceService { } @Override - public IPProvinceEntity getIpProvince(String ipAddress) { + public IpProvinceEntity getIpProvince(String ipAddress) { try { - IPProvinceEntity query = new IPProvinceEntity(); + IpProvinceEntity query = new IpProvinceEntity(); query.setIp(ipAddress); - List pushRecords = ipProvinceMapper.queryIpList(query); + List pushRecords = ipProvinceMapper.queryIpList(query); if (ObjectUtils.isNotEmpty(pushRecords)) { return pushRecords.get(0); } else {