Merge branch '2.2.0' of http://shvber.com/Git/VSDSM_SERVER into 2.2.0

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/VbdsmHj212ModbusApplication.java

@@ -14,8 +14,8 @@ import  cn.vbdsm.hj212.modbus.ws.*;
 @Slf4j
 //@EnableScheduling
 public class VbdsmHj212ModbusApplication implements CommandLineRunner {
-    @Autowired
-    private TcpSocketServer tcpSocketServer;
+//    @Autowired
+//    private TcpSocketServer tcpSocketServer;
     @Autowired
     private MockUploadWsService uploadDataService;
     @Autowired

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/server/TcpSocketClient.java

@@ -18,46 +18,47 @@ import java.util.Scanner;
 @Slf4j
 public class TcpSocketClient {
 
-    @Getter
-    private Bootstrap bootstrap;
-    @Getter
-    private Channel channel;
+//    @Getter
+//    private Bootstrap bootstrap;
+//    @Getter
+//    private Channel channel;
+//
+//    @Value("${vbdsm.socket.client.port}")
+//    private int port;
+//    @Value("${vbdsm.socket.client.bindIp}")
+//    private String host;
+//
+//    public void connect(){
+//        EventLoopGroup group = new NioEventLoopGroup();
+//        this.bootstrap = new Bootstrap();
+//        bootstrap.group(group).channel(NioSocketChannel.class)
+//                .option(ChannelOption.TCP_NODELAY, true)
+//                .handler(new ChannelInitializer<SocketChannel>() {
+//                    @Override
+//                    protected void initChannel(SocketChannel ch) throws Exception {
+////                        ch.pipeline().addLast("decoder",new DealMsg()); //设置自定义解码器
+////                        ch.pipeline().addLast("encoder",new MsgEncode()); //设置自定义编码器
+//                        ch.pipeline().addLast(new TcpClientHandler());//设置客户端网络IO处理器
+//                    }
+//                });
+//        //连接服务器 同步等待成功
+//        ChannelFuture f = bootstrap.connect(new InetSocketAddress(host, port));
+//        //同步等待客户端通道关闭
+//        try {
+//            this.channel = f.sync().channel();
+//        } catch (InterruptedException e) {
+//            throw new RuntimeException(e);
+//        }
+//        //释放线程组资源
+//        //group.shutdownGracefully();
+//    }
+//
+//    public void sendMsg(String msg){
+//        try {
+//            this.channel.writeAndFlush(msg);
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
 
-    @Value("${vbdsm.socket.client.port}")
-    private int port;
-    @Value("${vbdsm.socket.client.bindIp}")
-    private String host;
-
-    public void connect(){
-        EventLoopGroup group = new NioEventLoopGroup();
-        this.bootstrap = new Bootstrap();
-        bootstrap.group(group).channel(NioSocketChannel.class)
-                .option(ChannelOption.TCP_NODELAY, true)
-                .handler(new ChannelInitializer<SocketChannel>() {
-                    @Override
-                    protected void initChannel(SocketChannel ch) throws Exception {
-//                        ch.pipeline().addLast("decoder",new DealMsg()); //设置自定义解码器
-//                        ch.pipeline().addLast("encoder",new MsgEncode()); //设置自定义编码器
-                        ch.pipeline().addLast(new TcpClientHandler());//设置客户端网络IO处理器
-                    }
-                });
-        //连接服务器 同步等待成功
-        ChannelFuture f = bootstrap.connect(new InetSocketAddress(host, port));
-        //同步等待客户端通道关闭
-        try {
-            this.channel = f.sync().channel();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        //释放线程组资源
-        //group.shutdownGracefully();
-    }
-
-    public void sendMsg(String msg){
-        try {
-            this.channel.writeAndFlush(msg);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/task/UploadDataTask.java

@@ -55,7 +55,7 @@ public class UploadDataTask {
             }catch (Exception e){
                 log.error("uploadData error:" + e.getMessage());
             }
-        },new CronTrigger("0 0/15 * * * ?"));
+        },new CronTrigger("0 0/5 * * * ?"));
 
 //        restartFuture = restartTaskScheduler.schedule(()->{
 //            ExecUtil.execCommand("/opt/vbdsm/exec_mock.sh restart vbdsm-hj212-modbus-2.1.0");

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/ws/MockUploadWsService.java

@@ -117,7 +117,7 @@ public class MockUploadWsService {
     public void uploadData(TerminalData td,RandomPower power)  {
         String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
         long now = Long.parseLong(nowStr);
-        now = now - (now - (now / 10000) * 10000) % 1500;
+        now = now - (now - (now / 10000) * 10000) % 500;
         try {
             sendData("01",td,now,power);
             sendData("02",td,now,power);

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/resources/application.yml

@@ -5,9 +5,12 @@ vbdsm:
         server:
             enable: true
             bindPort: 18888 #服务器端口，默认是19999
-            bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0
+            bindIp: 0.0.0.0 #服务器ip 默认0.0.0.0./
             bossThreadNum: 1 #netty boss线程数 默认为1
             workThreadNum: 4 #netty work线程数，默认为4
+        client:
+            port: 19999
+            bindIp: 192.168.0.81
     ws:
         #url: http://192.168.0.104:7100/services/UploadData?wsdl;http://192.168.0.104:7100/services/UploadData?wsdl
         url: http://192.168.0.81:7101/services/UploadData?wsdl