优化了推送流程

final-device/src/main/java/org/brynhild/graduation/device/service/impl/AdminServiceImpl.groovy

@@ -490,16 +490,18 @@ class AdminServiceImpl implements IAdminService {
         if(device==null){
             return new Result(false,"设备不存在")
         }
-        def optional = fingerPrintDataRepository.findById(info.id)
-        if(optional.isEmpty()){
-            return new Result(false,"数据不存在")
-        }
-        def fingerPrintData = optional.get()
-        def result = mqttHandler.sendMessageToDevice(info.mac, fingerPrintData.convertToBytes())
-        if(result){
-            return new Result(true,"数据已推送")
+        def listOfData = fingerPrintDataRepository.findAllById(info.id)
+        if(listOfData.size()!=info.id.size()){
+            return new Result(false,"数据不一致")
+        }
+        for(FingerPrintData data:listOfData){
+            def result = mqttHandler.sendMessageToDevice(info.mac, fingerPrintData.convertToBytes())
+            if(!result){
+                return new Result(false,"信息发送失败")
+            }
         }
-        return new Result(false,"信息发送失败")
+        def commit=new AdminCommitPush(info.mac)
+        return commitPush(commit,token)
     }
 
     @Override

final-transfer/src/main/java/org/brynhild/graduation/Main.java

@@ -5,7 +5,7 @@ import org.brynhild.graduation.common.parser.DataClassGenerator;
 public class Main {
     public static void main(String[] args) {
         DataClassGenerator.generate("dataClassDir",
-                "org.brynhild.graduation.transfer.device.bo",
-                "org.brynhild.graduation.common.transfer.bo.device");
+                "org.brynhild.graduation.transfer.device.vo",
+                "org.brynhild.graduation.common.transfer.vo.device");
     }
 }

final-transfer/src/main/java/org/brynhild/graduation/transfer/device/vo/AdminCommitPush.java

@@ -1,10 +1,14 @@
 package org.brynhild.graduation.transfer.device.vo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AdminCommitPush {
     @NotBlank
     private String mac;

final-transfer/src/main/java/org/brynhild/graduation/transfer/device/vo/AdminPushFingerPrintDataToDevice.java

@@ -4,11 +4,12 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class AdminPushFingerPrintDataToDevice {
     @NotBlank
     private String mac;
     @NotNull
-    private Long id;
+    private List<Long> id;
 }