From ba4573eee094d1cbaadd7563ccb5cff2ec507679 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Wed, 12 Mar 2025 18:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E7=94=A8=E6=88=B7-?= =?UTF-8?q?=E5=BA=97=E9=93=BA-=E5=91=98=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/mergedata/common/utils/CodeGen.java | 16 +- .../cur/entity/CurStaffIdRelation.java | 36 +++ .../czg/mergedata/cur/entity/CurSysUser.java | 2 +- .../cur/mapper/CurShopIdRelationMapper.java | 4 +- .../cur/mapper/CurShopInfoMapper.java | 4 +- .../cur/mapper/CurShopStaffMapper.java | 4 +- .../cur/mapper/CurStaffIdRelationMapper.java | 17 ++ .../cur/mapper/CurSysUserMapper.java | 2 +- .../service/CurStaffIdRelationService.java | 14 + .../impl/CurStaffIdRelationServiceImpl.java | 18 ++ .../service/impl/CurSysUserServiceImpl.java | 255 ++++++++---------- src/main/resources/application-dev.yml | 12 +- .../mapper/cur/StaffIdRelationMapper.xml | 7 + 收银机数据迁移关系.md | 6 + 14 files changed, 238 insertions(+), 159 deletions(-) create mode 100644 src/main/java/com/czg/mergedata/cur/entity/CurStaffIdRelation.java create mode 100644 src/main/java/com/czg/mergedata/cur/mapper/CurStaffIdRelationMapper.java create mode 100644 src/main/java/com/czg/mergedata/cur/service/CurStaffIdRelationService.java create mode 100644 src/main/java/com/czg/mergedata/cur/service/impl/CurStaffIdRelationServiceImpl.java create mode 100644 src/main/resources/mapper/cur/StaffIdRelationMapper.xml diff --git a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java index 8a10237..317b61b 100644 --- a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java +++ b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java @@ -11,15 +11,15 @@ import com.zaxxer.hikari.HikariDataSource; * @author GYJoker */ public class CodeGen { - private final static String BASE_URL = "rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com"; + private final static String BASE_URL = "rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com"; private final static String PORT = "3306"; - private final static String USERNAME = "cashier"; - private final static String PASSWORD = "Cashier@1@"; - private final static String DATABASE = "czg_cashier"; - private final static String OLD_DATABASE = "fycashier_test"; + private final static String USERNAME = "root"; + private final static String PASSWORD = "Czg666888"; + private final static String DATABASE = "czg_cashier_test"; + private final static String OLD_DATABASE = "fycashier"; -// private final static boolean isOldVersion = false; - private final static boolean isOldVersion = true; + private final static boolean isOldVersion = false; +// private final static boolean isOldVersion = true; public static void main(String[] args) { //配置数据源 @@ -81,7 +81,7 @@ public class CodeGen { //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表 globalConfig.getStrategyConfig() .setTablePrefix("tb_") - .setGenerateTable("tb_shop_user_flow", "tb_order_payment"); + .setGenerateTable("staff_id_relation"); EntityConfig entityConfig = globalConfig.getEntityConfig(); if (isOldVersion) { diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurStaffIdRelation.java b/src/main/java/com/czg/mergedata/cur/entity/CurStaffIdRelation.java new file mode 100644 index 0000000..7e09e31 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurStaffIdRelation.java @@ -0,0 +1,36 @@ +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; + +/** + * 新老员工 id 对应关系 实体类。 + * + * @author mac + * @since 2025-03-12 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("staff_id_relation") +public class CurStaffIdRelation implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long oldStaffId; + + @Id + private Long curStaffId; + +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurSysUser.java b/src/main/java/com/czg/mergedata/cur/entity/CurSysUser.java index 405dc45..934c7f8 100644 --- a/src/main/java/com/czg/mergedata/cur/entity/CurSysUser.java +++ b/src/main/java/com/czg/mergedata/cur/entity/CurSysUser.java @@ -79,7 +79,7 @@ public class CurSysUser implements Serializable { /** * 状态：1启用、0禁用 */ - private Integer stauts; + private Integer status; /** * 创建者 diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java index df73bcc..ef03977 100644 --- a/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopIdRelationMapper.java @@ -3,6 +3,7 @@ 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; /** * 映射层。 @@ -12,5 +13,6 @@ import com.czg.mergedata.cur.entity.CurShopIdRelation; */ @UseDataSource("ds1") public interface CurShopIdRelationMapper extends BaseMapper { - + @Select("truncate shop_id_relation") + void truncateTable(); } diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopInfoMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopInfoMapper.java index a5c40b6..e2dd435 100644 --- a/src/main/java/com/czg/mergedata/cur/mapper/CurShopInfoMapper.java +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopInfoMapper.java @@ -3,6 +3,7 @@ package com.czg.mergedata.cur.mapper; import com.mybatisflex.annotation.UseDataSource; import com.mybatisflex.core.BaseMapper; import com.czg.mergedata.cur.entity.CurShopInfo; +import org.apache.ibatis.annotations.Select; /** * 店铺信息 映射层。 @@ -12,5 +13,6 @@ import com.czg.mergedata.cur.entity.CurShopInfo; */ @UseDataSource("ds1") public interface CurShopInfoMapper extends BaseMapper { - + @Select("truncate tb_shop_info") + void truncateTable(); } diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopStaffMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStaffMapper.java index 242d42a..4fadc3e 100644 --- a/src/main/java/com/czg/mergedata/cur/mapper/CurShopStaffMapper.java +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStaffMapper.java @@ -3,6 +3,7 @@ package com.czg.mergedata.cur.mapper; import com.mybatisflex.annotation.UseDataSource; import com.mybatisflex.core.BaseMapper; import com.czg.mergedata.cur.entity.CurShopStaff; +import org.apache.ibatis.annotations.Select; /** * 店铺员工 映射层。 @@ -12,5 +13,6 @@ import com.czg.mergedata.cur.entity.CurShopStaff; */ @UseDataSource("ds1") public interface CurShopStaffMapper extends BaseMapper { - + @Select("truncate tb_shop_staff") + void truncateTable(); } diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurStaffIdRelationMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurStaffIdRelationMapper.java new file mode 100644 index 0000000..100c54e --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurStaffIdRelationMapper.java @@ -0,0 +1,17 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurStaffIdRelation; +import org.apache.ibatis.annotations.Select; + +/** + * 新老员工 id 对应关系 映射层。 + * + * @author mac + * @since 2025-03-12 + */ +public interface CurStaffIdRelationMapper extends BaseMapper { + + @Select("truncate staff_id_relation") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java index 51c40c6..7b10447 100644 --- a/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java @@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Select; @UseDataSource("ds1") public interface CurSysUserMapper extends BaseMapper { - @Select("truncate sys_user ") + @Select("truncate sys_user") void truncateTable(); } diff --git a/src/main/java/com/czg/mergedata/cur/service/CurStaffIdRelationService.java b/src/main/java/com/czg/mergedata/cur/service/CurStaffIdRelationService.java new file mode 100644 index 0000000..6961159 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurStaffIdRelationService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.cur.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.cur.entity.CurStaffIdRelation; + +/** + * 新老员工 id 对应关系 服务层。 + * + * @author mac + * @since 2025-03-12 + */ +public interface CurStaffIdRelationService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurStaffIdRelationServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurStaffIdRelationServiceImpl.java new file mode 100644 index 0000000..ac81ba0 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurStaffIdRelationServiceImpl.java @@ -0,0 +1,18 @@ +package com.czg.mergedata.cur.service.impl; + +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.mergedata.cur.entity.CurStaffIdRelation; +import com.czg.mergedata.cur.mapper.CurStaffIdRelationMapper; +import com.czg.mergedata.cur.service.CurStaffIdRelationService; +import org.springframework.stereotype.Service; + +/** + * 新老员工 id 对应关系 服务层实现。 + * + * @author mac + * @since 2025-03-12 + */ +@Service +public class CurStaffIdRelationServiceImpl extends ServiceImpl implements CurStaffIdRelationService{ + +} 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 9f2b996..191aa59 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 @@ -4,11 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.crypto.SecureUtil; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; -import com.czg.mergedata.cur.entity.CurShopIdRelation; -import com.czg.mergedata.cur.entity.CurShopInfo; -import com.czg.mergedata.cur.entity.CurShopStaff; -import com.czg.mergedata.cur.entity.CurSysUser; -import com.czg.mergedata.cur.mapper.CurSysUserMapper; +import com.czg.mergedata.cur.entity.*; +import com.czg.mergedata.cur.mapper.*; import com.czg.mergedata.cur.service.CurShopIdRelationService; import com.czg.mergedata.cur.service.CurShopInfoService; import com.czg.mergedata.cur.service.CurShopStaffService; @@ -49,6 +46,18 @@ public class CurSysUserServiceImpl extends ServiceImpl mergeShopInfo() { + // 清空之前的数据 + getMapper().truncateTable(); + curShopInfoMapper.truncateTable(); + curShopStaffMapper.truncateTable(); + curShopIdRelationMapper.truncateTable(); + curStaffIdRelationMapper.truncateTable(); + // 账号和店铺id映射 Map orginAccountAndShopIdMap = new HashMap<>(); @@ -71,137 +87,45 @@ public class CurSysUserServiceImpl extends ServiceImpl oldAndCurShopIdMap = new HashMap<>(); Map curAndOldShopIdMap = new HashMap<>(); - List curSysUsers = execSysUser(); - curSysUsers.forEach(curSysUser -> { - if (!curSysUser.getAccount().contains("@")) { - orginAccountAndShopIdMap.put(curSysUser.getAccount(), curSysUser.getId()); - } - }); +// List curSysUsers = execShopSysUser(); +// curSysUsers.forEach(curSysUser -> { +// if (!curSysUser.getAccount().contains("@")) { +// orginAccountAndShopIdMap.put(curSysUser.getAccount(), curSysUser.getId()); +// } +// }); +// +// execShopInfo(orginAccountAndShopIdMap, oldAndCurShopIdMap, curAndOldShopIdMap); +// execStaffInfo(oldAndCurShopIdMap, curAndOldShopIdMap); - execShopInfo(orginAccountAndShopIdMap, oldAndCurShopIdMap, curAndOldShopIdMap); - execStaffInfo(oldAndCurShopIdMap, curAndOldShopIdMap); + execSysUserFromShopInfo(); + execStaffInfo(); + updateCurlShopBindInfo(); return CzgResult.success("处理成功"); } - private List execSysUser() { - List sysUserList = new ArrayList<>(); - - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.gt(OldSysUser::getUserId, 1); - - Page page = oldSysUserService.page(PageUtils.buildPage(), queryWrapper); - - long startUserId = 100L; + private void execSysUserFromShopInfo() { + Page page = oldShopInfoService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - List oldSysUsers = page.getRecords(); - List curSysUsers = saveOldUser(oldSysUsers, startUserId); - sysUserList.addAll(curSysUsers); + List records = page.getRecords(); + saveSysUserFromShopInfo(records); - page = oldSysUserService.page(PageUtils.buildPage(page.getPageNumber() + 1)); - startUserId += page.getPageSize(); - } - - return sysUserList; - } - - private List execShopInfo(Map orginAccountAndShopIdMap, Map oldAndCurShopIdMap, - Map curAndOldShopIdMap) { - List curShopInfoList = new ArrayList<>(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.gt(OldShopInfo::getId, 1); - Page page = oldShopInfoService.page(PageUtils.buildPage(), queryWrapper); - - while (!page.getRecords().isEmpty()) { - List oldShopInfos = page.getRecords(); - - List curShopInfos = saveOldShopInfo(oldShopInfos, orginAccountAndShopIdMap, oldAndCurShopIdMap, curAndOldShopIdMap); - curShopInfoList.addAll(curShopInfos); - - page = oldShopInfoService.page(PageUtils.buildPage(page.getPageNumber() + 1), queryWrapper); - } - - saveCurAndOldShopId(curAndOldShopIdMap); - - return curShopInfoList; - } - - private void execStaffInfo(Map oldAndCurShopIdMap, Map curAndOldShopIdMap) { - Page page = oldStaffService.page(PageUtils.buildPage()); - - while (!page.getRecords().isEmpty()) { - List oldShopStaffs = page.getRecords(); - saveOldStaffInfo(oldShopStaffs, oldAndCurShopIdMap, curAndOldShopIdMap); - page = oldStaffService.page(PageUtils.buildPage(page.getPageNumber() + 1)); + page = oldShopInfoService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveCurAndOldShopId(Map curAndOldShopIdMap) { - List curShopIdRelations = new ArrayList<>(); - - for (Map.Entry entry : curAndOldShopIdMap.entrySet()) { - CurShopIdRelation curShopIdRelation = new CurShopIdRelation(); - curShopIdRelation.setCurShopId(entry.getKey()); - curShopIdRelation.setOldShopId(entry.getValue()); - curShopIdRelations.add(curShopIdRelation); - } - - shopIdRelationService.saveBatch(curShopIdRelations); - } - - private List saveOldUser(List oldSysUsers, long startUserId) { - if (oldSysUsers == null || oldSysUsers.isEmpty()) { - return new ArrayList<>(); - } - - List curSysUsers = new ArrayList<>(); - for (int i = 0; i < oldSysUsers.size(); i++) { - OldSysUser oldSysUser = oldSysUsers.get(i); - - long userId = startUserId + i; - String password = SecureUtil.md5(userId + "czg123456"); - - CurSysUser curSysUser = new CurSysUser(); - curSysUser.setId(userId); - curSysUser.setAccount(oldSysUser.getUsername()); - curSysUser.setNickName(oldSysUser.getNickName()); - curSysUser.setGender(oldSysUser.getGender()); - curSysUser.setPhone(oldSysUser.getPhone()); - curSysUser.setEmail(oldSysUser.getEmail()); - curSysUser.setAvatar(oldSysUser.getAvatarPath()); - curSysUser.setPassword(password); - curSysUser.setIsAdmin(oldSysUser.getIsAdmin()); - curSysUser.setStauts(oldSysUser.getEnabled().intValue()); - curSysUser.setCreateUserId(1L); - curSysUser.setUpdateUserId(1L); - curSysUser.setCreateTime(oldSysUser.getCreateTime()); - curSysUser.setUpdateTime(LocalDateTime.now()); - - curSysUsers.add(curSysUser); - } - - saveBatch(curSysUsers); - - return curSysUsers; - } - - private List saveOldShopInfo(List oldShopInfos, Map orginAccountAndShopIdMap, - Map oldAndCurShopIdMap, Map curAndOldShopIdMap) { - if (oldShopInfos == null || oldShopInfos.isEmpty()) { - return new ArrayList<>(); + private void saveSysUserFromShopInfo(List records) { + if (records == null || records.isEmpty()) { + return; } List curShopInfos = new ArrayList<>(); - for (OldShopInfo oldShopInfo : oldShopInfos) { - // 新的 shopId 即 新系统的 sys_user_id - Long shopId = orginAccountAndShopIdMap.get(oldShopInfo.getAccount()); - - oldAndCurShopIdMap.put(oldShopInfo.getId(), shopId); - curAndOldShopIdMap.put(shopId, oldShopInfo.getId()); + List curSysUsers = new ArrayList<>(); + for (OldShopInfo oldShopInfo : records) { CurShopInfo curShopInfo = new CurShopInfo(); - curShopInfo.setId(shopId); + curShopInfo.setId(oldShopInfo.getId()); curShopInfo.setSubTitle(oldShopInfo.getSubTitle()); curShopInfo.setShopName(oldShopInfo.getShopName()); curShopInfo.setChainName(oldShopInfo.getChainName()); @@ -244,19 +168,37 @@ public class CurSysUserServiceImpl extends ServiceImpl page = oldStaffService.page(PageUtils.buildPage()); + + while (!page.getRecords().isEmpty()) { + List oldShopStaffs = page.getRecords(); + saveOldStaffInfo(oldShopStaffs); + page = oldStaffService.page(PageUtils.buildPage(page.getPageNumber() + 1)); + } } /** * 处理门店绑定开票信息 */ - private void updateCurlShopBindInfo(List curShopInfos, Map oldAndCurShopIdMap, - Map curAndOldShopIdMap) { + private void updateCurlShopBindInfo() { + List curShopInfos = curShopInfoService.list(); + List oldShopIds = new ArrayList<>(); for (CurShopInfo curShopInfo : curShopInfos) { oldShopIds.add(curShopInfo.getId()); @@ -271,9 +213,8 @@ public class CurSysUserServiceImpl extends ServiceImpl oldShopStaffs, Map oldAndCurShopIdMap, - Map curAndOldShopIdMap) { - List curShopStaffs = new ArrayList<>(); + private void saveOldStaffInfo(List oldShopStaffs) { List curSysUsers = new ArrayList<>(); + List staffIdRelations = new ArrayList<>(); + for (OldPlussShopStaff oldShopStaff : oldShopStaffs) { + OldSysUser oldSysUser = oldSysUserService.getOne(new QueryWrapper().eq(OldSysUser::getUsername, oldShopStaff.getShopId() + "@" + oldShopStaff.getAccount())); + if (oldSysUser == null) { + continue; + } + CurSysUser curSysUser = getUserByOldSysUser(oldSysUser, null); + save(curSysUser); + curSysUser.setPassword(getPassword(curSysUser.getId())); + curSysUsers.add(curSysUser); + CurShopStaff curShopStaff = new CurShopStaff(); - curShopStaff.setId(Long.valueOf(oldShopStaff.getId())); - Long curShopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopStaff.getShopId())); + curShopStaff.setId(curSysUser.getId()); curShopStaff.setCode(oldShopStaff.getCode()); curShopStaff.setName(oldShopStaff.getName()); curShopStaff.setMaxDiscountAmount(oldShopStaff.getMaxDiscountAmount()); curShopStaff.setDiscountType(oldShopStaff.getDiscountType()); curShopStaff.setStatus(oldShopStaff.getStatus()); - curShopStaff.setShopId(curShopId); + curShopStaff.setShopId(Long.valueOf(oldShopStaff.getShopId())); curShopStaff.setType(oldShopStaff.getType()); curShopStaff.setIsManage(oldShopStaff.getIsManage()); curShopStaff.setIsPc(oldShopStaff.getIsPc()); curShopStaff.setCreateTime(DateUtil.toLocalDateTime(oldShopStaff.getCreatedAt() == null ? new Date() : new Date(oldShopStaff.getCreatedAt()))); - curShopStaffs.add(curShopStaff); - CurSysUser curSysUser = getOne(new QueryWrapper().eq(CurSysUser::getAccount, oldShopStaff.getShopId() + "@" + oldShopStaff.getAccount())); - if (curSysUser != null) { - String[] split = curSysUser.getAccount().split("@"); - curSysUser.setAccount(curShopId + "@" + split[1]); - curSysUsers.add(curSysUser); - } + curStaffService.save(curShopStaff); + + CurStaffIdRelation curStaffIdRelation = new CurStaffIdRelation(); + curStaffIdRelation.setCurStaffId(curShopStaff.getId()); + curStaffIdRelation.setOldStaffId(Long.valueOf(oldShopStaff.getId())); + staffIdRelations.add(curStaffIdRelation); } - curStaffService.saveBatch(curShopStaffs); updateBatch(curSysUsers); + curStaffIdRelationMapper.insertBatch(staffIdRelations); + } + + private CurSysUser getUserByOldSysUser(OldSysUser oldSysUser, Long userId) { + CurSysUser curSysUser = new CurSysUser(); + String password = ""; + if (userId != null) { + password = getPassword(userId); + curSysUser.setId(userId); + } + curSysUser.setAccount(oldSysUser.getUsername()); + curSysUser.setNickName(oldSysUser.getNickName()); + curSysUser.setGender(oldSysUser.getGender()); + curSysUser.setPhone(oldSysUser.getPhone()); + curSysUser.setEmail(oldSysUser.getEmail()); + curSysUser.setAvatar(oldSysUser.getAvatarPath()); + curSysUser.setPassword(password); + curSysUser.setIsAdmin(oldSysUser.getIsAdmin()); + curSysUser.setStatus(oldSysUser.getEnabled().intValue()); + curSysUser.setCreateUserId(1L); + curSysUser.setUpdateUserId(1L); + curSysUser.setCreateTime(oldSysUser.getCreateTime()); + curSysUser.setUpdateTime(LocalDateTime.now()); + return curSysUser; + } + + private String getPassword(Long userId) { + return SecureUtil.md5(userId + "czg123456"); } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a42d539..5bfc0e8 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,13 +2,13 @@ mybatis-flex: datasource: ds1: # driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 - username: cashier - password: Cashier@1@ + jdbc-url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com/czg_cashier_test?useUnicode=true&characterEncoding=utf-8 + username: root + password: Czg666888 ds2: # driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf-8 - username: cashier - password: Cashier@1@ + jdbc-url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com/fycashier?useUnicode=true&characterEncoding=utf-8 + username: root + password: Czg666888 diff --git a/src/main/resources/mapper/cur/StaffIdRelationMapper.xml b/src/main/resources/mapper/cur/StaffIdRelationMapper.xml new file mode 100644 index 0000000..0ded842 --- /dev/null +++ b/src/main/resources/mapper/cur/StaffIdRelationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index c4a0464..d908a3f 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -15,3 +15,9 @@ #### 1.2.1 保存新的 shop_id 和 原来shop_id 对应关系 > 表名：shop_id_relation + + +## 接口执行顺序 + +1. 迁移系统用户 +> /merge/user/mergeShopInfo