From 3efe56a73121c5861aa00808082045c4a0f97900 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 14 Mar 2025 18:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20shop=20id=20relation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cur/entity/CurShopIdRelation.java | 36 ------------------- .../cur/mapper/CurShopIdRelationMapper.java | 18 ---------- .../cur/service/CurShopIdRelationService.java | 20 ----------- .../impl/CurShopIdRelationServiceImpl.java | 31 ---------------- .../impl/CurShopTableBookingServiceImpl.java | 2 -- .../service/impl/CurShopTableServiceImpl.java | 2 -- .../service/impl/CurSysUserServiceImpl.java | 9 +++-- 7 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/com/czg/mergedata/cur/entity/CurShopIdRelation.java delete mode 100644 src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java delete mode 100644 src/main/java/com/czg/mergedata/cur/service/CurShopIdRelationService.java delete mode 100644 src/main/java/com/czg/mergedata/cur/service/impl/CurShopIdRelationServiceImpl.java diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopIdRelation.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopIdRelation.java deleted file mode 100644 index 51fe191..0000000 --- a/src/main/java/com/czg/mergedata/cur/entity/CurShopIdRelation.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.czg.mergedata.cur.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 实体类。 - * - * @author mac - * @since 2025-02-15 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("shop_id_relation") -public class CurShopIdRelation implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @Id - private Long curShopId; - - @Id - private Long oldShopId; - -} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java deleted file mode 100644 index ef03977..0000000 --- a/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.czg.mergedata.cur.mapper; - -import com.mybatisflex.annotation.UseDataSource; -import com.mybatisflex.core.BaseMapper; -import com.czg.mergedata.cur.entity.CurShopIdRelation; -import org.apache.ibatis.annotations.Select; - -/** - * 映射层。 - * - * @author mac - * @since 2025-02-15 - */ -@UseDataSource("ds1") -public interface CurShopIdRelationMapper extends BaseMapper { - @Select("truncate shop_id_relation") - void truncateTable(); -} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurShopIdRelationService.java b/src/main/java/com/czg/mergedata/cur/service/CurShopIdRelationService.java deleted file mode 100644 index b00cc96..0000000 --- a/src/main/java/com/czg/mergedata/cur/service/CurShopIdRelationService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.czg.mergedata.cur.service; - -import com.mybatisflex.annotation.UseDataSource; -import com.mybatisflex.core.service.IService; -import com.czg.mergedata.cur.entity.CurShopIdRelation; - -import java.util.Map; - -/** - * 服务层。 - * - * @author mac - * @since 2025-02-15 - */ -@UseDataSource("ds1") -public interface CurShopIdRelationService extends IService { - - Map getOldShopIdRelation(); - -} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopIdRelationServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopIdRelationServiceImpl.java deleted file mode 100644 index b18cf8e..0000000 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopIdRelationServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.czg.mergedata.cur.service.impl; - -import com.czg.mergedata.cur.entity.CurShopIdRelation; -import com.czg.mergedata.cur.mapper.CurShopIdRelationMapper; -import com.czg.mergedata.cur.service.CurShopIdRelationService; -import com.mybatisflex.spring.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 服务层实现。 - * - * @author mac - * @since 2025-02-15 - */ -@Service -public class CurShopIdRelationServiceImpl extends ServiceImpl implements CurShopIdRelationService{ - - @Override - public Map getOldShopIdRelation() { - List list = list(); - Map map = new HashMap<>(); - for (CurShopIdRelation curShopIdRelation : list) { - map.put(curShopIdRelation.getOldShopId(), curShopIdRelation.getCurShopId()); - } - return map; - } -} 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 87b83da..f14de35 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 @@ -3,7 +3,6 @@ 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.service.CurShopIdRelationService; import com.czg.mergedata.old.entity.OldShopTableBooking; import com.czg.mergedata.old.service.OldShopTableBookingService; import com.mybatisflex.core.paginate.Page; @@ -17,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 店铺台桌预订 服务层实现。 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 46e7950..af4d14b 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 @@ -6,7 +6,6 @@ import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; import com.czg.mergedata.cur.entity.CurShopTableArea; import com.czg.mergedata.cur.mapper.CurShopTableAreaMapper; -import com.czg.mergedata.cur.service.CurShopIdRelationService; import com.czg.mergedata.old.entity.OldShopArea; import com.czg.mergedata.old.entity.OldShopTable; import com.czg.mergedata.old.service.OldShopAreaService; @@ -23,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 台桌配置 服务层实现。 diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java index 1d76183..7b0ee06 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java @@ -8,7 +8,10 @@ import com.czg.mergedata.cur.entity.CurShopInfo; import com.czg.mergedata.cur.entity.CurShopStaff; import com.czg.mergedata.cur.entity.CurStaffIdRelation; import com.czg.mergedata.cur.entity.CurSysUser; -import com.czg.mergedata.cur.mapper.*; +import com.czg.mergedata.cur.mapper.CurShopInfoMapper; +import com.czg.mergedata.cur.mapper.CurShopStaffMapper; +import com.czg.mergedata.cur.mapper.CurStaffIdRelationMapper; +import com.czg.mergedata.cur.mapper.CurSysUserMapper; import com.czg.mergedata.cur.service.CurShopInfoService; import com.czg.mergedata.cur.service.CurShopStaffService; import com.czg.mergedata.cur.service.CurSysUserService; @@ -54,9 +57,6 @@ public class CurSysUserServiceImpl extends ServiceImpl