From 6a0fb8000ea8cee2e9fa90ab4404fc354ebf1494 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 13 Mar 2025 11:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=8F=AB=E5=8F=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CurCallConfigServiceImpl.java | 43 ++++++++----------- 收银机数据迁移关系.md | 7 +++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurCallConfigServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurCallConfigServiceImpl.java index 7fcf0cd..700ff18 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurCallConfigServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurCallConfigServiceImpl.java @@ -3,11 +3,13 @@ package com.czg.mergedata.cur.service.impl; import cn.hutool.core.bean.BeanUtil; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; +import com.czg.mergedata.cur.entity.CurCallConfig; import com.czg.mergedata.cur.entity.CurCallQueue; import com.czg.mergedata.cur.entity.CurCallTable; +import com.czg.mergedata.cur.mapper.CurCallConfigMapper; import com.czg.mergedata.cur.mapper.CurCallQueueMapper; import com.czg.mergedata.cur.mapper.CurCallTableMapper; -import com.czg.mergedata.cur.service.CurShopIdRelationService; +import com.czg.mergedata.cur.service.CurCallConfigService; import com.czg.mergedata.old.entity.OldCallConfig; import com.czg.mergedata.old.entity.OldCallQueue; import com.czg.mergedata.old.entity.OldCallTable; @@ -16,16 +18,12 @@ import com.czg.mergedata.old.service.OldCallQueueService; import com.czg.mergedata.old.service.OldCallTableService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.mergedata.cur.entity.CurCallConfig; -import com.czg.mergedata.cur.mapper.CurCallConfigMapper; -import com.czg.mergedata.cur.service.CurCallConfigService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 叫号配置表 服务层实现。 @@ -36,9 +34,6 @@ import java.util.Map; @Service public class CurCallConfigServiceImpl extends ServiceImpl implements CurCallConfigService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private CurCallQueueMapper curCallQueueMapper; @@ -61,72 +56,70 @@ public class CurCallConfigServiceImpl extends ServiceImpl oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execCallConfig(oldAndCurShopIdMap); - execCallQueue(oldAndCurShopIdMap); - execCallTable(oldAndCurShopIdMap); + execCallConfig(); + execCallQueue(); + execCallTable(); return CzgResult.success("迁移成功"); } - private void execCallConfig(Map oldAndCurShopIdMap) { + private void execCallConfig() { Page page = oldCallConfigService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveCallConfig(page.getRecords(), oldAndCurShopIdMap); + saveCallConfig(page.getRecords()); page = oldCallConfigService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execCallQueue(Map oldAndCurShopIdMap) { + private void execCallQueue() { Page page = oldCallQueueService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveCallQueue(page.getRecords(), oldAndCurShopIdMap); + saveCallQueue(page.getRecords()); page = oldCallQueueService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execCallTable(Map oldAndCurShopIdMap) { + private void execCallTable() { Page page = oldCallTableService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveCallTable(page.getRecords(), oldAndCurShopIdMap); + saveCallTable(page.getRecords()); page = oldCallTableService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveCallConfig(List oldCallConfigList, Map oldAndCurShopIdMap) { + private void saveCallConfig(List oldCallConfigList) { List curCallConfigList = new ArrayList<>(); for (OldCallConfig oldCallConfig : oldCallConfigList) { CurCallConfig curCallConfig = BeanUtil.toBean(oldCallConfig, CurCallConfig.class); - curCallConfig.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldCallConfig.getShopId()))); + curCallConfig.setShopId(Long.valueOf(oldCallConfig.getShopId())); curCallConfigList.add(curCallConfig); } saveBatch(curCallConfigList); } - private void saveCallQueue(List oldCallQueueList, Map oldAndCurShopIdMap) { + private void saveCallQueue(List oldCallQueueList) { List curCallQueueList = new ArrayList<>(); for (OldCallQueue oldCallQueue : oldCallQueueList) { CurCallQueue curCallQueue = BeanUtil.toBean(oldCallQueue, CurCallQueue.class); - curCallQueue.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldCallQueue.getShopId()))); + curCallQueue.setShopId(Long.valueOf(oldCallQueue.getShopId())); curCallQueueList.add(curCallQueue); } curCallQueueMapper.insertBatch(curCallQueueList); } - private void saveCallTable(List oldCallTableList, Map oldAndCurShopIdMap) { + private void saveCallTable(List oldCallTableList) { List curCallTableList = new ArrayList<>(); for (OldCallTable oldCallTable : oldCallTableList) { CurCallTable curCallTable = BeanUtil.toBean(oldCallTable, CurCallTable.class); - curCallTable.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldCallTable.getShopId()))); + curCallTable.setShopId(Long.valueOf(oldCallTable.getShopId())); curCallTableList.add(curCallTable); } diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index 766ad0c..6aadc13 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -73,6 +73,13 @@ #### 执行表 - tb_shop_table_booking 表 +### 9. 叫号功能 +> /merge/call/mergeData +#### 执行表 +- tb_call_config 表 +- tb_call_queue 表 +- tb_call_table 表 +