Browse Source

物料更新等待同步修改

dongbw 7 years ago
parent
commit
385b001a7c

+ 5 - 1
src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -6,6 +6,7 @@ import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
 import com.uas.ps.entity.Status;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.httplog.annotation.HttpLog;
+import com.uas.ps.product.data.MyJdbcTemplate;
 import com.uas.ps.product.entity.Prod;
 import com.uas.ps.product.entity.Prod;
 import com.uas.ps.product.entity.ProductSaler;
 import com.uas.ps.product.entity.ProductSaler;
 import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.service.ProductService;
@@ -42,6 +43,9 @@ public class ProductController {
     @Autowired
     @Autowired
     private WaitSyncHelper waitSyncHelper;
     private WaitSyncHelper waitSyncHelper;
 
 
+    @Autowired
+    private MyJdbcTemplate jdbcTemplate;
+
     /**
     /**
      * 一键开启/关闭 对应的物料采购属性
      * 一键开启/关闭 对应的物料采购属性
      */
      */
@@ -168,7 +172,7 @@ public class ProductController {
     public List<Long> updateB2bProdInfo(@RequestBody List<Product> data) {
     public List<Long> updateB2bProdInfo(@RequestBody List<Product> data) {
         List<Long> ids = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
         try {
         try {
-            waitSyncHelper.preWait("B2B");
+            waitSyncHelper.preWait("B2B", jdbcTemplate);
             ids = productService.update(data);
             ids = productService.update(data);
             waitSyncHelper.waitResponse();
             waitSyncHelper.waitResponse();
             log(data, "成功", "B2B批量更新物料信息成功,数据量:" + data.size(), null, null);
             log(data, "成功", "B2B批量更新物料信息成功,数据量:" + data.size(), null, null);

+ 3 - 3
src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -306,14 +306,14 @@ public class ProductServiceImpl implements ProductService {
 //                    }
 //                    }
 //                }
 //                }
 //            }
 //            }
-            waitSyncHelper.preWait("B2B");
 //            List<Product> products = productDao.save(data);
 //            List<Product> products = productDao.save(data);
+            waitSyncHelper.preWait("B2B", jdbcTemplate);
             List<Long> ids = update(data);
             List<Long> ids = update(data);
-            List<Product> products = productDao.findAll(ids);
             waitSyncHelper.waitResponse();
             waitSyncHelper.waitResponse();
+            List<Product> products = productDao.findAll(ids);
 //            System.out.println("更新完物料:" + (System.currentTimeMillis()  - start));
 //            System.out.println("更新完物料:" + (System.currentTimeMillis()  - start));
 //            start = System.currentTimeMillis();
 //            start = System.currentTimeMillis();
-            waitSyncHelper.preWait("B2B");
+            waitSyncHelper.preWait("B2B", jdbcTemplate);
             int sum = updateProductUser(products);
             int sum = updateProductUser(products);
             waitSyncHelper.waitResponse();
             waitSyncHelper.waitResponse();
 //            System.out.println("保存完个人物料:" + (System.currentTimeMillis()  - start));
 //            System.out.println("保存完个人物料:" + (System.currentTimeMillis()  - start));