modify

Helius

2021-07-09 e3425cc087f53ef5475002f77592b0f734a4ba86

modify

 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java

@@ -104,6 +104,7 @@
        return shopInfos;
    }

    @Transactional(rollbackFor = Exception.class)
    public void toNewShopInfo(List<SysShopInfo>  shopInfos) {
        if (CollUtil.isNotEmpty(shopInfos)) {
            Map<Long, Long> oldAndNewId = new HashMap<>();
@@ -122,17 +123,20 @@
                query.setShopNo(shopInfo.getShopNo());
                Long oldId = shopInfo.getId();
                shopInfo.setId(null);
                // TODO 若迁往正式环境，这里需要变动
                if (!shopInfo.getShopName().contains("美度") && !shopInfo.getShopName().contains("总店")) {
                    sysShopInfoDao.insert(shopInfo);
                    oldAndNewId.put(oldId, shopInfo.getId());
                } else {
                    if (shopInfo.getShopName().equals("总店")) {
                        shopInfo.setShopName("美度(总部)");
                    }
                    SysShopInfo sysShopInfo = sysShopInfoDao.selectByShopName(shopInfo.getShopName());
                    oldAndNewId.put(oldId, sysShopInfo.getId());
                }

                sysShopInfoDao.insert(shopInfo);
                oldAndNewId.put(oldId, shopInfo.getId());
//                // TODO 若迁往正式环境，这里需要变动
//                if (!shopInfo.getShopName().contains("美度") && !shopInfo.getShopName().contains("总店")) {
//                    sysShopInfoDao.insert(shopInfo);
//                    oldAndNewId.put(oldId, shopInfo.getId());
//                } else {
//                    if (shopInfo.getShopName().equals("总店")) {
//                        shopInfo.setShopName("美度(总部)");
//                    }
//                    SysShopInfo sysShopInfo = sysShopInfoDao.selectByShopName(shopInfo.getShopName());
//                    oldAndNewId.put(oldId, sysShopInfo.getId());
//                }
            }
            redisClient.saveMapValue("shopId", oldAndNewId);
        }
@@ -170,7 +174,7 @@
            sysUsers.setSuRegisterTime((Date) map.get("register_time"));
            sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
            sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
            sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
//            sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
            list.add(sysUsers);
        }
        return list;

 zq-erp/src/main/resources/config/application.yml

@@ -21,18 +21,22 @@
      strict: false
      datasource:
        master:
          url: jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
          username: ct_test
          password: 123456
#          url: jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#          username: ct_test
#          password: 123456
#          driver-class-name: com.mysql.jdbc.Driver
          url: jdbc:mysql://47.111.134.136:3306/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
          username: meidu_data
          password: meidu_4321#&@
          driver-class-name: com.mysql.jdbc.Driver
#          url: jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#          username: hive
#          password: hive123!@#
#          driver-class-name: com.mysql.jdbc.Driver
        slave:
          url: jdbc:mysql://47.111.134.136:3306/db_meidu8300?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
          username: meidu_data
          password: meidu_4321#&@
          url: jdbc:mysql://localhost:3306/db_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
          username: root
          password: root
          driver-class-name: com.mysql.jdbc.Driver
      druid:
        filters: stat,slf4j

 zq-erp/src/test/java/com/matrix/DataMoveTest.java

@@ -58,7 +58,7 @@
    /**
     * 会员信息迁移
     */
//    @Test
    @Test
    public void vipInfoMoveTest() {
        dataMove.vipInfoNew(dataMove.vipInfoOld());
    }