Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-03-25 1b51c3e64ba8117900d594fcd5b677336e4759bc

Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

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

@@ -1002,4 +1002,39 @@
        }
    }

    @DS("slave")
    public List<SysBedInfo> bedInfoOld() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_bed_info");
        List<SysBedInfo> beds = mapsToListBean(maps, SysBedInfo.class);

        Map<String, Integer> shopIds = getRedisIds("shopId");
        for (SysBedInfo bed : beds) {
            Integer shopId = shopIds.get(bed.getShopId().toString());
            if (shopId != null) {
                bed.setShopId(shopId.longValue());
            } else {
                bed.setShopId(-bed.getShopId());
            }
        }
        return beds;
    }

    @Autowired
    private SysBedInfoDao sysBedInfoDao;

    @Transactional(rollbackFor = Exception.class)
    public void bedInfoNew(List<SysBedInfo> list) {
        if (CollUtil.isNotEmpty(list)) {
            Map<Long, Long> map = new HashMap<>();
            for (SysBedInfo bed : list) {
                Long oldId = bed.getId();
                bed.setId(null);
                sysBedInfoDao.insert(bed);
                map.put(oldId, bed.getId());
            }

            redisClient.saveMapValue("bed_info", map);
        }
    }

}

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

@@ -117,8 +117,13 @@
        dataMove.shoppingGoodsZhkNew(dataMove.shoppingGoodsZhkOld());
    }

    @Test
//    @Test
    public void orderMoveTest() {
        dataMove.orderNew(dataMove.orderOld());
    }

    @Test
    public void bedInfoMoveTest() {
        dataMove.bedInfoNew(dataMove.bedInfoOld());
    }
}