改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireStationInfoMapper.xml

@@ -117,7 +117,7 @@
             <if test="stationCode != null and stationCode != ''">
                 and s.station_code = #{stationCode}
             </if>
-            and s.signal_report_date = t.date
+            and s.confirm_date like concat(t.date,'%')
         </where>
         ) as alarmNums,
         date

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

@@ -56,8 +56,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 "insert".equals(receiveData.getActive()) && ObjectUtil.isNotEmpty(receiveData.getAlarmEventLog())) {
             AlarmEventLogVO alarmEventLog = receiveData.getAlarmEventLog();
 
-            if (StrUtil.isNotEmpty(alarmEventLog.getObjcectType()) && "equip".equals(alarmEventLog.getObjcectType()) &&
-                    StrUtil.isNotEmpty(alarmEventLog.getObjcectIndexType()) && "fireAlarm".equals(alarmEventLog.getObjcectIndexType())) {
+            if (StrUtil.isNotEmpty(alarmEventLog.getObjcectType()) && "equipment".equals(alarmEventLog.getObjcectType()) &&
+                    StrUtil.isNotEmpty(alarmEventLog.getObjcectIndexType()) && "FIREALARM".equals(alarmEventLog.getObjcectIndexType())) {
                 FireEquipmentSignalLog fireEquipmentSignalLog = new FireEquipmentSignalLog();
                 fireEquipmentSignalLog.setStationName(alarmEventLog.getBizOrgName());
                 fireEquipmentSignalLog.setStationCode(alarmEventLog.getOrgCode());