修改装备存储改变位置逻辑

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2,6 +2,9 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -141,6 +144,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     FireFightingSystemMapper fireFightingSystemMapper;
 
+    @Autowired
+    IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -403,7 +409,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Override
     public EquipmentSpecific updateEquipmentSpecific(EquipmentSpecific equipmentSpecific, ReginParams reginParams, AgencyUserModel agencyUserModel) {
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
-        // @TableField(updateStrategy = FieldStrategy.IGNORED) 置空不生效 为空单独设置 by kongfm 2021-09-10
+//         @TableField(updateStrategy = FieldStrategy.IGNORED) 置空不生效 为空单独设置 by kongfm 2021-09-10
         this.update(new LambdaUpdateWrapper<EquipmentSpecific>().set(EquipmentSpecific::getAgencyId, equipmentSpecific.getAgencyId()).set(EquipmentSpecific::getTeamId, equipmentSpecific.getTeamId()).eq(EquipmentSpecific::getId, equipmentSpecific.getId()));
         if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
             equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
@@ -460,8 +466,20 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 equipmentSpecific.getStockDetail().setWarehouseId(equipmentSpecific.getStock().getWarehouseId());
                 equipmentSpecific.getStockDetail().setQrCode(equipmentSpecific.getQrCode());
                 equipmentSpecific.getStockDetail().setEquipmentSpecificId(equipmentSpecific.getId());
+                EquipmentDetail detail = equipmentDetailService
+                        .getOne(new QueryWrapper<EquipmentDetail>().eq("id", equipmentSpecific.getEquipmentDetailId()));
+                equipmentSpecific.getStockDetail().setDescription(detail.getArea());
                 stockDetailService.save(equipmentSpecific.getStockDetail());
 
+                // 更新alarm表没有复位的装备位置信息
+                LambdaQueryWrapper<EquipmentSpecificAlarm> queryWrapper = new LambdaQueryWrapper();
+                queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
+                queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
+                List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
+                alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+                        + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                equipmentSpecificAlarmService.updateBatchById(alarms);
+
                 //生成入库单
                 StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);
                 stockBillService.save(stockBill);