循环依赖问题

src/main/java/com/imcs/admin/business/controller/WPInventoryCountPalletController.java

@@ -1,5 +1,6 @@
 package com.imcs.admin.business.controller;
 
+import com.imcs.admin.entity.WInventoryManagement;
 import com.imcs.admin.entity.WPInventoryCountPallet;
 import com.imcs.admin.business.service.WPInventoryCountPalletService;
 import com.imcs.admin.entity.WPInventoryCountTask;
@@ -9,6 +10,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 盘点托盘明细(WPInventoryCountPallet)表控制层
@@ -82,7 +84,7 @@ public class WPInventoryCountPalletController {
     }
 
     @GetMapping("/getPalletList/{id}")
-    public ResponseEntity<WPInventoryCountPallet> getPalletList(@PathVariable("id") Long id) {
+    public ResponseEntity<List<WInventoryManagement>> getPalletList(@PathVariable("id") Long id) {
         return ResponseEntity.ok(this.wPInventoryCountPalletService.getPalletList(id));
     }
 

src/main/java/com/imcs/admin/business/service/WPInventoryCountPalletService.java

@@ -1,5 +1,6 @@
 package com.imcs.admin.business.service;
 
+import com.imcs.admin.entity.WInventoryManagement;
 import com.imcs.admin.entity.WPInventoryCountPallet;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -55,5 +56,5 @@ public interface WPInventoryCountPalletService {
      */
     boolean deleteById(Long id);
 
-    List<WPInventoryCountPallet> getPalletList(Long id);
+    List<WInventoryManagement> getPalletList(Long id);
 }

src/main/java/com/imcs/admin/business/service/impl/BaseServiceImpl.java

@@ -85,14 +85,7 @@ public class BaseServiceImpl {
     @Resource
     public WPInventoryCountTaskDao wPInventoryCountTaskDao;
 
-    @Autowired
-    public MaterialPlanStrategy materialPlanStrategy;
-    @Autowired
-    public StoragePlanStrategy storagePlanStrategy;
-    @Autowired
-    public ShelfPlanStrategy shelfPlanStrategy;
-    @Autowired
-    public WarehousePlanStrategy warehousePlanStrategy;
+
     /**
      * 获取登录人信息
      * @return

src/main/java/com/imcs/admin/business/service/impl/WPInventoryCountPalletServiceImpl.java

@@ -1,7 +1,8 @@
 package com.imcs.admin.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.imcs.admin.business.strategy.PlanStrategy;
+import com.imcs.admin.business.strategy.*;
+import com.imcs.admin.entity.WInventoryManagement;
 import com.imcs.admin.entity.WPInventoryCountPallet;
 import com.imcs.admin.business.dao.WPInventoryCountPalletDao;
 import com.imcs.admin.business.service.WPInventoryCountPalletService;
@@ -28,13 +29,15 @@ import java.util.Map;
 @Service("wPInventoryCountPalletService")
 public class WPInventoryCountPalletServiceImpl extends BaseServiceImpl implements WPInventoryCountPalletService {
 
-    private final Map<String, PlanStrategy> strategyMap;
     private static final Map<Integer, PlanStrategy> strategyMap1=new HashMap<>();
-
     @Autowired
-    public WPInventoryCountPalletServiceImpl(Map<String, PlanStrategy> strategyMap) {
-        this.strategyMap = strategyMap;
-    }
+    private MaterialPlanStrategy materialPlanStrategy;
+    @Autowired
+    private StoragePlanStrategy storagePlanStrategy;
+    @Autowired
+    private ShelfPlanStrategy shelfPlanStrategy;
+    @Autowired
+    private WarehousePlanStrategy warehousePlanStrategy;
 
     @PostConstruct
     public void init(){
@@ -104,10 +107,10 @@ public class WPInventoryCountPalletServiceImpl extends BaseServiceImpl implement
     }
 
     @Override
-    public List<WPInventoryCountPallet> getPalletList(Long id) {
+    public List<WInventoryManagement> getPalletList(Long id) {
         WPInventoryCountTask wpInventoryCountTask = wPInventoryCountTaskDao.queryById(id);
         WPInventoryCountPlan wpInventoryCountPlan = wPInventoryCountPlanDao.queryById(wpInventoryCountTask.getWPInventoryCountPlanId());
-        strategyMap1.get(wpInventoryCountPlan.getPlanType()).execute(wpInventoryCountPlan);
-        return null;
+        List<WInventoryManagement> execute = strategyMap1.get(wpInventoryCountPlan.getPlanType()).execute(wpInventoryCountPlan);
+        return execute;
     }
 }