Merge branch 'master' of http://111.61.77.35:9999/gengdidi/zh-mes-device-data-process

src/main/java/com/zehong/controller/PcbBoardEngraveDataController.java

@@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zehong.entity.AjaxResult;
 import com.zehong.entity.PcbBoardEngraveData;
 import com.zehong.service.PcbBoardEngraveDataService;
+import com.zehong.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Size;
 import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -54,19 +57,24 @@ public class PcbBoardEngraveDataController extends BaseController{
 
     /**
      * 板镭雕机数据保存
-     * @param data
-     * @return
+     * @param data d
+     * @return r
      */
     @PostMapping("savePcbBoardEngraveData")
-    public AjaxResult savePcbBoardEngraveData(@Valid @RequestBody PcbBoardEngraveData data, BindingResult bindingResult){
-        if (bindingResult.hasErrors()) {
-            String errorStr = bindingResult.getFieldErrors().stream()
-                    .map(error -> error.getField() + ": " + error.getDefaultMessage())
-                    .collect(Collectors.joining(", "));
-            return AjaxResult.error(errorStr);
+    public AjaxResult savePcbBoardEngraveDataList(@RequestBody List<PcbBoardEngraveData> data){
+
+        if(data == null || data.size() ==  0) {
+            return AjaxResult.error("数据不能为空");
         }
-        data.setCreateTime(new Date());
-        return toAjax(pcbBoardEngraveDataService.save(data));
+
+        for (PcbBoardEngraveData datum : data) {
+            if(StringUtils.isBlank(datum.getfPrintTime()) || StringUtils.isBlank(datum.getfContent())) {
+                return AjaxResult.error("数据不能为空");
+            }
+        }
+
+        data.forEach(item -> item.setCreateTime(new Date()));
+        return toAjax(pcbBoardEngraveDataService.saveBatch(data));
     }
 }