上传sn文件注册设备

device-api-service-alipay/pom.xml

@@ -11,17 +11,4 @@
 
     <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

@@ -1,27 +0,0 @@
-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, @RequestParam("devicePc") String devicePc, @RequestParam("assetNo") String assetNo) {
-        return deviceRegisterService.uploadSaveBySn(file, deviceType, devicePc, assetNo);
-    }
-}

device-api-service/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>merc-api</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>

device-api-service/src/main/java/com/xy/utils/enums/DictEnum.java

@@ -33,6 +33,8 @@ public enum DictEnum {
 
     DEVICE_CHARGING("device_charging", "设备计费标准"),
 
+    DEVICE_TYPE("device_type", "设备-机器类型"),
+
     ;
 
     private String key;

device-api-service/src/main/java/com/xy/utils/enums/DictSonEnum.java

@@ -60,6 +60,8 @@ public enum DictSonEnum {
 
     DEVICE_CHARGING_101("101", "设备计费标准-其他续费方式"),
 
+    DEVICE_TYPE_5("5", "设备-机器类型-支付宝视动态觉柜"),
+
     ;
 
     private String key;

device-start/pom.xml

@@ -34,11 +34,6 @@
             <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>