批量确警逻辑修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java

@@ -30,7 +30,7 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
 
     List<AppAlarmExtVo> findByIdListNoBuildId(@Param("list") List<Long> idBNullList);
 
-    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(@Param("equipmentSpecificAlarmId") Long equipmentSpecificAlarmId, @Param("isConfirm") String isConfirm);
+    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(@Param("equipmentSpecificId") Long equipmentSpecificId, @Param("equipmentSpecificIndexKey")String equipmentSpecificIndexKey,@Param("isConfirm") String isConfirm);
     
     List<FireEquipmentFireAlarm> getFireEquipAlarmLogDetailsById(@Param("list") List<Long> ids);
 

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

@@ -27,5 +27,5 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
      * @param isConfirm '' 为全部数据 0 为未确认 1为已确认
      * @return
      */
-    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificAlarmId, String isConfirm);
+    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificId,String equipmentSpecificIndexKey, String isConfirm);
 }

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

@@ -189,7 +189,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();
                 if (isBatch == 1) {
-                    list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
+                    list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(alarmLog.getEquipmentSpecificId(),alarmLog.getEquipmentSpecificIndexKey(), "0");
                 }
             }
             if (ent.getType() != null) {
@@ -202,8 +202,10 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             if (ent.getIsBatch() == 0){
                i = equipmentSpecificAlarmLogMapper.updateById(ent);
             }else {
-                LambdaUpdateWrapper<EquipmentSpecificAlarmLog> updateWrapper = new LambdaUpdateWrapper<>();
-                updateWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificAlarmId,ent.getEquipmentSpecificAlarmId());
+                LambdaUpdateWrapper<EquipmentSpecificAlarmLog> updateWrapper = new LambdaUpdateWrapper<EquipmentSpecificAlarmLog>().
+                set(EquipmentSpecificAlarmLog::getEquipmentSpecificId,ent.getEquipmentSpecificId()).
+                set(EquipmentSpecificAlarmLog::getConfirmDate,null).
+                eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey,ent.getEquipmentSpecificIndexKey());
                  i = equipmentSpecificAlarmLogMapper.update(ent, updateWrapper);
             }
             //int i = confirmAlarmMapper.confirmAlam(ent);

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

@@ -32,8 +32,8 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
     }
 
     @Override
-    public List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificAlarmId, String isConfirm) {
-        List<EquipmentSpecificAlarmLog> list = equipmentSpecificAlarmLogMapper.getIsConfirmByAlarmId(equipmentSpecificAlarmId, isConfirm);
+    public List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificId, String equipmentSpecificIndexKey, String isConfirm) {
+        List<EquipmentSpecificAlarmLog> list = equipmentSpecificAlarmLogMapper.getIsConfirmByAlarmId(equipmentSpecificId, equipmentSpecificIndexKey, isConfirm);
         if (CollectionUtils.isNotEmpty(list)) {
             return list;
         }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -99,8 +99,11 @@
         FROM
             wl_equipment_specific_alarm_log weal
         <where>
-            <if test="equipmentSpecificAlarmId != null">
-                weal.equipment_specific_alarm_id = #{equipmentSpecificAlarmId}
+            <if test="equipmentSpecificId != null and equipmentSpecificId != ''">
+                weal.equipment_specific_id = #{equipmentSpecificId}
+            </if>
+            <if test="equipmentSpecificIndexKey != null and equipmentSpecificIndexKey != ''">
+                weal.equipment_specific_index_key = #{equipmentSpecificIndexKey}
             </if>
             <if test="isConfirm != null and isConfirm != '' and isConfirm == 0">
                 AND weal.confirm_date IS NULL