xuzhancheng 2 tygodni temu
rodzic
commit
0dac71bb34

+ 3 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -52,6 +52,7 @@ import jodd.util.StringUtil;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -473,7 +474,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
     @Resource
     private FileApi fileApi;
 
-    @Value("${spring.profiles.active}")
+    @Value("${tz.env.name}")
     private String env;
 
     @Resource
@@ -485,6 +486,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
     private EquipBoilerCheckHistoryMapper equipBoilerCheckHistoryMapper;
 
     @Resource
+    @Lazy
     private BoilerTaskOrderIssueReportService boilerTaskOrderIssueReportService;
     @Resource
     private CommonThread commonThread;

+ 3 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -48,6 +48,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import jodd.util.StringUtil;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.transaction.annotation.Transactional;
@@ -392,7 +393,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
     @Resource
     private FileApi fileApi;
 
-    @Value("${spring.profiles.active}")
+    @Value("${tz.env.name}")
     private String env;
 
     @Resource
@@ -404,6 +405,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
     private EquipPipeCheckHistoryMapper equipPipeCheckHistoryMapper;
 
     @Resource
+    @Lazy
     private PipeTaskOrderIssueReportService pipeTaskOrderIssueReportService;
     @Resource
     private CommonThread commonThread;