解决冲突

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

@@ -2,17 +2,21 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.joda.time.DateTime;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_om_tickets")
-public class HYGFOMTickets extends BaseEntity {
+@TableName("hygf_maintenance_tickets")
+public class HYGFMaintenanceTickets extends BaseEntity {
     private static final long serialVersionUID = 1L;
     /**
      * 工单处理状态
@@ -22,7 +26,7 @@ public class HYGFOMTickets extends BaseEntity {
     /**
      * 场站名称
      */
-    @TableField("staion_name")
+    @TableField("station_name")
     private String stationName;
     /**
      * 逆变器sn编码
@@ -43,10 +47,12 @@ public class HYGFOMTickets extends BaseEntity {
      * 告警开始时间
      */
     @TableField("warning_start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String warningStartTime;
     /**
      * 告警开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("warning_end_time")
     private DateTime warningEndTime;
     /**
@@ -72,8 +78,8 @@ public class HYGFOMTickets extends BaseEntity {
     /**
      * 处理附件
      */
-    @TableField("handler_content_attachment")
-    private String hanlerContentAttachment;
+    @TableField(value = "handler_content_attachment",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> hanlerContentAttachment;
     /**
      * 处理方式
      */
@@ -87,12 +93,12 @@ public class HYGFOMTickets extends BaseEntity {
     /**
      * 运维人员附件
      */
-    @TableField("spare_parts_attchment")
-    private String sparePartsAttchment;
+    @TableField(value = "spare_parts_attchment",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> sparePartsAttchment;
     /**
      * 场站运维人员id
      */
-    @TableField("opreater_person_id")
+    @TableField("maintenance_person_id")
     private String opreaterPersonId;
     /**
      * 场站经度
@@ -107,17 +113,30 @@ public class HYGFOMTickets extends BaseEntity {
     /**
      * 运维人员名称
      */
-    @TableField("opreater_person_name")
+    @TableField("maintenance_person_name")
     private String opreaterPersonName;
     /**
      * 运维人员手机号
      */
-    @TableField("opreate_person_phone")
+    @TableField("maintenance_person_phone")
     private String opreatePersonPhone;
     /**
      * tdengine告警id
      */
     @TableField("warning_id")
     private Long warningId;
+    /**
+     * 区域公司orgCode
+     */
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    /**
+     * 经销商orgcode
+     */
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+
+
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HYGFOMTicketsMapper.java → amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HYGFMaintenanceTicketsMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFOMTickets;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 
-public interface HYGFOMTicketsMapper extends BaseMapper<HYGFOMTickets> {
+public interface HYGFMaintenanceTicketsMapper extends BaseMapper<HYGFMaintenanceTickets> {
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/HYGFOMTicketsService.java → amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IHYGFMaintenanceTicketsService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
-public interface HYGFOMTicketsService {
+public interface IHYGFMaintenanceTicketsService {
 }

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 lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqxListener;
+@Component
+@Slf4j
+public class MaintenanceResultHandlerMessage extends EmqxListener {
+
+    @Override
+    public void processMessage(String s, MqttMessage mqttMessage) throws Exception {
+
+    }
+}