Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -81,4 +81,7 @@ public class EquipSpecificAlarmDTO {
     @ApiModelProperty(value = "时间轴")
     private String dateAxis;
 
+    @ApiModelProperty(value = "图片")
+    private String eqimg;
+
 }
\ No newline at end of file

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

@@ -136,7 +136,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.qr_code=#{qrCode}
+			where wleq.code=#{qrCode}
     </select>
 
     <select id="getImportantEquipmentList" resultMap="ImportantEquipmentVO">

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

@@ -961,25 +961,29 @@
         select
         b.address warehouseStructureName,
         b.eqname fireEquipmentName,
-        b.qrcode fireEquipmentCode,
+        b.code fireEquipmentCode,
         b.eqimg eqimg,
+        b.alarmTime alarmTime,
         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
         (select
         wl_warehouse_structure.full_name address,
         wl_equipment_detail.name eqname,
-        wl_stock_detail.qr_code qrcode,
-        wl_equipment_detail.img eqimg,
+        wl_equipment_specific.code code,
+        wl_equipment.img eqimg,
         wl_equipment_detail.id eqid,
-        wl_equipment_specific.system_id
+        wl_equipment_specific.system_id,
+        wl_equipment_specific_alarm.create_date alarmTime
         from wl_equipment_detail
         LEFT JOIN wl_equipment_specific ON wl_equipment_specific.equipment_detail_id = wl_equipment_detail.id
         LEFT JOIN (select DISTINCT wl_equipment_index.equipment_id from wl_equipment_index where
         wl_equipment_index.is_iot=1) b on b.equipment_id=wl_equipment_detail.equipment_id
         LEFT JOIN wl_stock_detail on wl_equipment_detail.id =wl_stock_detail.equipment_detail_id
         LEFT JOIN wl_warehouse_structure on wl_stock_detail.warehouse_structure_id = wl_warehouse_structure.id
-        LEFT JOIN wl_equipment on wl_equipment.id = wl_equipment_detail.equipment_id where wl_equipment.is_iot = 1
+        LEFT JOIN wl_equipment on wl_equipment.id = wl_equipment_detail.equipment_id
+        LEFT JOIN wl_equipment_specific_alarm on wl_equipment_specific_alarm.equipment_detail_id=wl_equipment_detail.id
+        where wl_equipment.is_iot = 1
         )b
         )m
         <where>
@@ -999,7 +1003,7 @@
                 AND systemIds in (#{dto.systemIds})
             </if>
         </where>
-        ORDER BY status DESC
+        ORDER BY status DESC,alarmTime DESC
     </select>
 
     <select id="getConfirmUser" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog">

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

@@ -197,7 +197,7 @@
             FIND_IN_SET(spe.id,ss.point_in_scene)) = 0,0,1) as isBinding,-- 一个装备可在多个系统使用
         </if>
         if(spe.code is null,eqdet.name,concat(eqdet.name,'(',spe.code,')')) as displayName,
-        '{\"width\": 42, \"height\": 42}'as initStyle,
+        '{\"width\": 20, \"height\": 20}'as initStyle,
         'CommonEquip' as componentName,
         spe.id as sequenceNbr,
         'equipment' as componentKey,