Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

ZY

2024-09-11 74fc40400e9f2c265be63d80d19d2a89f0184885

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -329,8 +329,8 @@
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                BasDevpService basDevpService = SpringContextUtil.getBean(BasDevpService.class);
                //BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }