上传sn文件注册设备

device-api-service-alipay/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xy-device</artifactId>
+        <groupId>com.xy</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>device-api-service-alipay</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>device-api-service</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

device-api-service-alipay/src/main/java/com/xy/AliPayDeviceRegisterController.java

@@ -0,0 +1,27 @@
+package com.xy;
+
+import com.xy.annotate.RestMappingController;
+import com.xy.service.DeviceRegisterServiceImpl;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+@Slf4j
+@AllArgsConstructor
+@Api(tags = "支付宝-设备-注册登记")
+@RestMappingController("alipay-device-register")
+public class AliPayDeviceRegisterController {
+
+    private DeviceRegisterServiceImpl deviceRegisterService;
+
+    @ApiOperation("上传sn注册设备")
+    @PostMapping("uploadSaveBySn")
+    public R uploadSaveBySn(@RequestParam("file") MultipartFile file, @RequestParam("deviceType") Integer deviceType) {
+        return deviceRegisterService.uploadSaveBySn(file, deviceType);
+    }
+}

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

@@ -26,7 +26,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -261,11 +260,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     @ApiOperation("上传sn注册设备")
     @PostMapping("uploadSaveBySn")
-    public R uploadSaveBySn(@RequestParam("file") MultipartFile file) {
+    public R uploadSaveBySn(@RequestParam("file") MultipartFile file, @RequestParam("deviceType") Integer deviceType) {
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
                 .execute(() -> {
                     try {
-                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this)).sheet().doRead();
+                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, deviceType)).sheet().doRead();
                     } catch (IOException e) {
                         log.error("", e);
                     }
@@ -281,6 +280,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
         private final DeviceRegisterServiceImpl deviceRegisterService;
 
+        private final Integer deviceType;
+
         private List<UploadSaveBySn> sns = new ArrayList<>();
 
         /**
@@ -305,7 +306,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             log.info("上传sn注册设备文件解析完毕，总数量：{}，批次：{}", sns.size(), pc);
             //生成设备号
             JList<DeviceCreateIds> deviceCreateIds = deviceCreateIdsService.save(new DeviceCreateIdsDto.Save()
-                    .setDeviceType(1)
+                    .setDeviceType(deviceType)
                     .setDoorType("1")
                     .setCreatePc(pc)
                     .setNum(sns.size())

device-start/pom.xml

@@ -29,12 +29,16 @@
             <artifactId>device-api-service-merc-mini</artifactId>
             <version>1.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.xy</groupId>
             <artifactId>device-api-service-member</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>device-api-service-alipay</artifactId>
+            <version>1.0</version>
+        </dependency>
 
         <dependency>
             <groupId>com.xy</groupId>

pom.xml

@@ -14,6 +14,7 @@
         <module>device-start</module>
         <module>device-api-service-merc-mini</module>
         <module>device-api-service-member</module>
+        <module>device-api-service-alipay</module>
     </modules>
     <packaging>pom</packaging>