Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java

@@ -12,5 +12,9 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 public class UpdateFirmwareCommand {
-	List<String> pileSnList;
+	private List<String> pileSnList;
+
+	// /update.bin
+	private String filePath;
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java

@@ -0,0 +1,24 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UpdateFirmwareDTO {
+    /**
+     * 桩编码List
+     */
+    private List<String> pileSns;
+
+    /**
+     * 固件路径
+     */
+    private String filePath;
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java

@@ -340,7 +340,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
 			byte[] passwordByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.updateServerPassword), 32);
 
 			// 文件路径
-			byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.filePath), 64);
+			byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getFilePath()), 64);
 
 			// 执行控制   01：立即执行  02：空闲执行
 			byte[] performTypeByteArr = Constants.oneByteArray;