装备更新同步报警表

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

@@ -414,6 +414,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         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());
+
+            // 更新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);
+            if (0 < alarms.size()) {
+                alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+                        + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                equipmentSpecificAlarmService.updateBatchById(alarms);
+            }
         }
         boolean updateById = this.updateById(equipmentSpecific);
         if (updateById) {
@@ -472,17 +483,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 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);
-                if (0 < alarms.size()) {
-                    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);

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

@@ -282,7 +282,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   }
 
   
-    public List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+    public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
         LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);