From 486639cc2fa9912a11df9d8924eacefd43ffde16 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 25 Jul 2024 16:31:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/nladmin-system/src/main/java/org/nl/AppRun.java | 5 ----- .../java/org/nl/common/utils/SpringContextHolder.java | 9 +++------ .../service/impl/BmClassStandardServiceImpl.java | 2 -- .../decision_manage/handler/decisioner/Decisioner.java | 2 ++ .../external_system/acs/service/WmsToAcsService.java | 10 ++-------- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java index a564271c..41104537 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -43,11 +43,6 @@ public class AppRun implements CommandLineRunner { System.out.println("--------项目启动完成--------"); } -// @Bean -// public SpringContextHolder springContextHolder() { -// return new SpringContextHolder(); -// } - /*@Bean public ServletWebServerFactory webServerFactory() { TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpringContextHolder.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpringContextHolder.java index 34a9374c..a12a3237 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpringContextHolder.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpringContextHolder.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -19,7 +20,7 @@ import java.util.Map; * @Date 2024/2/2 10:39 */ @Slf4j -@Service +@Component public class SpringContextHolder implements ApplicationContextAware, DisposableBean { private static ApplicationContext applicationContext = null; @@ -43,11 +44,6 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB } } public static ApplicationContext getApplicationContext() { - try { - - } catch (Exception e) { - e.printStackTrace(); - } return applicationContext; } @@ -136,6 +132,7 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + log.warn("自动注入bean工具"); if (SpringContextHolder.applicationContext != null) { log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java index d1028572..96c42786 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sun.istack.internal.NotNull; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.CopyUtil; @@ -74,7 +73,6 @@ public class BmClassStandardServiceImpl extends ServiceImpl getMaps(List> list) { List result = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/Decisioner.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/Decisioner.java index 70166373..98cbc59d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/Decisioner.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/Decisioner.java @@ -23,6 +23,8 @@ public abstract class Decisioner implements InitializingBean { public StStrategyConfig strategyConfig; @Autowired private IStStrategyConfigService iStStrategyConfigService; + @Autowired + private SpringContextHolder springContextHolder; public abstract List handler(List list, P param); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java index f34dd725..b2c41be2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java @@ -16,6 +16,7 @@ import org.nl.wms.sync_manage.service.form_mapping.ISyncFormMappingService; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; import org.slf4j.MDC; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -25,15 +26,8 @@ import java.util.List; * @Date 2024/5/6 14:53 */ @Service -public class WmsToAcsService implements InitializingBean { +public class WmsToAcsService{ - private SyncFormMapping mapping; - - @Override - public void afterPropertiesSet(){ - this.mapping = SpringContextHolder.getBean(ISyncFormMappingService.class).getOne(new QueryWrapper() - .eq("form_type","sch_base_task")); - } public TableDataInfo changeMode(String deviceCode,String type,String mode){ InteracteDto dto = InteracteDto.builder().service("wmsToAcsService")