From 4098ee819e5e16c0b27787006fd56dd77c5dc91d Mon Sep 17 00:00:00 2001 From: yqy Date: Thu, 27 Apr 2023 17:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/baiye/dao/ProxyMapper.java | 2 +- .../java/com/baiye/entity/ProxyEntity.java | 1 + .../baiye/service/impl/ProxyServiceImpl.java | 47 +++++++++---------- .../src/main/resources/mapper/ProxyMapper.xml | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/dao/ProxyMapper.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/dao/ProxyMapper.java index 8fc8c32..f49556a 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/dao/ProxyMapper.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/dao/ProxyMapper.java @@ -23,5 +23,5 @@ public interface ProxyMapper extends BaseMapper { void updateExpireDateStatus(); - void addSurplusDay(@Param("ids") List ids,@Param("num") Integer num); + void addSurplusDay(@Param("ids") List ids, @Param("num") Integer num, @Param("status") String status); } diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java index aa9d3fd..2e642f8 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-core/src/main/java/com/baiye/entity/ProxyEntity.java @@ -84,6 +84,7 @@ public class ProxyEntity { @TableField(exist = false) private List phoneList = new ArrayList<>(); + @TableField(exist = false) private List ProxyAccountList; diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java index 51f7c09..24d2e91 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/java/com/baiye/service/impl/ProxyServiceImpl.java @@ -138,31 +138,30 @@ public class ProxyServiceImpl implements ProxyService { @Override @Transactional(rollbackFor = Exception.class) public void update(ProxyEntity proxyEntity) { - // 修改IP的信息 proxyMapper.updateById(proxyEntity); - List phoneList = proxyEntity.getPhoneList(); - List list = new ArrayList<>(); - - List proxyAccountEntities = proxyAccountMapper.selectList(new LambdaQueryWrapper() - .eq(ProxyAccountEntity::getProxyId, proxyEntity.getId())); - Map> map = proxyAccountEntities.stream().collect(Collectors.groupingBy(ProxyAccountEntity::getNid)); - - // 获取所有要绑定的账号-并添加绑定关系 - for (String phone : phoneList) { - if (!map.containsKey(phone)) { - ProxyAccountEntity proxyAccountEntity = new ProxyAccountEntity(phone, proxyEntity.getId()); - list.add(proxyAccountEntity); - } - } - if (CollUtil.isNotEmpty(list)) proxyAccountMapper.insertAll(list); - - // 删除的账号-删除绑定关系 - Set phones = map.keySet(); - List deleteList = phones.stream().filter(t -> !phoneList.contains(t)).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(deleteList)) { - proxyAccountMapper.delete(new LambdaQueryWrapper().in(ProxyAccountEntity::getNid, deleteList)); - } +// List phoneList = proxyEntity.getPhoneList(); +// List list = new ArrayList<>(); +// +// List proxyAccountEntities = proxyAccountMapper.selectList(new LambdaQueryWrapper() +// .eq(ProxyAccountEntity::getProxyId, proxyEntity.getId())); +// Map> map = proxyAccountEntities.stream().collect(Collectors.groupingBy(ProxyAccountEntity::getNid)); +// +// // 获取所有要绑定的账号-并添加绑定关系 +// for (String phone : phoneList) { +// if (!map.containsKey(phone)) { +// ProxyAccountEntity proxyAccountEntity = new ProxyAccountEntity(phone, proxyEntity.getId()); +// list.add(proxyAccountEntity); +// } +// } +// if (CollUtil.isNotEmpty(list)) proxyAccountMapper.insertAll(list); +// +// // 删除的账号-删除绑定关系 +// Set phones = map.keySet(); +// List deleteList = phones.stream().filter(t -> !phoneList.contains(t)).collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(deleteList)) { +// proxyAccountMapper.delete(new LambdaQueryWrapper().in(ProxyAccountEntity::getNid, deleteList)); +// } } @Override @@ -277,7 +276,7 @@ public class ProxyServiceImpl implements ProxyService { @Override public void addSurplusDay(ProxyDTO proxyDTO) { - proxyMapper.addSurplusDay(proxyDTO.getIds(), proxyDTO.getSurplusDay()); + proxyMapper.addSurplusDay(proxyDTO.getIds(), proxyDTO.getSurplusDay(), "0"); } /** diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/resources/mapper/ProxyMapper.xml b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/resources/mapper/ProxyMapper.xml index 0901d95..86a49cd 100644 --- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/resources/mapper/ProxyMapper.xml +++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-service/src/main/resources/mapper/ProxyMapper.xml @@ -33,7 +33,7 @@ update tb_proxy - set surplus_day = surplus_day + ${num} + set surplus_day = surplus_day + ${num},status = #{status} where id in #{index}