工单推送

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HYGFMaintenanceTickets.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.joda.time.DateTime;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -58,13 +59,13 @@ public class HYGFMaintenanceTickets extends BaseEntity {
      */
     @TableField("warning_start_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String warningStartTime;
+    private Date warningStartTime;
     /**
      * 告警开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("warning_end_time")
-    private DateTime warningEndTime;
+    private Date warningEndTime;
     /**
      * 告警时长
      */

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

 package com.yeejoin.amos.boot.module.hygf.biz.emqx;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -22,6 +23,7 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
 
 import javax.annotation.PostConstruct;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -77,8 +79,10 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId,sncode,stationid);
             hygfMaintenanceTickets.setHandlerStatus("未处理");
             Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr",mantainancePersonId));
+            hygfMaintenanceTickets.setStationId(stationid);
+            hygfMaintenanceTickets.setWarningId(warningId);
+            hygfMaintenanceTickets.setMaintenancePersonId(mantainancePersonId);
             if (ObjectUtil.isNotEmpty(maintenance)) {
-                hygfMaintenanceTickets.setMaintenancePersonId(mantainancePersonId);
                 hygfMaintenanceTickets.setMaintenancePersonName(maintenance.getName());
                 hygfMaintenanceTickets.setMaintenancePersonPhone(maintenance.getTelephone());
             }
@@ -105,6 +109,9 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 hygfMaintenanceTickets.setInverterSn(sncode);
                 //告警等级
                 hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
+                hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
+                hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
+                hygfMaintenanceTickets.setWarningStartTime(tdHygfJpInverterWarn.getStartTime());
 
             }
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);