| @@ -44,6 +44,20 @@ public class IdWorker { | |||||
| /** 上次生成ID的时间截 */ | /** 上次生成ID的时间截 */ | ||||
| private long lastTimestamp = -1L; | private long lastTimestamp = -1L; | ||||
| ///////////////////////////////////////////////////////////////////////////////// | |||||
| private static class IdGenHolder { | |||||
| private static final IdWorker instance = new IdWorker(); | |||||
| } | |||||
| public static IdWorker get(){ | |||||
| return IdGenHolder.instance; | |||||
| } | |||||
| public IdWorker() { | |||||
| this(0L, 0L); | |||||
| } | |||||
| //==============================Constructors===================================== | //==============================Constructors===================================== | ||||
| /** | /** | ||||
| * 构造函数 | * 构造函数 | ||||
| @@ -124,7 +138,7 @@ public class IdWorker { | |||||
| /** 测试 */ | /** 测试 */ | ||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| System.out.println(System.currentTimeMillis()); | System.out.println(System.currentTimeMillis()); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| long startTime = System.nanoTime(); | long startTime = System.nanoTime(); | ||||
| for (int i = 0; i < 50000; i++) { | for (int i = 0; i < 50000; i++) { | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| @@ -10,8 +10,8 @@ public interface WxOrdersService { | |||||
| * 根据实体查询分页列表 | * 根据实体查询分页列表 | ||||
| * | * | ||||
| * @param record | * @param record | ||||
| * @param offset | |||||
| * @param limit | |||||
| * @param pageIndex | |||||
| * @param pageSize | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| PageInfo<WxOrders> listAsPage(WxOrders record, Integer pageIndex, Integer pageSize); | PageInfo<WxOrders> listAsPage(WxOrders record, Integer pageIndex, Integer pageSize); | ||||
| @@ -33,7 +33,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService | |||||
| public void saveOrUpdate(MallRolePermission record) { | public void saveOrUpdate(MallRolePermission record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallUserRolePermissionMapper.insertSelective(record); | mallUserRolePermissionMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -34,7 +34,7 @@ public class MallRoleServiceImpl implements MallRoleService { | |||||
| public void saveOrUpdate(MallRole record) { | public void saveOrUpdate(MallRole record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallRoleMapper.insertSelective(record); | mallRoleMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -35,7 +35,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| public void saveOrUpdate(MallUserInfo record) { | public void saveOrUpdate(MallUserInfo record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallUserInfoMapper.insertSelective(record); | mallUserInfoMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -32,7 +32,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { | |||||
| public void saveOrUpdate(MallUserRole record) { | public void saveOrUpdate(MallUserRole record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallUserRoleMapper.insertSelective(record); | mallUserRoleMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { | |||||
| public void saveOrUpdate(WxAppinfo record) { | public void saveOrUpdate(WxAppinfo record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxAppinfoMapper.insertSelective(record); | wxAppinfoMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxBLogServiceImpl implements WxBLogService { | |||||
| public void saveOrUpdate(WxBLog record) { | public void saveOrUpdate(WxBLog record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxBLogMapper.insertSelective(record); | wxBLogMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxBannersServiceImpl implements WxBannersService { | |||||
| public void saveOrUpdate(WxBanners record) { | public void saveOrUpdate(WxBanners record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxBannersMapper.insertSelective(record); | wxBannersMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| public void saveOrUpdate(WxBusiness record) { | public void saveOrUpdate(WxBusiness record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxBusinessMapper.insertSelective(record); | wxBusinessMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCLogServiceImpl implements WxCLogService { | |||||
| public void saveOrUpdate(WxCLog record) { | public void saveOrUpdate(WxCLog record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCLogMapper.insertSelective(record); | wxCLogMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCUserCarsServiceImpl implements WxCUserCarsService { | |||||
| public void saveOrUpdate(WxCUserCars record) { | public void saveOrUpdate(WxCUserCars record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCUserCarsMapper.insertSelective(record); | wxCUserCarsMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| public void saveOrUpdate(WxCUser record) { | public void saveOrUpdate(WxCUser record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCUserMapper.insertSelective(record); | wxCUserMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| public void saveOrUpdate(WxCUserTags record) { | public void saveOrUpdate(WxCUserTags record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCUserTagsMapper.insertSelective(record); | wxCUserTagsMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCarCmdLogsServiceImpl implements WxCarCmdLogsService { | |||||
| public void saveOrUpdate(WxCarCmdLogs record) { | public void saveOrUpdate(WxCarCmdLogs record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCarCmdLogsMapper.insertSelective(record); | wxCarCmdLogsMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { | |||||
| public void saveOrUpdate(WxCouponActionLog record) { | public void saveOrUpdate(WxCouponActionLog record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponActionLogMapper.insertSelective(record); | wxCouponActionLogMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponCarServiceImpl implements WxCouponCarService { | |||||
| public void saveOrUpdate(WxCouponCar record) { | public void saveOrUpdate(WxCouponCar record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponCarMapper.insertSelective(record); | wxCouponCarMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { | |||||
| public void saveOrUpdate(WxCouponSend record) { | public void saveOrUpdate(WxCouponSend record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponSendMapper.insertSelective(record); | wxCouponSendMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| public void saveOrUpdate(WxCoupon record) { | public void saveOrUpdate(WxCoupon record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponMapper.insertSelective(record); | wxCouponMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponTargetServiceImpl implements WxCouponTargetService { | |||||
| public void saveOrUpdate(WxCouponTarget record) { | public void saveOrUpdate(WxCouponTarget record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponTargetMapper.insertSelective(record); | wxCouponTargetMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponTypeServiceImpl implements WxCouponTypeService { | |||||
| public void saveOrUpdate(WxCouponType record) { | public void saveOrUpdate(WxCouponType record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponTypeMapper.insertSelective(record); | wxCouponTypeMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxCouponVerifyServiceImpl implements WxCouponVerifyService { | |||||
| public void saveOrUpdate(WxCouponVerify record) { | public void saveOrUpdate(WxCouponVerify record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxCouponVerifyMapper.insertSelective(record); | wxCouponVerifyMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxFlashSaleServiceImpl implements WxFlashSaleService { | |||||
| public void saveOrUpdate(WxFlashSale record) { | public void saveOrUpdate(WxFlashSale record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxFlashSaleMapper.insertSelective(record); | wxFlashSaleMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| public void saveOrUpdate(WxMallBuilding record) { | public void saveOrUpdate(WxMallBuilding record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMallBuildingMapper.insertSelective(record); | wxMallBuildingMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { | |||||
| public void saveOrUpdate(WxMallFloor record) { | public void saveOrUpdate(WxMallFloor record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMallFloorMapper.insertSelective(record); | wxMallFloorMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMallServiceImpl implements WxMallService { | |||||
| public void saveOrUpdate(WxMall record) { | public void saveOrUpdate(WxMall record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMallMapper.insertSelective(record); | wxMallMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| public void saveOrUpdate(WxMerchantBUser record) { | public void saveOrUpdate(WxMerchantBUser record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMerchantBUserMapper.insertSelective(record); | wxMerchantBUserMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| public void saveOrUpdate(WxMerchant record) { | public void saveOrUpdate(WxMerchant record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMerchantMapper.insertSelective(record); | wxMerchantMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMerchantShopServiceImpl implements WxMerchantShopService { | |||||
| public void saveOrUpdate(WxMerchantShop record) { | public void saveOrUpdate(WxMerchantShop record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMerchantShopMapper.insertSelective(record); | wxMerchantShopMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| public void saveOrUpdate(WxMerchantTradeDaily record) { | public void saveOrUpdate(WxMerchantTradeDaily record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMerchantTradeDailyMapper.insertSelective(record); | wxMerchantTradeDailyMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -38,7 +38,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { | |||||
| @Override | @Override | ||||
| public void saveOrUpdate(WxMsgCallback record) { | public void saveOrUpdate(WxMsgCallback record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMsgCallbackMapper.insertSelective(record); | wxMsgCallbackMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { | |||||
| public void saveOrUpdate(WxMsgConfig record) { | public void saveOrUpdate(WxMsgConfig record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxMsgConfigMapper.insertSelective(record); | wxMsgConfigMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -103,7 +103,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { | |||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| if (ret.equals("1") || ret.equals("-6")) { | if (ret.equals("1") || ret.equals("-6")) { | ||||
| if (wxMsgModel.getId() == null) { | if (wxMsgModel.getId() == null) { | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| wxMsgModel.setId(idWorker.nextId()); | wxMsgModel.setId(idWorker.nextId()); | ||||
| wxMsgModel.setTenantId(tenantid); | wxMsgModel.setTenantId(tenantid); | ||||
| wxMsgModel.setCreatetime(new Date()); | wxMsgModel.setCreatetime(new Date()); | ||||
| @@ -57,7 +57,7 @@ public class WxMsgServiceImpl implements WxMsgService { | |||||
| if (wxMsg.getId() == null) { | if (wxMsg.getId() == null) { | ||||
| //草稿 | //草稿 | ||||
| if (wxMsg.getSendstatus() == 2) { | if (wxMsg.getSendstatus() == 2) { | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| wxMsg.setId(idWorker.nextId()); | wxMsg.setId(idWorker.nextId()); | ||||
| wxMsgMapper.insertSelective(wxMsg); | wxMsgMapper.insertSelective(wxMsg); | ||||
| return new ResultData(Result.SUCCESS, "已保存到草稿箱"); | return new ResultData(Result.SUCCESS, "已保存到草稿箱"); | ||||
| @@ -70,7 +70,7 @@ public class WxMsgServiceImpl implements WxMsgService { | |||||
| sendmsg(wxMsg); | sendmsg(wxMsg); | ||||
| } else { | } else { | ||||
| wxMsg.setStatus(0); | wxMsg.setStatus(0); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| wxMsg.setId(idWorker.nextId()); | wxMsg.setId(idWorker.nextId()); | ||||
| wxMsgMapper.insertSelective(wxMsg); | wxMsgMapper.insertSelective(wxMsg); | ||||
| return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); | return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); | ||||
| @@ -177,7 +177,7 @@ public class WxMsgServiceImpl implements WxMsgService { | |||||
| } | } | ||||
| if (wxMsg.getId() == null) { | if (wxMsg.getId() == null) { | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| wxMsg.setId(idWorker.nextId()); | wxMsg.setId(idWorker.nextId()); | ||||
| wxMsgMapper.insertSelective(wxMsg); | wxMsgMapper.insertSelective(wxMsg); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { | |||||
| public void saveOrUpdate(WxMsgSignature record) { | public void saveOrUpdate(WxMsgSignature record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| record.setTenantId("1"); | record.setTenantId("1"); | ||||
| record.setCreatetime(new Date()); | record.setCreatetime(new Date()); | ||||
| @@ -31,7 +31,7 @@ public class WxOrdersServiceImpl implements WxOrdersService { | |||||
| public void saveOrUpdate(WxOrders record) { | public void saveOrUpdate(WxOrders record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxOrdersMapper.insertSelective(record); | wxOrdersMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxParkServiceImpl implements WxParkService { | |||||
| public void saveOrUpdate(WxPark record) { | public void saveOrUpdate(WxPark record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxParkMapper.insertSelective(record); | wxParkMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { | |||||
| public void saveOrUpdate(WxScoreHistory record) { | public void saveOrUpdate(WxScoreHistory record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxScoreHistoryMapper.insertSelective(record); | wxScoreHistoryMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| public void saveOrUpdate(WxScoreRules record) { | public void saveOrUpdate(WxScoreRules record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxScoreRulesMapper.insertSelective(record); | wxScoreRulesMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodSe | |||||
| public void saveOrUpdate(WxScoreValidityPeriod record) { | public void saveOrUpdate(WxScoreValidityPeriod record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxScoreValidityPeriodMapper.insertSelective(record); | wxScoreValidityPeriodMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| public void saveOrUpdate(WxShop record) { | public void saveOrUpdate(WxShop record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxShopMapper.insertSelective(record); | wxShopMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxTagsServiceImpl implements WxTagsService { | |||||
| public void saveOrUpdate(WxTags record) { | public void saveOrUpdate(WxTags record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxTagsMapper.insertSelective(record); | wxTagsMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| @@ -31,7 +31,7 @@ public class WxWebLogServiceImpl implements WxWebLogService { | |||||
| public void saveOrUpdate(WxWebLog record) { | public void saveOrUpdate(WxWebLog record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| IdWorker idWorker = new IdWorker(0, 0); | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxWebLogMapper.insertSelective(record); | wxWebLogMapper.insertSelective(record); | ||||
| } else { | } else { | ||||