Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_telecomumale into develop

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/Inspection.java

@@ -5,32 +5,35 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tuoheng.common.core.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 巡检任务表实体类
+ * 巡检任务对象 th_inspection
  *
- * @Author ChengWang
- * @Date 2022/11/21
+ * @author wanjing
+ * @team tuoheng
+ * @date 2022-11-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("th_inspection")
+@ToString(callSuper = true)
 public class Inspection extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * 租户id
+     * 租户ID
      */
     private String tenantId;
 
     /**
-     * 部门id
+     * 部门ID
      */
     private String deptId;
 
@@ -45,12 +48,12 @@ public class Inspection extends BaseEntity {
     private String name;
 
     /**
-     * 巡检任务类型 1临时巡检 2巡检任务
+     * 巡检任务类型 1：临时巡检；2：应急巡检
      */
     private Integer type;
 
     /**
-     * 航道id
+     * 航道ID
      */
     private String channelId;
 
@@ -60,7 +63,7 @@ public class Inspection extends BaseEntity {
     private String channelName;
 
     /**
-     * 航段id
+     * 航段ID
      */
     private String legId;
 
@@ -74,15 +77,25 @@ public class Inspection extends BaseEntity {
      */
     private Integer inspectionType;
 
+    /**
+     * 飞行记录id
+     */
+    private Long recordId;
+
     /**
      * 巡检机场id
      */
-    private Integer airportId;
+    private Long airportId;
 
     /**
-     * 无人机id
+     * 机场sn
      */
-    private String droneId;
+    private String sn;
+
+    /**
+     * 巡检无人机id
+     */
+    private Integer droneId;
 
     /**
      * 巡检机场名称
@@ -92,7 +105,7 @@ public class Inspection extends BaseEntity {
     /**
      * 巡检线路id
      */
-    private Integer inspectionLine;
+    private Long inspectionLine;
 
     /**
      * 巡检线路名称
@@ -201,7 +214,7 @@ public class Inspection extends BaseEntity {
     private String srtUrl;
 
     /**
-     * 任务状态 5任务待飞行 6准备中 7飞行失败 10任务飞行中 15任务飞行完成
+     * 任务状态 5任务待飞行 7飞行失败 10任务飞行中 15任务飞行完成
      */
     private Integer status;
 
@@ -213,7 +226,7 @@ public class Inspection extends BaseEntity {
     /**
      * ai任务分析进度
      */
-    private BigDecimal progressbar;
+    private Double progressbar;
 
     /**
      * 备注
@@ -281,10 +294,8 @@ public class Inspection extends BaseEntity {
     private String dspServiceInstId;
 
     /**
-     *应急任务数据关联任务ID
+     * 应急任务数据关联任务ID
      */
     private String emergencyDataInspectionId;
 
-
-
 }

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-dev.yml

@@ -83,6 +83,8 @@ tuoheng:
   airport-url: http://192.168.11.22:9060
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
+  #天翼星云配置地址
+  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-local.yml

@@ -86,6 +86,8 @@ tuoheng:
   airport-url: http://192.168.11.22:9060
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
+  #天翼星云配置地址
+  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-prod.yml

@@ -83,6 +83,8 @@ tuoheng:
   airport-url: https://airport.t-aaron.com
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram.t-aaron.com
+  #天翼星云配置地址
+  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-test.yml

@@ -83,6 +83,8 @@ tuoheng:
   airport-url: https://airport-test.t-aaron.com
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram-test.t-aaron.com
+  #天翼星云配置地址
+  tianyi-url: http://221.230.150.241:8889
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionMapper.xml

@@ -16,6 +16,8 @@
         <result property="legName"    column="leg_name"    />
         <result property="inspectionType"    column="inspection_type"    />
         <result property="airportId"    column="airport_id"    />
+        <result property="sn"    column="sn"    />
+        <result property="recordId"    column="record_id"    />
         <result property="airportName"    column="airport_name"    />
         <result property="inspectionLine"    column="inspection_line"    />
         <result property="inspectionLineName"    column="inspection_line_name"    />