refactor(amos-boot-module-jg): 优化设备信息导入导出功能

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoExcelDto.java

@@ -115,7 +115,7 @@ public class EquipInfoExcelDto extends BaseDto {
     private String whetherSphericalTank;
 
     @ApiModelProperty(value = "是否撬装式压力容器")
-    @ExcelProperty(value = "是否撬装式压力容器")
+    @ExcelProperty(value = "是否撬装式压力容器", converter = VehicleCylinderConverter.class)
     private String whetherSkidMountedPressureVessel;
 
     @ApiModelProperty(value = "是否车用气瓶")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -207,7 +207,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 safetyProblemTracing.setSourceType(json.getString("sourceType"));
                 safetyProblemTracing.setSourceTypeCode(json.getString("sourceTypeCode"));
                 safetyProblemTracing.setSourceId(json.getString("problemSourceId"));
-                safetyProblemTracing.setProblemTime(ValidationUtil.isEmpty(json.getString("expiryDate")) ? new Date() : json.getDate("expiryDate"));
+                safetyProblemTracing.setProblemTime(getProblemTime(json));
                 safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
                 safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
                 safetyProblemTracing.setPrincipalUnitType(json.getOrDefault("unitType", "").toString());