解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -26,6 +26,7 @@ import org.typroject.tyboot.component.emq.EmqxListener;
 import javax.annotation.PostConstruct;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -75,8 +76,8 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
             Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
             if(warningId>0){
-                hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.selectOne(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId));
-                if (ObjectUtil.isNotEmpty(hygfMaintenanceTickets)) {
+               List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId));
+                if (hygfMaintenanceTicketsList.size()>0) {
                     return;
                 }
             }