1.主键重复解决

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/SnowflakeIdUtil.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SnowflakeIdUtil {
+
+    public Long nextId() {
+        return IdWorker.getId();
+    }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.config;
 
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -25,11 +24,6 @@ public class MyBatisPlusConfig {
         return globalConfig;
     }
 
-    @Bean
-    public Sequence sequence() {
-        return new Sequence();
-    }
-
     /**
      * pageHelper插件支持
      *

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -31,7 +31,7 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
@@ -66,7 +66,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	DutyPersonShiftServiceImpl dutyPersonShiftService;
 
 	@Autowired
-	Sequence sequence;
+	SnowflakeIdUtil sequence;
 
 	@Autowired
 	HttpServletRequest request;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInstanceDto, DynamicFormInstance, DynamicFormInstanceMapper> implements IDynamicFormInstanceService {
 
     @Autowired
-    Sequence sequence;
+    SnowflakeIdUtil sequence;
 
     @Autowired
     DynamicFormColumnServiceImpl dynamicFormColumnService;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersContractServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
@@ -36,7 +36,7 @@ public class FirefightersContractServiceImpl extends BaseService<FirefightersCon
 	@Autowired
 	SourceFileServiceImpl sourceFileService;
 	@Autowired
-	private Sequence sequence;
+	private SnowflakeIdUtil sequence;
 	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -75,7 +75,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	EquipFeignClient equipFeignClient;
 
 	@Autowired
-	private Sequence sequence;
+	private SnowflakeIdUtil sequence;
 
 	@Value("${auth-key-key-site:key_site_info}")
 	private String authKey;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -65,7 +65,7 @@ public class MaintenanceCompanyServiceImpl
     DynamicFormColumnServiceImpl dynamicFormColumnServiceImpl;
 
     @Autowired
-    Sequence sequence;
+    SnowflakeIdUtil sequence;
 
     @Autowired
     MaintenanceCompanyMapper maintenanceCompanyMapper;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile, SourceFileMapper> implements ISourceFileService {
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     /**
      * 分页查询

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/event/listener/CylinderQuestionCreateEventListener.java

@@ -4,7 +4,7 @@ package com.yeejoin.amos.boot.module.cylinder.biz.event.listener;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderQuestionInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderQuestionInfo;
 import com.yeejoin.amos.boot.module.cylinder.biz.event.CylinderQuestionCreateEvent;
@@ -40,11 +40,11 @@ public class CylinderQuestionCreateEventListener implements ApplicationListener<
 
     private CylinderQuestionInfoServiceImpl cylinderQuestionInfoService;
 
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     public CylinderQuestionCreateEventListener(CylinderInfoServiceImpl cylinderInfoService,
                                                CylinderQuestionInfoServiceImpl cylinderQuestionInfoService,
-                                               Sequence sequence) {
+                                               SnowflakeIdUtil sequence) {
         this.cylinderInfoService = cylinderInfoService;
         this.cylinderQuestionInfoService = cylinderQuestionInfoService;
         this.sequence = sequence;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/event/listener/CylinderStatisticsUnitDayInsertOrUpdateEventListener.java

@@ -5,7 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingRecordStatisticsUnitDayDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingRecordStatisticsUnitDay;
 import com.yeejoin.amos.boot.module.cylinder.biz.event.CylinderStatisticsUnitDayInsertOrUpdateEvent;
@@ -46,12 +46,12 @@ public class CylinderStatisticsUnitDayInsertOrUpdateEventListener implements App
 
     private ReentrantLock reentrantLock = new ReentrantLock();
 
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     private CylinderFillingRecordStatisticsUnitDayServiceImpl statisticsUnitDayService;
 
     public CylinderStatisticsUnitDayInsertOrUpdateEventListener(CylinderFillingRecordStatisticsUnitDayServiceImpl statisticsUnitDayService,
-                                                                Sequence sequence) {
+                                                                SnowflakeIdUtil sequence) {
         this.statisticsUnitDayService = statisticsUnitDayService;
         this.sequence = sequence;
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
@@ -266,7 +266,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     private JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -149,7 +149,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     /***
      * @deprecated 根据查询调教获取分页对象

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
@@ -129,7 +129,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     @Autowired
     private JgUseRegistrationManageServiceImpl registrationManageService;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     private JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -145,7 +145,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     JgRegistrationHistoryServiceImpl registrationHistoryService;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     @Autowired
     JgCertificateChangeRecordServiceImpl certificateChangeRecordService;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -3,7 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -107,7 +107,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     @Autowired
     private IdxBizJgInspectionDetectionInfoServiceImpl jgInspectionDetectionInfoService;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -161,7 +161,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -114,7 +114,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     ESEquipmentCategory esEquipmentCategory;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -112,7 +112,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Autowired
     RedisUtils redisUtils;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -123,7 +123,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     /**
      * 移装移装注销/报废注销判断

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -180,7 +180,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private RedissonClient redissonClient;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     private JgUseRegistrationEqServiceImpl jgUseRegistrationEqService;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -123,7 +123,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
     @Autowired
     private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/EnableRuleDataPreparationListener.java

 package com.yeejoin.amos.boot.module.jyjc.biz.event.listener;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationNoAcceptLog;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.RequestTypeEnum;
@@ -43,7 +43,7 @@ import static com.yeejoin.amos.boot.module.jyjc.api.enums.CategoryEnum.getCatego
 @Slf4j
 public class EnableRuleDataPreparationListener implements ApplicationListener<InspectionOrgRefreshEvent> {
 
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     private RegistrationInfoMapper registrationInfoMapper;
 
@@ -63,7 +63,7 @@ public class EnableRuleDataPreparationListener implements ApplicationListener<In
     private int threadNumber;
 
 
-    public EnableRuleDataPreparationListener(Sequence sequence,
+    public EnableRuleDataPreparationListener(SnowflakeIdUtil sequence,
                                              RegistrationInfoMapper registrationInfoMapper,
                                              RuleCommonServiceImpl ruleCommonService,
                                              InspectionRuleEnableConfig inspectionRuleEnableConfig, InspectionApplicationPushEventListener applicationPushEventListener,
@@ -198,7 +198,7 @@ public class EnableRuleDataPreparationListener implements ApplicationListener<In
     private RegistrationInfo fetchRegistrationInfo(String record) {
         return registrationInfoMapper.selectOne(
                 Wrappers.<RegistrationInfo>lambdaQuery().select(RegistrationInfo::getRecord, RegistrationInfo::getEquCategory,
-                        RegistrationInfo::getEquDefine, RegistrationInfo::getEquList, RegistrationInfo::getWhetherSphericalTank)
+                                RegistrationInfo::getEquDefine, RegistrationInfo::getEquList, RegistrationInfo::getWhetherSphericalTank)
                         .eq(RegistrationInfo::getRecord, record));
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationPushLog;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.EquipCategoryEnum;
@@ -95,7 +95,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     KafkaProducer kafkaProducer;
 
     @Autowired
-    Sequence sequence;
+    SnowflakeIdUtil sequence;
 
 
     /**
@@ -248,7 +248,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     }
 
     private void castStr2JsonField(Map<String, Object> echParamMap) {
-        if(echParamMap != null){
+        if (echParamMap != null) {
             echParamMap.forEach((k, v) -> {
                 if (JyjcConstant.TECH_PARAM_JSON_FIELDS.contains(k) && v != null) {
                     echParamMap.put(k, JSON.parse(v.toString()));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionDetectionSaveToDbEventListener.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.event.listener;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionDetectionSaveToDbEvent;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.BizEmqPublisher;
@@ -40,7 +40,7 @@ public class InspectionDetectionSaveToDbEventListener implements ApplicationList
     CommonServiceImpl commonService;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     @Autowired
     InspectionDetectionInfoMapper inspectionDetectionInfoMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -101,7 +101,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
 
     @Autowired
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     @Autowired
     TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

@@ -17,15 +17,8 @@ feign.client.config.default.read-timeout=30000
 
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5
-eureka.instance.prefer-ip-address=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url-path=/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
 knife4j.production=false
 knife4j.enable=true

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties

@@ -168,4 +168,9 @@ tzs.auth.user.photo=/public/common/userPic.png
 
 tzs.WxApp.appId=wx48a1b1915b10d14b
 tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
-tzs.WxApp.grant-type=authorization_code
+tzs.WxApp.grant-type=authorization_code
\ No newline at end of file
+
+# ??????(0<=datacenter-id<=31)
+mybatis-plus.global-config.datacenter-id=1
+# ??????(0<=worker-id<=31)
+mybatis-plus.global-config.worker-id=2
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/data/CheckRecordDataConsumer.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.patrol.business.data;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -50,7 +50,7 @@ public class CheckRecordDataConsumer implements Runnable {
 
     private AmosRequestContext requestContext;
 
-    private Sequence sequence;
+    private SnowflakeIdUtil sequence;
 
     private CheckMapper checkMapper;
 
@@ -66,7 +66,7 @@ public class CheckRecordDataConsumer implements Runnable {
         inputItemDao = applicationContext.getBean(IInputItemDao.class);
         planTaskDetailMapper = applicationContext.getBean(PlanTaskDetailMapper.class);
         requestContext = applicationContext.getBean(AmosRequestContext.class);
-        sequence = applicationContext.getBean(Sequence.class);
+        sequence = applicationContext.getBean(SnowflakeIdUtil.class);
         checkMapper = applicationContext.getBean(CheckMapper.class);
         checkInputMapper = applicationContext.getBean(CheckInputMapper.class);
     }