运维工单新增工单类型、任务开始时间、任务结束时间字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HYGFMaintenanceTicketsDto.java

@@ -126,5 +126,16 @@ public class HYGFMaintenanceTicketsDto extends BaseDto {
      * 经销商orgcode
      */
     private String amosCompanyCode;
+    /**
+     * 工单类型
+     */
+    private String ticketType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskEndTime;
 }

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

@@ -147,7 +147,17 @@ public class HYGFMaintenanceTickets extends BaseEntity {
      */
     @TableField("amos_company_code")
     private String amosCompanyCode;
+    @TableField("ticket_type")
+    private String ticketType;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_start_time")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_end_time")
+    private Date taskEndTime;
 
 }

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

@@ -71,14 +71,14 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 specialMap = jsonObject.get("specialMap") == null ? null : jsonObject.getJSONObject("specialMap").toJavaObject(Map.class);
             }
             HYGFMaintenanceTickets hygfMaintenanceTickets = new HYGFMaintenanceTickets();
-            String stationid=specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
-            Long warningId = Long.valueOf( specialMap.get("warningId").toString());
+            String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
+            Long warningId = Long.valueOf(specialMap.get("warningId").toString());
             String sncode = specialMap.get("inverterSncode").toString();
             String mantainancePersonId = specialMap.get("maintenancePersonId").toString();
             JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_station_id", stationid));
-            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId,sncode,stationid);
+            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
             hygfMaintenanceTickets.setHandlerStatus("未处理");
-            Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr",mantainancePersonId));
+            Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr", mantainancePersonId));
             hygfMaintenanceTickets.setStationId(stationid);
             hygfMaintenanceTickets.setWarningId(warningId);
             hygfMaintenanceTickets.setMaintenancePersonId(mantainancePersonId);
@@ -104,16 +104,21 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 //电站联系人
 //            hygfMaintenanceTickets.setStationContact();
             }
-            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                //snCode
             hygfMaintenanceTickets.setInverterSn(sncode);
-                //告警等级
             hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
             hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
             hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
+            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+                //告警等级
                 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);
             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

@@ -59,6 +59,8 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
         specialMap.put("inverterSncode",hygfMaintenanceTicketsDto.getInverterSn());
         //告警id
         specialMap.put("warningId",hygfMaintenanceTicketsDto.getWarningId());
+        specialMap.put("taskStartTime",hygfMaintenanceTicketsDto.getTaskStartTime());
+        specialMap.put("taskEndTime",hygfMaintenanceTicketsDto.getTaskEndTime());
         if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
             //告警内容
             specialMap.put("warningContent",hygfMaintenanceTicketsDto.getWarningContent());