浏览代码

scrs ixr coord convert update

shjung 1 年之前
父节点
当前提交
eaf96c1ee8

+ 4 - 3
src/main/java/com/its/op/dto/its/scrs/TbScIxrMngmDto.java

@@ -2,7 +2,6 @@ package com.its.op.dto.its.scrs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.scrs.TbScIxrMngm;
-import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -148,8 +147,10 @@ public class TbScIxrMngmDto implements Serializable {
                     .ixrNm(this.ixrNm)
                     .phasCnt(this.phasCnt)
                     .spotFetr(this.spotFetr)
-                    .ixrXCrdn(SignalUtils.crdnDto2Entity(this.ixrXCrdn))
-                    .ixrYCrdn(SignalUtils.crdnDto2Entity(this.ixrYCrdn))
+//                    .ixrXCrdn(SignalUtils.crdnDto2Entity(this.ixrXCrdn))
+//                    .ixrYCrdn(SignalUtils.crdnDto2Entity(this.ixrYCrdn))
+                    .ixrXCrdn(String.valueOf(this.ixrXCrdn))
+                    .ixrYCrdn(String.valueOf(this.ixrYCrdn))
                     .ixrType(this.ixrType)
                     .dvsn(this.dvsn)
                     .useEn(this.useEn)

+ 1 - 2
src/main/java/com/its/op/xnetudp/service/VmsServerRequestSender.java

@@ -48,8 +48,7 @@ public class VmsServerRequestSender {
             bootstrap.option(ChannelOption.SO_BROADCAST, false);
             bootstrap.handler(new ChannelInitializer<Channel>() {
                 @Override
-                protected void initChannel(Channel channel)
-                {
+                protected void initChannel(Channel channel) {
                     channel.pipeline().addLast(new VmsServerRequestEncoder(vmsServerConfig.getIpAddress(), vmsServerConfig.getPort()));
                 }
             });

+ 9 - 1
src/test/java/com/its/op/ItsOpServerApplicationTests.java

@@ -268,8 +268,16 @@ public class ItsOpServerApplicationTests {
     void test9() {
         int ltc1 = 2933;
         int TOTAL = 4361;
-        double tLtc1 = Double.parseDouble(String.format("%.1f", ltc1 / TOTAL * 100.0));
+        double tLtc1 = Double.parseDouble(String.format("%.1f", ltc1 / (float)TOTAL * 100.0));
         log.error("{}, {}, {}, {}", ltc1, TOTAL, tLtc1, (ltc1 / (float)TOTAL * 100.0));
     }
 
+    @Test
+    void ttt() {
+        int x = 0;
+        while (x < 3) {
+            x = ++x;
+            log.info(" mm-after: {}", x);
+        }
+    }
 }