From a505f9a5058eeea4e6056549e11dea6c619420da Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 一月 2021 00:07:31 +0800
Subject: [PATCH] 车辆黑白名单中加入 车辆停车场ID

---
 service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
index c84dcb1..4979325 100644
--- a/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
@@ -28,6 +28,7 @@
 import com.java110.po.machine.MachineRecordPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +60,8 @@
 
     @Override
     public ResponseEntity<String> saveRecord(MachineRecordDto machineRecordDto) {
-        machineRecordDto.setMachineRecordId(GenerateCodeFactory.CODE_PREFIX_machineRecordId);
-        if (StringUtil.isEmpty(machineRecordDto.getPhoto())) {
+        machineRecordDto.setMachineRecordId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId));
+        if (!StringUtil.isEmpty(machineRecordDto.getPhoto())) {
             FileDto fileDto = new FileDto();
             fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
             fileDto.setFileName(fileDto.getFileId());
@@ -77,6 +78,9 @@
             fileRelPo.setFileRealName(fileName);
             fileRelPo.setFileSaveName(fileName);
             fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+
+            machineRecordDto.setFileId(fileDto.getFileId());
+            machineRecordDto.setFileTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         }
 
         MachineDto machineDto = new MachineDto();

--
Gitblit v1.8.0