sn导入设备模板修改

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

@@ -8,6 +8,7 @@ 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.extension.service.impl.ServiceImpl;
+import com.github.yitter.idgen.YitIdHelper;
 import com.xy.annotation.Lock;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
@@ -284,7 +285,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
                 .execute(() -> {
                     try {
-                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, alipayDeviceService, devicePc)).sheet().doRead();
+                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, alipayDeviceService)).sheet().doRead();
                     } catch (IOException e) {
                         log.error("", e);
                     }
@@ -317,8 +318,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
         private final AlipayDeviceService alipayDeviceService;
 
-        private final String devicePc;
-
         private JList<UploadSaveBySn> sns = new JArrayList<>();
 
         /**
@@ -342,6 +341,9 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             if (deviceTypeValue == null) {
                 return;
             }
+            if (!Emptys.check(data.getDevicePc())) {
+                return;
+            }
             data.setDeviceTypeValue(deviceTypeValue);
             sns.add(data);
         }
@@ -353,7 +355,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          */
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {
-            log.info("上传sn注册设备文件解析完毕，总数量：{}，批次：{}", sns.size(), devicePc);
+            log.info("上传sn注册设备文件解析完毕，总数量：{}", sns.size());
             JMap<Integer, List<UploadSaveBySn>> group = sns.toMap(UploadSaveBySn::getDeviceTypeValue).group();
             group.forEach((deviceTypeValue, uploadSaveBySns) -> {
                 ThreadPoolUtils.Execute execute = ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, uploadSaveBySns.size());
@@ -361,29 +363,29 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 JList<DeviceCreateIds> deviceCreateIds = deviceCreateIdsService.save(new DeviceCreateIdsDto.Save()
                         .setDeviceType(deviceTypeValue)
                         .setDoorType("1")
-                        .setCreatePc(devicePc)
+                        .setCreatePc(String.valueOf(YitIdHelper.nextId()))
                         .setNum(uploadSaveBySns.size())
                 ).getData();
                 //注册设备
                 for (int i = 0; i < uploadSaveBySns.size(); i++) {
-                    UploadSaveBySn sn = uploadSaveBySns.get(i);
+                    UploadSaveBySn uploadSaveBySn = uploadSaveBySns.get(i);
                     Long deviceId = deviceCreateIds.get(i).getDeviceId();
                     execute.execute(() -> {
                         DeviceRegisterDto.Save save = new DeviceRegisterDto.Save()
                                 .setDeviceId(deviceId)
-                                .setDeviceSn(sn.getSn())
-                                .setDevicePc(devicePc)
-                                .setAssetNo(sn.getAssetNo());
+                                .setDeviceSn(uploadSaveBySn.getSn())
+                                .setDevicePc(uploadSaveBySn.getDevicePc())
+                                .setAssetNo(uploadSaveBySn.getAssetNo());
                         R r = deviceRegisterService.save(save);
                         if (r.getCode() == R.Enum.FAIL.getCode()) {
-                            log.error("{},{}", sn.getSn(), r.getMsg());
+                            log.error("{},{}", uploadSaveBySn.getSn(), r.getMsg());
                         } else {
                             //初始化支付宝设备
                             if (deviceTypeValue == 5) {
                                 alipayDeviceService.deviceAssign(new DeviceAssignDTO()
                                         .setTerminalId(String.valueOf(deviceId))
                                         .setDeviceIdentifyType("DYNAMIC")
-                                        .setDeviceSn(sn.getSn())
+                                        .setDeviceSn(uploadSaveBySn.getSn())
                                         .setDeviceName(String.valueOf(deviceId))
                                 );
                             }
@@ -392,7 +394,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 }
                 execute.end();
             });
-            log.info("上传sn注册设备注册完毕，批次：{}", devicePc);
+            log.info("上传sn注册设备注册完毕");
         }
     }
 
@@ -414,6 +416,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          */
         private String assetNo;
 
+        /**
+         * 批次号
+         */
+        private String devicePc;
+
         /**
          * 设备类型值
          */