diff --git a/mallinkService/src/main/java/com/simple/common/IdWorker.java b/mallinkService/src/main/java/com/simple/common/IdWorker.java index 4fcaf19f7..4dab63061 100644 --- a/mallinkService/src/main/java/com/simple/common/IdWorker.java +++ b/mallinkService/src/main/java/com/simple/common/IdWorker.java @@ -44,6 +44,20 @@ public class IdWorker { /** 上次生成ID的时间截 */ 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===================================== /** * 构造函数 @@ -124,7 +138,7 @@ public class IdWorker { /** 测试 */ public static void main(String[] args) { System.out.println(System.currentTimeMillis()); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); long startTime = System.nanoTime(); for (int i = 0; i < 50000; i++) { long id = idWorker.nextId(); diff --git a/mallinkService/src/main/java/com/simple/service/WxOrdersService.java b/mallinkService/src/main/java/com/simple/service/WxOrdersService.java index 1da23b985..d022611f4 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrdersService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrdersService.java @@ -10,8 +10,8 @@ public interface WxOrdersService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxOrders record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java index 9e8b0410b..d28484338 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java @@ -33,7 +33,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService public void saveOrUpdate(MallRolePermission record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); mallUserRolePermissionMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java index 628f2a2ea..1c2401cb5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java @@ -34,7 +34,7 @@ public class MallRoleServiceImpl implements MallRoleService { public void saveOrUpdate(MallRole record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); mallRoleMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java index da88d44b6..70295f00c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java @@ -35,7 +35,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public void saveOrUpdate(MallUserInfo record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); mallUserInfoMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java index a0bfddc09..070a588bf 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java @@ -32,7 +32,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { public void saveOrUpdate(MallUserRole record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); mallUserRoleMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java index 872453007..09f919355 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java @@ -31,7 +31,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { public void saveOrUpdate(WxAppinfo record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxAppinfoMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java index 48f92767b..5f7a88c1b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java @@ -31,7 +31,7 @@ public class WxBLogServiceImpl implements WxBLogService { public void saveOrUpdate(WxBLog record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxBLogMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java index 60ce915b0..9c5e4b508 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java @@ -31,7 +31,7 @@ public class WxBannersServiceImpl implements WxBannersService { public void saveOrUpdate(WxBanners record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxBannersMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java index 3bbdc1d7e..45e380c32 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java @@ -31,7 +31,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { public void saveOrUpdate(WxBusiness record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxBusinessMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java index 8b4cdd084..ad62b7968 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java @@ -31,7 +31,7 @@ public class WxCLogServiceImpl implements WxCLogService { public void saveOrUpdate(WxCLog record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCLogMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java index e4ae5905d..dac16838d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java @@ -31,7 +31,7 @@ public class WxCUserCarsServiceImpl implements WxCUserCarsService { public void saveOrUpdate(WxCUserCars record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCUserCarsMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java index 6b4d2a923..589ea41a5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java @@ -31,7 +31,7 @@ public class WxCUserServiceImpl implements WxCUserService { public void saveOrUpdate(WxCUser record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCUserMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java index 2fb9c8690..e25a4c2db 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java @@ -31,7 +31,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { public void saveOrUpdate(WxCUserTags record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCUserTagsMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java index 7d2ac8975..1c61ed47c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java @@ -31,7 +31,7 @@ public class WxCarCmdLogsServiceImpl implements WxCarCmdLogsService { public void saveOrUpdate(WxCarCmdLogs record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCarCmdLogsMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java index f69dd4b67..788336530 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { public void saveOrUpdate(WxCouponActionLog record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponActionLogMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java index 4a753534d..584a3fdd3 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponCarServiceImpl implements WxCouponCarService { public void saveOrUpdate(WxCouponCar record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponCarMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java index 02e96450e..84b282292 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { public void saveOrUpdate(WxCouponSend record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponSendMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index b174647fb..12d8b9caf 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponServiceImpl implements WxCouponService { public void saveOrUpdate(WxCoupon record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java index 6aaf39920..88375978d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponTargetServiceImpl implements WxCouponTargetService { public void saveOrUpdate(WxCouponTarget record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponTargetMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java index 95c3e8095..e3c7b92b3 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponTypeServiceImpl implements WxCouponTypeService { public void saveOrUpdate(WxCouponType record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponTypeMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java index cbaaf722e..3ab97542a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java @@ -31,7 +31,7 @@ public class WxCouponVerifyServiceImpl implements WxCouponVerifyService { public void saveOrUpdate(WxCouponVerify record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponVerifyMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java index 95e62e198..cb49c5795 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java @@ -31,7 +31,7 @@ public class WxFlashSaleServiceImpl implements WxFlashSaleService { public void saveOrUpdate(WxFlashSale record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxFlashSaleMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java index 31476eb1d..ea38e3407 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java @@ -31,7 +31,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { public void saveOrUpdate(WxMallBuilding record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMallBuildingMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java index e42db49f2..f0b651088 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java @@ -31,7 +31,7 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { public void saveOrUpdate(WxMallFloor record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMallFloorMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java index f627d9080..45aa17970 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java @@ -31,7 +31,7 @@ public class WxMallServiceImpl implements WxMallService { public void saveOrUpdate(WxMall record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMallMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java index f06977958..10702a947 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { public void saveOrUpdate(WxMerchantBUser record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMerchantBUserMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 8e8c9f229..76129ab48 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { public void saveOrUpdate(WxMerchant record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMerchantMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java index db2854804..990924ebf 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantShopServiceImpl implements WxMerchantShopService { public void saveOrUpdate(WxMerchantShop record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMerchantShopMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java index 5c31ca88d..4c3bb1387 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ public void saveOrUpdate(WxMerchantTradeDaily record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMerchantTradeDailyMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java index f6610976e..b8caa707a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java @@ -38,7 +38,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @Override public void saveOrUpdate(WxMsgCallback record) { if (record.getId() == null) { - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMsgCallbackMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java index 697696490..d67ce299d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java @@ -31,7 +31,7 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { public void saveOrUpdate(WxMsgConfig record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMsgConfigMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java index 4dbbee08d..431f78ae8 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java @@ -103,7 +103,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { String ret = jsonObjectResult.get("ret").toString(); if (ret.equals("1") || ret.equals("-6")) { if (wxMsgModel.getId() == null) { - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setTenantId(tenantid); wxMsgModel.setCreatetime(new Date()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java index ed5e00003..3c09ae7c6 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -57,7 +57,7 @@ public class WxMsgServiceImpl implements WxMsgService { if (wxMsg.getId() == null) { //草稿 if (wxMsg.getSendstatus() == 2) { - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); wxMsgMapper.insertSelective(wxMsg); return new ResultData(Result.SUCCESS, "已保存到草稿箱"); @@ -70,7 +70,7 @@ public class WxMsgServiceImpl implements WxMsgService { sendmsg(wxMsg); } else { wxMsg.setStatus(0); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); wxMsgMapper.insertSelective(wxMsg); return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); @@ -177,7 +177,7 @@ public class WxMsgServiceImpl implements WxMsgService { } if (wxMsg.getId() == null) { - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); wxMsgMapper.insertSelective(wxMsg); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java index e912ae7d3..47075f1f6 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java @@ -31,7 +31,7 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { public void saveOrUpdate(WxMsgSignature record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setTenantId("1"); record.setCreatetime(new Date()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java index 3feddc1ae..492482391 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java @@ -31,7 +31,7 @@ public class WxOrdersServiceImpl implements WxOrdersService { public void saveOrUpdate(WxOrders record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxOrdersMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java index 70b8c1f0c..249fba95b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java @@ -31,7 +31,7 @@ public class WxParkServiceImpl implements WxParkService { public void saveOrUpdate(WxPark record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxParkMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java index 91d0f2f5a..2193f4222 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java @@ -31,7 +31,7 @@ public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { public void saveOrUpdate(WxScoreHistory record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxScoreHistoryMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java index 470ed8bda..e7f57d766 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java @@ -31,7 +31,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public void saveOrUpdate(WxScoreRules record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxScoreRulesMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java index 50df44316..10b5fae48 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java @@ -31,7 +31,7 @@ public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodSe public void saveOrUpdate(WxScoreValidityPeriod record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxScoreValidityPeriodMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java index 33a6d0940..7a13d4a7e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -31,7 +31,7 @@ public class WxShopServiceImpl implements WxShopService { public void saveOrUpdate(WxShop record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxShopMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java index 3d065caf5..921fe7b3c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java @@ -31,7 +31,7 @@ public class WxTagsServiceImpl implements WxTagsService { public void saveOrUpdate(WxTags record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxTagsMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java index b82ffc984..ac3e59c9b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java @@ -31,7 +31,7 @@ public class WxWebLogServiceImpl implements WxWebLogService { public void saveOrUpdate(WxWebLog record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxWebLogMapper.insertSelective(record); } else {