diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 963072a36..2171bbf9d 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -33,8 +33,6 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService @Resource BasicCorpImportLogDao basicCorpImportLogDao; - @Resource - BasicCorpImportLogService basicCorpImportLogService; @Resource SqlSessionFactory sqlSessionFactory; @@ -101,13 +99,13 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService BasicCorpsImportLogEntity basicCorpsImportLogEntity=new BasicCorpsImportLogEntity(); basicCorpsImportLogEntity.setGenKey(genKey); basicCorpsImportLogEntity.setRemark("导入数据成功,导入数量为:"+ corpList.size()+"条"); - basicCorpImportLogService.updateImportLog(basicCorpsImportLogEntity); + this.updateImportLog(basicCorpsImportLogEntity); } catch (Exception e) { log.error("导入往来单位信息异常", e); BasicCorpsImportLogEntity basicCorpsImportLogEntity=new BasicCorpsImportLogEntity(); basicCorpsImportLogEntity.setGenKey(genKey); basicCorpsImportLogEntity.setRemark("导入数据失败"); - basicCorpImportLogService.updateImportLog(basicCorpsImportLogEntity); + this.updateImportLog(basicCorpsImportLogEntity); } } diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 9b7a945cf..86747869f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -23,6 +23,7 @@ import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.beans.BeanUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -49,6 +50,7 @@ public class IoChangeInoutService { @Resource IoAddInoutService addInoutService; @Resource + @Lazy IoCheckInoutService ioCheckInoutService; @Resource InvWarehouseService invWarehouseService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index e9aa14853..16bff6920 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -12,6 +12,7 @@ import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +25,7 @@ import java.util.List; public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource + @Lazy IoOrderDetailBizDao ioOrderDetailBizDao; @Override @@ -118,6 +120,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource IoOrderDetailCodeService orderDetailCodeService; @Resource + @Lazy IoCheckInoutService checkInoutService; @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 8b2589d02..ca0a4a8fd 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -14,6 +14,7 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,6 +32,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Resource IoOrderDetailBizService orderDetailBizService; @Resource + @Lazy IoCheckInoutService checkInoutService; @Resource private BasicCorpDao basicCorpDao; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 299ab7222..10c81dc77 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -43,6 +43,7 @@ import com.glxp.api.util.DateUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,6 +86,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Resource IoCodeTempService codeTempService; @Resource + @Lazy IoOrderDetailCodeService ioOrderDetailCodeService; @Resource IoOrderDetailResultService ioOrderDetailResultService; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 3015b0833..abf80ecb5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -19,6 +19,7 @@ import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -41,6 +42,7 @@ public class ThrOrdersDlService { @Resource RedisUtil redisUtil; @Resource + @Lazy private ThrOrderImportLogService thrOrderImportLogService; @Resource ThrOrderExportLogService thrOrderExportLogService; @@ -67,13 +69,13 @@ public class ThrOrdersDlService { ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); - //todo单据还没设计好 + //todo单据还没设计好 // BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl"); // if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { // WebSocketServer.sendInfo("业务单据查询接口未设置!", "sid"); // return; // } - ThrSystemDetailEntity thrSystemDetailEntity=new ThrSystemDetailEntity(); + ThrSystemDetailEntity thrSystemDetailEntity = new ThrSystemDetailEntity(); int page = 1; int limit = 100; @@ -213,7 +215,8 @@ public class ThrOrdersDlService { // thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); } -// + + // // // @Async // public void genJsonFile(String genKey, ThrOrderExportRequest thrOrderExportRequest) { @@ -543,7 +546,8 @@ public class ThrOrdersDlService { } return -1; } -// + + // // public List> exportThrOrders(FilterThrOrderRequest filterThrOrderRequest) { // BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); // bussinessTypeFilterRequest.setEnabled(true); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index c2ea007e2..5f51c4cde 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -13,6 +13,7 @@ import com.glxp.api.service.thrsys.ThrOrderImportDetailService; import com.glxp.api.service.thrsys.ThrOrderImportLogService; import com.glxp.api.service.thrsys.ThrOrderService; import org.springframework.beans.BeanUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,11 +32,10 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { @Resource ThrOrderImportLogDao thrOrderImportLogDao; - @Resource - ThrOrderImportLogService thrOrderImportLogService; @Resource ThrOrderImportDetailService thrOrderImportDetailService; @Resource + @Lazy ThrOrderService thrOrderService; @Resource ThrOrderDetailService thrOrderDetailService; @@ -87,7 +87,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { @Async public void importThrOrder(String genKey) { - ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); + ThrOrderImportLogEntity thrOrderImportLogEntity = this.selectByGenKey(genKey); if (thrOrderImportLogEntity.getStatus() == BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS) { FilterThrCorpImportLogRequest filterUdiIpLogRequest = new FilterThrCorpImportLogRequest(); filterUdiIpLogRequest.setGenKey(genKey); @@ -120,7 +120,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { } thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); + this.updateImportLog(thrOrderImportLogEntity); } }