From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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
old mode 100644
new mode 100755
index 301a4b4..48ffa3f
--- 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
@@ -15,16 +15,24 @@
*/
package com.java110.common.bmo.machine.impl;
+import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.ISaveMachineRecordBMO;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
import com.java110.dto.file.FileDto;
+import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.common.IMachineRecordInnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.po.file.FileRelPo;
import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+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;
@@ -51,10 +59,17 @@
@Autowired
private IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl;
+ @Autowired
+ private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+
@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());
@@ -71,17 +86,31 @@
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();
+ machineDto.setMachineCode(machineRecordDto.getMachineCode());
+ machineDto.setCommunityId(machineRecordDto.getCommunityId());
+ List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+
+ Assert.listOnlyOne(machineDtos, "璁惧涓嶅瓨鍦�");
+
+ machineRecordDto.setMachineId(machineDtos.get(0).getMachineId());
List<MachineRecordPo> machineRecordPos = new ArrayList<>();
MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(machineRecordDto, MachineRecordPo.class);
machineRecordPos.add(machineRecordPo);
int count = machineRecordInnerServiceSMOImpl.saveMachineRecords(machineRecordPos);
- if (count > 0) {
- return ResultVo.success();
+ if (count < 1) {
+ return ResultVo.error("涓婁紶璁板綍澶辫触");
}
- return ResultVo.error("涓婁紶璁板綍澶辫触");
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_SEND_OPEN_LOG, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ return ResultVo.success();
}
}
--
Gitblit v1.8.0