1.增加经纬度、预警状态-tzs

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java

@@ -122,6 +122,16 @@ public class CylinderInfoDto extends BaseDto {
     @ApiModelProperty(value = "最近预警时间")
     private Date earlyWarningLevelCalDate;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "客户名称")
+    private  String customType;
+
+    @ApiModelProperty(value = "客户类型")
+    private String customName;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -70,6 +70,8 @@
             ci.next_inspection_date,
             ci.early_warning_level,
             ci.early_warning_level_cal_date,
+            ci.longitude,
+            ci.latitude,
             eu.address
         from
             tz_cylinder_info ci
@@ -87,8 +89,11 @@
                 ci.next_inspection_date,
                 ci.early_warning_level,
                 ci.early_warning_level_cal_date,
+                ci.longitude,
+                ci.latitude,
                 eu.address,
-                eu.custom_name
+                eu.custom_name,
+                eu.custom_type
             from
             tz_cylinder_info ci
             left join tz_end_user eu on ci.end_custom_code = eu.custom_code

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -618,7 +618,9 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
     }
 
     public CylinderInfoDto getDetail(String sequenceCode) {
-        return this.baseMapper.getDetail(sequenceCode);
+        CylinderInfoDto dto = this.baseMapper.getDetail(sequenceCode);
+        dto.setInspectionStatusDesc(dto.getEarlyWarningLevel() != null ? EarlyWarningLevelEnum.getEumByLevel(dto.getEarlyWarningLevel()).getStatus() : "");
+        return dto;
     }
 
     public List<MsgLog> getMsgList(String sequenceCode, String terminalType) {