Merge remote-tracking branch 'origin/20200908' into 20200908

meter-reading-tianjin/src/main/java/com/huaxu/zoniot/web/MigrateController.java

@@ -32,15 +32,14 @@ public class MigrateController {
     @Value("${customer.code}")
     Integer customerCode;
 
-    @Value("${device.type.nb.code}")
-    Integer deviceTypeCode;
 
     @GetMapping("/migrate")
     @ApiOperation(value = "档案迁移接口")
     @Async
     public String migrateFile(
             @ApiParam(value = "文件名称", required = true)@RequestParam String fileName ,
-            @ApiParam(value = "文件路径", required = true) @RequestParam String path) {
+            @ApiParam(value = "文件路径", required = true) @RequestParam String path,
+            @ApiParam(value = "设备类型", required = true) @RequestParam Integer deviceTypeCode) {
         WaterMigrateRequest request = new WaterMigrateRequest();
         request.setCustomerCode(customerCode);
         request.setName(fileName);