优化告警数据过滤与工单推送

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -71,7 +71,7 @@
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
-				AND `state` = #{state}
+				AND `handler_status` = #{state}
 			</if>
 			<if test="level != null and level != ''">
 				AND `level` = #{level}
@@ -112,7 +112,7 @@
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
-				AND `state` = #{state}
+				AND handler_status = #{state}
 			</if>
 			<if test="level != null and level != ''">
 				AND level = #{level}

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

@@ -72,10 +72,13 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             }
             HYGFMaintenanceTickets hygfMaintenanceTickets = new HYGFMaintenanceTickets();
             String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
-            Long warningId = Long.valueOf(specialMap.get("warningId").toString());
+            Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
             String sncode = specialMap.get("inverterSncode").toString();
             String mantainancePersonId = specialMap.get("maintenancePersonId").toString();
             JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_station_id", stationid));
+            if (ObjectUtil.isEmpty(jpStation)) {
+                jpStation = jpStationMapper.selectById(stationid);
+            }
             TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
             hygfMaintenanceTickets.setHandlerStatus("未处理");
             Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr", mantainancePersonId));
@@ -101,31 +104,39 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 hygfMaintenanceTickets.setStationLatitude(jpStation.getLatitude());
                 //电站联系人电话
                 hygfMaintenanceTickets.setStationContactPhone(jpStation.getUserPhone());
-               // 电站联系人
+                // 电站联系人
                 hygfMaintenanceTickets.setStationContact(jpStation.getStationContact());
                 //业主姓名
                 hygfMaintenanceTickets.setOwnerName(jpStation.getUserName());
-                if(ObjectUtil.isEmpty(hygfMaintenanceTickets.getStationContact())){
+                if (ObjectUtil.isEmpty(hygfMaintenanceTickets.getStationContact())) {
                     hygfMaintenanceTickets.setStationContact(jpStation.getUserName());
                 }
             }
             hygfMaintenanceTickets.setInverterSn(sncode);
-            hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
-            hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
-            hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
+            hygfMaintenanceTickets.setWarningLevel(specialMap.get("warningLevel").toString());
+            hygfMaintenanceTickets.setWarningContent(specialMap.get("warningContent").toString());
+            if(ObjectUtil.isNotNull(specialMap.get("taskStartTime"))){
+                hygfMaintenanceTickets.setTaskStartTime(new Date( Long.valueOf(specialMap.get("taskStartTime").toString())));
+            }
+            if(ObjectUtil.isNotNull(specialMap.get("taskEndTime"))){
+                hygfMaintenanceTickets.setTaskEndTime(new Date( Long.valueOf(specialMap.get("taskEndTime").toString())));
+            }
+
             if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
+                hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
+                hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
                 //告警等级
                 hygfMaintenanceTickets.setWarningStartTime(new Date(tdHygfJpInverterWarn.getStartTime()));
                 hygfMaintenanceTickets.setTicketType("手动");
-                hygfMaintenanceTickets.setTaskStartTime((Date) specialMap.get("taskStartTime"));
-                hygfMaintenanceTickets.setTaskEndTime((Date) specialMap.get("taskEndTime"));
             }
 
 
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
-
-            tdHygfJpInverterWarn.setHandlerStatus("处理中");
-            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                tdHygfJpInverterWarn.setHandlerStatus("处理中");
+                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+            }
             log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
         }
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HYGFMaintenanceTicketsServiceImpl.java

@@ -102,6 +102,11 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
         specialMap.put("stationAddress", hygfMaintenanceTicketsDto.getStationAddress());
         //业主姓名
         specialMap.put("ownerName", hygfMaintenanceTicketsDto.getOwnerName());
+        //告警等级
+        specialMap.put("warningLevel", hygfMaintenanceTicketsDto.getWarningLevel());
+        //告警内容
+        specialMap.put("warningContent", hygfMaintenanceTicketsDto.getWarningContent());
+        //告警状态
         riskDynamicDetailsVoList.add(riskDynamicDetailsVo);
         bizInfo.put("sourceAttributionDesc", hygfMaintenanceTicketsDto.getStationName());
         bizInfo.put("sourceAttribution", hygfMaintenanceTicketsDto.getStationName());