|
|
@@ -7,6 +7,8 @@ import cn.hutool.core.util.ObjUtil;
|
|
7
|
7
|
import cn.hutool.core.util.StrUtil;
|
|
8
|
8
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
9
|
9
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
10
|
+import com.sundot.airport.common.constant.Constants;
|
|
|
11
|
+import com.sundot.airport.common.core.redis.RedisSerialGenerator;
|
|
10
|
12
|
import com.sundot.airport.common.domain.BaseAttachment;
|
|
11
|
13
|
import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
|
|
12
|
14
|
import com.sundot.airport.common.enums.EquipmentColorTypeEnum;
|
|
|
@@ -38,6 +40,8 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
|
|
38
|
40
|
private IEquipmentInspectionRecordService equipmentInspectionRecordService;
|
|
39
|
41
|
@Autowired
|
|
40
|
42
|
private IBaseAttachmentService baseAttachmentService;
|
|
|
43
|
+ @Autowired
|
|
|
44
|
+ private RedisSerialGenerator redisSerialGenerator;
|
|
41
|
45
|
|
|
42
|
46
|
/**
|
|
43
|
47
|
* 查询设备台账
|
|
|
@@ -105,6 +109,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
|
|
105
|
109
|
throw new ServiceException("该设备序列号已存在");
|
|
106
|
110
|
}
|
|
107
|
111
|
equipmentLedger.setCreateTime(DateUtils.getNowDate());
|
|
|
112
|
+ equipmentLedger.setEquipmentCode(redisSerialGenerator.generate(Constants.EQUIPMENT_LEDGER));
|
|
108
|
113
|
int result = equipmentLedgerMapper.insertEquipmentLedger(equipmentLedger);
|
|
109
|
114
|
if (CollUtil.isNotEmpty(equipmentLedger.getEquipmentInspectionRecordList())) {
|
|
110
|
115
|
equipmentLedger.getEquipmentInspectionRecordList().forEach(equipmentInspectionRecord -> {
|