DESKTOP-2K9OVK9\siwei 7 ay önce
ebeveyn
işleme
cb0ad22720

+ 9 - 12
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhGdServiceImpl.java

@@ -232,10 +232,7 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
                 TGdbhFlightDto dto_0 = flightDtoList.get(0);
                 TGdbhFlightDto dto_1 = flightDtoList.get(1);
                 Double dr_mr = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto_0.getLongitude(), dto_0.getLatitude(), dto_1.getLongitude(), dto_1.getLatitude()));
-                if (dr_mr > 160) {
-                    writeheading = "180.0";
-                }
-
+                writeheading = dr_mr.toString();
                 for (int i = 0; i < flightDtoList.size(); i++) {
                     TGdbhFlightDto dto = flightDtoList.get(i);
                     if (i > 0 && i + 1 < len) {
@@ -260,23 +257,23 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
                         Double dr4 = Math.abs(dr_hou - dr_hou4);
                         if (dr4 > 10) {
                             writetilt = "0.100000000000000006";
-                            writeheading = heading;
+//                            writeheading = heading;
                         } else {
                             Double dr = Math.abs(dr_mr - dr_hou);
                             if (dr > 10 && dr < 160) {
                                 writetilt = "0.100000000000000006";
-                                writeheading = heading;
+//                                writeheading = heading;
                             } else if (dr > 160) {
 //                        writetilt = (360 - Double.parseDouble(tilt)) + "";
-                                if ("180.0".equals(writeheading)) {
-                                    writeheading = "0.000001";
-                                } else {
-                                    writeheading = "180.0";
-                                }
+//                                if ("180.0".equals(writeheading)) {
+//                                    writeheading = "0.000001";
+//                                } else {
+//                                    writeheading = "180.0";
+//                                }
                                 writetilt = tilt;
                             } else {
                                 writetilt = tilt;
-                                writeheading = heading;
+//                                writeheading = heading;
                             }
                         }
                     }