forked from uav/ard-uav-server
ard-inspection/src/main/java/com/ard/inspection/domain/ArdPointCloudRoute.java
@@ -2,6 +2,8 @@ import lombok.Data; import java.util.Date; /** * @author xia */ @@ -60,4 +62,19 @@ */ private String name; /** * 航线创建时间 */ private Date routeCreateTime; /** * 无人机类型 */ private String aircraft; /** * 无人机所在分组 */ private String routeGroupName; } ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java
@@ -28,7 +28,7 @@ @Slf4j public class BigFileUploadServiceImpl implements IBigFileUploadService { public static final String CLOUD_FILE_PATH = "http://192.168.1.3:6100"; public static final String CLOUD_FILE_PATH = "https://192.168.1.3:3001/tileset/"; @Autowired private IArdPointCloudService ardPointCloudService; @@ -256,9 +256,9 @@ ardPointCloud.setFileSize(formatFileSize(file.getSize())); int dotIndex = originalFilename.lastIndexOf('.'); String folderName = (dotIndex > 0) ? originalFilename.substring(0, dotIndex) : originalFilename; ardPointCloud.setFolderName(folderName); String zipP = CLOUD_FILE_PATH + zipPath + "/" + folderName + "/tileset.json"; String zipP = CLOUD_FILE_PATH + folderName + "/tileset.json"; ardPointCloud.setFilePath(zipP); ardPointCloud.setFolderName(folderName); return AjaxResult.success("文件上传并解压成功", ardPointCloud); } catch (IOException e) { log.error("解压文件失败", e); ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
@@ -30,6 +30,9 @@ <result property="filePath" column="file_path" /> <result property="routeId" column="route_id" /> <result property="name" column="name" /> <result property="routeCreateTime" column="route_create_time" /> <result property="aircraft" column="aircraft" /> <result property="routeGroupName" column="route_group_name" /> </resultMap> <sql id="selectArdPointCloudVo"> @@ -58,11 +61,17 @@ a.associated_state, a.group_id, a.file_path, c.id as route_id, c.name FROM ard_point_cloud a c.id AS route_id, c.name, c.create_time as route_create_time, e.dict_label as aircraft, d.group_name as route_group_name FROM ard_point_cloud a LEFT JOIN ard_route_cloud b ON a.id = b.cloud_id LEFT JOIN ard_route_info c ON b.route_id = c.id LEFT JOIN sys_dict_data e ON c.aircraft = e.dict_value LEFT JOIN ard_route_group d ON c.group_id = d.serial_number </sql> <select id="selectArdPointCloudList" parameterType="ArdPointCloud" resultMap="ArdPointCloudResult"> ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -19,6 +19,8 @@ @Data public class ArdRouteInfo extends BaseEntity implements Serializable{ private static final long serialVersionUID = 1L; /** ID */ private String id;
@@ -39,12 +39,13 @@ import com.ard.work.service.ITyService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK; import static com.ard.route.util.InitializationUtils.divided_23; import static com.ard.route.util.InitializationUtils.divided23; import static com.ard.route.util.ToolUtils.*; import static com.ard.route.util.UavRouteReqUtils.buildWayLineUploadDTO; import static com.ard.route.util.UavRouteReqUtils.fileConversionEntity; @@ -95,11 +96,19 @@ ArdRouteInfo ardRouteInfo = ardRouteInfoMapper.selectArdRouteInfoById(id); try { if (ardRouteInfo != null) { if (ardRouteInfo.getRouteData() != null){ ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData())); if (ardRouteInfo.getCloudData() != null){ ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData())); if ("3".equals(ardRouteInfo.getType())) { if (ardRouteInfo.getRouteData() != null){ UavRouteReq uavRouteReq = new UavRouteReq(); BeanUtils.copyProperties(deserialize(ardRouteInfo.getRouteData()), uavRouteReq); ardRouteInfo.setUavRouteReq(uavRouteReq); } } else { if (ardRouteInfo.getRouteData() != null){ ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData())); } } if (ardRouteInfo.getCloudData() != null){ ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData())); } } } catch (IOException | ClassNotFoundException e) { @@ -276,7 +285,7 @@ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) { for (PointActionReq action : actionGroupReq.getActions()) { if (action.getZoom() != null){ action.setZoom(divided_23(action.getZoom())); action.setZoom(divided23(action.getZoom())); } } } @@ -456,6 +465,13 @@ // 1.1通过航线数据，转换。 ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id); try { // if ("3".equals(route.getType())) { // UavRouteReq uavRouteReq = new UavRouteReq(); // BeanUtils.copyProperties(deserialize(route.getRouteData()), uavRouteReq); // route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData())); // }else { // route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData())); // } route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData())); if (route.getCloudData() != null){ route.setArdPointCloudList(deserializeLs(route.getCloudData())); ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
@@ -106,7 +106,7 @@ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) { for (PointActionReq action : actionGroupReq.getActions()) { if (action.getZoom() != null){ action.setZoom(multiple_23(action.getZoom())); action.setZoom(multiple23(action.getZoom())); } } } @@ -114,11 +114,11 @@ } } public static Double multiple_23(Double zoom){ public static Double multiple23(Double zoom){ return zoom * CHANSI_H20T; } public static Double divided_23(Double zoom){ public static Double divided23(Double zoom){ return zoom / CHANSI_H20T; } @@ -268,38 +268,5 @@ ardRouteChange.setPoints(points); } // private ArdRoutePoints buildArdRoutePoints(){ // ArdRoutePoints ardRoutePoints1 = new ArdRoutePoints(); // ardRoutePoints1.setDampingDistance(0); // ardRoutePoints1.setFlightPathMode(1); // ardRoutePoints1.setGroupIndex(0); // ardRoutePoints1.setHeading(0); // ardRoutePoints1.setHeadingMode(0); // ardRoutePoints1.setHeight(50); // ardRoutePoints1.setInterestIndex(0); // ardRoutePoints1.setLat(31.11339916); // ardRoutePoints1.setLon(103.75851462); // ardRoutePoints1.setSafeGohomeFlag(0); // ardRoutePoints1.setSpeed(8); // } // private ArdRouteActions buildArdRouteActions(){ // ArdRouteActions ardRouteActions0 = new ArdRouteActions(); // ardRouteActions0.setParam(10); // ardRouteActions0.setSpeakInfo(""); // ardRouteActions0.setType(1); // ardRouteActions0.setWaitTime(2); // ArdRouteActions ardRouteActions1 = new ArdRouteActions(); // ardRouteActions1.setParam(10); // ardRouteActions1.setSpeakInfo(""); // ardRouteActions1.setType(1); // ardRouteActions1.setWaitTime(2); // ArdRouteActions ardRouteActions2 = new ArdRouteActions(); // ardRouteActions2.setParam(10); // ardRouteActions2.setSpeakInfo(""); // ardRouteActions2.setType(1); // ardRouteActions2.setWaitTime(2); // } } ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -826,10 +826,8 @@ throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn); } //wayLineUploadDTO.setWayLineData(this.CreatePlanLineData());//设置航线数据 System.out.println("wayLineUploadDTO:-----------------" + wayLineUploadDTO); log.info("打印数据 ++++ wayLineUploadDTO:-----------------" + wayLineUploadDTO); log.info("打印航线上传数据 ++++++++ wayLineUploadDTO:~~~~~~~~~~~~~~~" + wayLineUploadDTO); WayLineUploadCmd wayLineUploadCmd = new WayLineUploadCmd(wayLineUploadDTO); System.out.println("wayLineUploadCmd:-----------------" + wayLineUploadCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLineUploadCmd); return true; }
