From 648b08fd2a2e2e51c19f6c7b2f093cb1e3e5573d Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 13 Mar 2025 11:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=8F=B0=E6=A1=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cur/entity/CurShopTableArea.java | 8 +++- .../impl/CurShopTableBookingServiceImpl.java | 15 +++----- .../service/impl/CurShopTableServiceImpl.java | 37 ++++++++++--------- 收银机数据迁移关系.md | 12 ++++++ 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopTableArea.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopTableArea.java index 39974ee..6030eb5 100644 --- a/src/main/java/com/czg/mergedata/cur/entity/CurShopTableArea.java +++ b/src/main/java/com/czg/mergedata/cur/entity/CurShopTableArea.java @@ -1,11 +1,13 @@ package com.czg.mergedata.cur.entity; +import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import java.io.Serializable; import java.io.Serial; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; @@ -49,8 +51,10 @@ public class CurShopTableArea implements Serializable { */ private String name; - private Long createdAt; + @Column(onInsertValue = "now()") + private LocalDateTime createdTime; - private Long updatedAt; + @Column(onInsertValue = "now()", onUpdateValue = "now()") + private LocalDateTime updatedTime; } diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableBookingServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableBookingServiceImpl.java index 281ca91..87b83da 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableBookingServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableBookingServiceImpl.java @@ -28,9 +28,6 @@ import java.util.Map; @Service public class CurShopTableBookingServiceImpl extends ServiceImpl implements CurShopTableBookingService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private OldShopTableBookingService oldShopTableBookingService; @@ -39,29 +36,27 @@ public class CurShopTableBookingServiceImpl extends ServiceImpl mergeData() { getMapper().truncateTable(); - Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execTableBooking(oldAndCurShopIdMap); + execTableBooking(); return CzgResult.success("迁移成功"); } - private void execTableBooking(Map oldAndCurShopIdMap) { + private void execTableBooking() { Page page = oldShopTableBookingService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveTableBooking(page.getRecords(), oldAndCurShopIdMap); + saveTableBooking(page.getRecords()); page = oldShopTableBookingService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveTableBooking(List oldShopTableBookingList, Map oldAndCurShopIdMap) { + private void saveTableBooking(List oldShopTableBookingList) { List curShopTableBookingList = new ArrayList<>(); for (OldShopTableBooking oldShopTableBooking : oldShopTableBookingList) { CurShopTableBooking curShopTableBooking = BeanUtil.toBean(oldShopTableBooking, CurShopTableBooking.class); - curShopTableBooking.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldShopTableBooking.getShopId()))); + curShopTableBooking.setShopId(Long.valueOf(oldShopTableBooking.getShopId())); curShopTableBooking.setIsDel(oldShopTableBooking.getDelFlag()); curShopTableBookingList.add(curShopTableBooking); diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableServiceImpl.java index 49edb9b..46e7950 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableServiceImpl.java @@ -1,6 +1,7 @@ package com.czg.mergedata.cur.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; import com.czg.mergedata.cur.entity.CurShopTableArea; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -32,9 +34,6 @@ import java.util.Map; @Service public class CurShopTableServiceImpl extends ServiceImpl implements CurShopTableService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private CurShopTableAreaMapper curShopTableAreaMapper; @@ -50,43 +49,44 @@ public class CurShopTableServiceImpl extends ServiceImpl oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execTableArea(oldAndCurShopIdMap); - execTable(oldAndCurShopIdMap); + execTableArea(); + execTable(); return CzgResult.success("迁移成功"); } - private void execTableArea(Map oldAndCurShopIdMap) { + private void execTableArea() { Page page = oldShopAreaService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { List oldShopAreaList = page.getRecords(); - saveTableArea(oldShopAreaList, oldAndCurShopIdMap); + saveTableArea(oldShopAreaList); page = oldShopAreaService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execTable(Map oldAndCurShopIdMap) { + private void execTable() { Page page = oldShopTableService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { List oldShopTableList = page.getRecords(); - saveTable(oldShopTableList, oldAndCurShopIdMap); + saveTable(oldShopTableList); page = oldShopTableService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveTableArea(List oldShopAreaList, Map oldAndCurShopIdMap) { + private void saveTableArea(List oldShopAreaList) { List curShopTableAreas = new ArrayList<>(); for (OldShopArea oldShopArea : oldShopAreaList) { CurShopTableArea curShopTableArea = BeanUtil.toBean(oldShopArea, CurShopTableArea.class); - - Long curShopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopArea.getShopId())); - curShopTableArea.setShopId(curShopId == null ? 1L : curShopId); + curShopTableArea.setId(Long.valueOf(oldShopArea.getId())); + curShopTableArea.setShopId(Long.valueOf(oldShopArea.getShopId())); + curShopTableArea.setSort(oldShopArea.getSort()); + curShopTableArea.setName(oldShopArea.getName()); + curShopTableArea.setCreatedTime(DateUtil.toLocalDateTime(oldShopArea.getCreatedAt() == null? new Date() : new Date(oldShopArea.getCreatedAt()))); + curShopTableArea.setUpdatedTime(DateUtil.toLocalDateTime(oldShopArea.getUpdatedAt() == null ? new Date() : new Date(oldShopArea.getUpdatedAt()))); curShopTableAreas.add(curShopTableArea); } @@ -94,15 +94,16 @@ public class CurShopTableServiceImpl extends ServiceImpl oldShopTableList, Map oldAndCurShopIdMap) { + private void saveTable(List oldShopTableList) { List curShopTables = new ArrayList<>(); for (OldShopTable oldShopTable : oldShopTableList) { CurShopTable curShopTable = BeanUtil.toBean(oldShopTable, CurShopTable.class); - Long curShopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopTable.getShopId())); - curShopTable.setShopId(curShopId == null ? 1L : curShopId); + curShopTable.setShopId(Long.valueOf(oldShopTable.getShopId())); curShopTable.setTableCode(oldShopTable.getQrcode()); + curShopTable.setCreateTime(DateUtil.toLocalDateTime(oldShopTable.getCreatedAt() == null ? new Date() : new Date(oldShopTable.getCreatedAt()))); + curShopTable.setUpdateTime(DateUtil.toLocalDateTime(oldShopTable.getUpdatedAt() == null ? new Date() : new Date(oldShopTable.getUpdatedAt()))); curShopTables.add(curShopTable); } diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index 8da3960..766ad0c 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -62,5 +62,17 @@ - tb_coupon_category 表 - tb_group_order_coupon 表 +### 7. 台桌管理 +> /merge/table/mergeData +#### 执行表 +- tb_shop_table_area 表 +- tb_shop_table 表 + +### 8. 台桌预定 +> /merge/table/booking +#### 执行表 +- tb_shop_table_booking 表 + +