Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2024-01-26 90b7450b05c3a26767727b12fc08f9667ebb1868

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -61,6 +61,7 @@
            try {

                Thread.sleep(1000);

                // 注入mapper

                
                homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);

                spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);

                spianService = WebSocketServer.applicationContext.getBean(SpianService.class);

@@ -122,7 +123,7 @@


                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));

                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));



                
                if (S7control.getinstance().CheckConnected() == true) {



                    // 铝框线交互