Merge branch 'release' of gitadmin/tuoheng_air_monitor into master

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/AirPortVO.java

@@ -1,121 +0,0 @@
-package com.tuoheng.admin.entity.vo;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 机场视图Vo
- *
- * @author wanjing
- * @team tuoheng
- * @date 2022-11-23
- */
-@Data
-@NoArgsConstructor
-public class AirPortVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 机场id
-     */
-    private String id;
-
-    /**
-     * 机场代码
-     */
-    private String code;
-
-    /**
-     * 机场名称
-     */
-    private String name;
-
-    /**
-     * 机场图片
-     */
-    private String image;
-
-    /**
-     * 机场外部监控地址
-     */
-    private String externalMonitorUrl;
-
-    /**
-     * 机场外部监控FLV地址
-     */
-    private String flvExternalMonitorUrl;
-
-    /**
-     * 机场内部监控地址
-     */
-    private String internalMonitorUrl;
-
-    /**
-     * 覆盖范围（km）
-     */
-    private String coverage;
-
-    /**
-     * 排序
-     */
-    private String sort;
-
-    /**
-     * 经度
-     */
-    private String longitude;
-
-    /**
-     * 纬度
-     */
-    private String latitude;
-
-    /**
-     * 无人机id
-     */
-    private String droneId;
-
-    /**
-     * 无人机名称
-     */
-    private String droneName;
-
-    /**
-     * 设备id
-     */
-    private String edgeId;
-
-    /**
-     * 创建人
-     */
-    private String createUser;
-
-    /**
-     * 创建时间
-     */
-    private String createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateUser;
-
-    /**
-     * 修改时间
-     */
-    private String updateTime;
-
-    /**
-     * 状态: 1：空闲 2：飞行中
-     */
-    private String status;
-
-    /**
-     * 是否在线：true：在线 false：离线
-     */
-    private String online;
-    
-}

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/GenerateReportWordService.java

@@ -53,7 +53,7 @@ public class GenerateReportWordService {
             wordUtils.insertContext(airDataType.getDataType() + "单点浓度最高值:" + request.getSinglePointConcentrationMax(), 10, Font.NORMAL, Element.ALIGN_LEFT, 20, 2, 2);
             wordUtils.insertContext(airDataType.getDataType() + "单点浓度最低值:" + request.getSinglePointConcentrationMin(), 10, Font.NORMAL, Element.ALIGN_LEFT, 20, 2, 2);
             wordUtils.insertImg(request.getOssUrl(), Image.ALIGN_CENTER, 500, 400, 100, 40, 40, 0);
-            wordUtils.insertImg(request.getReferenceIndicatorHorizontalImageUrl(), Image.ALIGN_CENTER, 540, 100, 100, 60, 0, 0);
+            wordUtils.insertImg(request.getReferenceIndicatorHorizontalImageUrl(), Image.ALIGN_CENTER, 400, 100, 100, 45, 25, 0);
         } catch (DocumentException e) {
             log.info("生成报告word异常");
             throw new RuntimeException(e);