From b41432dbde602317e8da65a79f54b763befffd71 Mon Sep 17 00:00:00 2001 From: linwl <304115325@qq.com> Date: Wed, 20 Jan 2021 09:05:58 +0800 Subject: [PATCH] =?UTF-8?q?mongodb=E8=AE=BF=E9=97=AE=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IProvinceInfoService.java | 4 +-- .../service/IpProvinceService.java | 10 ------- .../service/impl/IpProvinceServiceImpl.java | 28 +++++++++---------- .../service/impl/ProvinceInfoServiceImpl.java | 11 +++++--- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/telpo/dipperposition/service/IProvinceInfoService.java b/src/main/java/com/telpo/dipperposition/service/IProvinceInfoService.java index dafa7d6..a924d91 100644 --- a/src/main/java/com/telpo/dipperposition/service/IProvinceInfoService.java +++ b/src/main/java/com/telpo/dipperposition/service/IProvinceInfoService.java @@ -27,11 +27,9 @@ public interface IProvinceInfoService { * 更新省份经纬度信息 * * @param query - * @param update * @return */ - boolean updateProvinceInfoEntity( - ProvinceInfoEntity query, ProvinceInfoEntity update); + boolean updateProvinceInfoEntity(ProvinceInfoEntity query); /** * 根据ID移除IP省份记录 diff --git a/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java b/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java index cb58ab0..a216dac 100644 --- a/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java +++ b/src/main/java/com/telpo/dipperposition/service/IpProvinceService.java @@ -21,16 +21,6 @@ public interface IpProvinceService { */ boolean saveIpProvince(IpProvinceEntity entity); - /** - * 更新IP省份 - * - * @param query - * @param update - * @return - */ - boolean updateIPProvince( - IpProvinceEntity query, IpProvinceEntity update); - /** * 根据ID移除IP省份记录 * 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 24c54cc..b47baed 100644 --- a/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java +++ b/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java @@ -1,12 +1,18 @@ package com.telpo.dipperposition.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.telpo.dipperposition.entity.mongo.IpProvinceEntity; +import com.telpo.dipperposition.entity.mongo.ProvinceInfoEntity; import com.telpo.dipperposition.mapper.IpProvinceMapper; import com.telpo.dipperposition.service.IpProvinceService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Example; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import tools.BeanTools; import java.util.List; @@ -34,22 +40,14 @@ public class IpProvinceServiceImpl implements IpProvinceService { // } @Override public boolean saveIpProvince(IpProvinceEntity entity) { - ipProvinceMapper.saveIp(entity); - return true; - } - - @Override - public boolean updateIPProvince( - IpProvinceEntity query, IpProvinceEntity update) { - - ipProvinceMapper.updateIpFirst(query, update); + ipProvinceMapper.save(entity); return true; } @Override public boolean romveById(String id) { - ipProvinceMapper.deleteIpById(id); + ipProvinceMapper.deleteById(id); return false; } @@ -58,10 +56,12 @@ public class IpProvinceServiceImpl implements IpProvinceService { try { IpProvinceEntity query = new IpProvinceEntity(); query.setIp(ipAddress); - - List pushRecords = ipProvinceMapper.queryIpList(query); - if (ObjectUtils.isNotEmpty(pushRecords)) { - return pushRecords.get(0); + Example example = Example.of(query); + PageRequest pageable = PageRequest.of(0, 1); + Page data = ipProvinceMapper.findAll(example, pageable); + if (CollectionUtil.isNotEmpty(data.getContent())) { + List records = BeanTools.copyList(data.getContent(), IpProvinceEntity.class); + return records.get(0); } else { return null; } diff --git a/src/main/java/com/telpo/dipperposition/service/impl/ProvinceInfoServiceImpl.java b/src/main/java/com/telpo/dipperposition/service/impl/ProvinceInfoServiceImpl.java index da3f873..9ca927e 100644 --- a/src/main/java/com/telpo/dipperposition/service/impl/ProvinceInfoServiceImpl.java +++ b/src/main/java/com/telpo/dipperposition/service/impl/ProvinceInfoServiceImpl.java @@ -32,11 +32,14 @@ public class ProvinceInfoServiceImpl implements IProvinceInfoService { @Override public boolean saveProvinceInfo(ProvinceInfoEntity entity) { + + provinceInfoMapper.save(entity); return false; } @Override - public boolean updateProvinceInfoEntity(ProvinceInfoEntity query, ProvinceInfoEntity update) { + public boolean updateProvinceInfoEntity(ProvinceInfoEntity entity) { + provinceInfoMapper.save(entity); return false; } @@ -53,9 +56,9 @@ public class ProvinceInfoServiceImpl implements IProvinceInfoService { ProvinceInfoEntity query = new ProvinceInfoEntity(); query.setProvince(provicne); Example example = Example.of(query); - PageRequest pageable = PageRequest.of(0, 1); - Page data = provinceInfoMapper.findAll(example, pageable); - if (CollectionUtil.isNotEmpty(data.getContent())) { + PageRequest pageable = PageRequest.of(0, 1); + Page data = provinceInfoMapper.findAll(example, pageable); + if (CollectionUtil.isNotEmpty(data.getContent())) { List provinceInfos = BeanTools.copyList(data.getContent(), ProvinceInfoEntity.class); return provinceInfos.get(0); } else {