自定义设备id模板修改

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -356,7 +356,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {
             log.info("上传sn注册设备文件解析完毕，总数量：{}", sns.size());
-            JMap<Integer, List<UploadSaveBySn>> group = sns.toMap(UploadSaveBySn::getDeviceTypeValue).group();
+            JMap<Integer, List<UploadSaveBySn>> group = sns.comparing(UploadSaveBySn::getSn).toMap(UploadSaveBySn::getDeviceTypeValue).group();
             group.forEach((deviceTypeValue, uploadSaveBySns) -> {
                 ThreadPoolUtils.Execute execute = ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, uploadSaveBySns.size());
                 //生成设备号