修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentBaseAppVO.java

@@ -57,4 +57,7 @@ public class EquipmentBaseAppVO {
     @ApiModelProperty(value = "更新時間")
     private String alarmTime;
 
+    @ApiModelProperty(value = "状态")
+    private String status;
+
 }

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

@@ -25,10 +25,7 @@ import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.Token;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
-import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
-import com.yeejoin.equipmanage.mapper.VideoMapper;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.remote.WebMqttHandler;
 import com.yeejoin.equipmanage.service.*;
@@ -109,7 +106,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 
     @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
-
+    @Autowired
+    private EquipmentSpecificAlarmLogMapper equipmentSpecificAlarmLogMapper;
 
 
 
@@ -176,8 +174,34 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
                 }
             }
+            switch ( ent.getType()){
+                case "火警":
+                    ent.setType("FIREALARM");
+                    break;
+                case "故障":
+                    ent.setType("BREAKDOWN");
+                    break;
+                case "屏蔽":
+                    ent.setType("SHIELD");
+                    break;
+                case "预警":
+                    ent.setType("NOTICE");
+                    break;
+                default:
+                    ent.setType("");
+            }
+
+            ent.setUpdateDate(new Date());
+            int i = 0 ;
+            if (ent.getIsBatch() == 0){
+               i = equipmentSpecificAlarmLogMapper.updateById(ent);
+            }else {
+                LambdaUpdateWrapper<EquipmentSpecificAlarmLog> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificAlarmId,ent.getEquipmentSpecificAlarmId());
+                 i = equipmentSpecificAlarmLogMapper.update(ent, updateWrapper);
+            }
+            //int i = confirmAlarmMapper.confirmAlam(ent);
 
-            int i = confirmAlarmMapper.confirmAlam(ent);
             if (i > 0) {
                 if (jcsSwitch && AlarmTypeEnum.HZGJ.getCode().equals(ent.getConfirmType())) {
                     // 确警消息发送

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

@@ -126,6 +126,8 @@
 			wled.manufacturer_id,
 			wled.maintenance_cycle,
 			stru.full_name,
+            IFNULL(( select DISTINCT wl_equipment_specific_alarm.`status` from wl_equipment_specific_alarm where
+                wl_equipment_specific_alarm.`status`=1 and wl_equipment_specific_alarm.equipment_detail_id=wled.id ), 0) as status ,
 			(select group_concat(sys.name) from `f_fire_fighting_system`  sys where find_in_set(sys.id, wleq.system_id)) as name
 		FROM
 		    wl_equipment_specific wleq
@@ -136,7 +138,7 @@
 			left join wl_stock_detail wlsbd on wleq.qr_code = wlsbd.qr_code
 			LEFT JOIN wl_system_dic wlsd ON wlsd.id = wled.country
 			left join wl_warehouse_structure as stru on wlsbd.warehouse_structure_id = stru.id
-			where wleq.code=#{qrCode}
+			where wleq.qr_code=#{qrCode}
     </select>
 
     <select id="getImportantEquipmentList" resultMap="ImportantEquipmentVO">

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

@@ -951,6 +951,9 @@
             <if test="dto.code != null">
                 and d.code like CONCAT('%', #{dto.code}, '%' )
             </if>
+            <if test="dto.fireEquipmentCode != null">
+                and d.fireEquipmentCode like CONCAT('%', #{dto.fireEquipmentCode}, '%' )
+            </if>
         </where>
         ORDER BY
         d.createDate DESC
@@ -964,6 +967,7 @@
         b.code fireEquipmentCode,
         b.eqimg eqimg,
         b.alarmTime alarmTime,
+        b.qrCode code,
         IFNULL(( select DISTINCT wl_equipment_specific_alarm.`status` from wl_equipment_specific_alarm where
         wl_equipment_specific_alarm.`status`=1 and wl_equipment_specific_alarm.equipment_detail_id=b.eqid ), 0) `status`
         from
@@ -971,6 +975,7 @@
         wl_warehouse_structure.full_name address,
         wl_equipment_detail.name eqname,
         wl_equipment_specific.code code,
+        wl_stock_detail.qr_code qrCode,
         wl_equipment.img eqimg,
         wl_equipment_detail.id eqid,
         wl_equipment_specific.system_id,