物料库更新数据去除同步到B2B的方法

src/main/java/com/uas/ps/product/controller/ProductUsersController.java

@@ -9,7 +9,6 @@ import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.service.ProductUsersService;
 import com.uas.ps.product.support.ProductBufferedLogger;
-import com.uas.ps.product.sync.WaitSyncHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +25,9 @@ import java.util.List;
 /**
  * 用户个人产品库
  * <p>
- * Created by hejq on 2017-11-08.
+ *
+ * @author hejq
+ * @date 2017-11-08
  */
 @RequestMapping(value = "/productuser")
 @RestController
@@ -38,9 +39,6 @@ public class ProductUsersController {
     @Autowired
     private ProductService productService;
 
-    @Autowired
-    private WaitSyncHelper waitSyncHelper;
-
     private final static ProductBufferedLogger logger = BufferedLoggerManager.getLogger(ProductBufferedLogger.class);
 
     /**
@@ -55,9 +53,7 @@ public class ProductUsersController {
         String json = URLDecoder.decode(data, "utf-8");
         List<ProductUsers> productUsersList = JSONObject.parseArray(json, ProductUsers.class);
         try {
-            waitSyncHelper.preWait("B2B");
             productUsersService.update(productUsersList);
-            waitSyncHelper.waitResponse();
             logger.log("成功", "保存用户个人物料信息成功，数据量：" + productUsersList.size(), null, productUsersList.get(0).getUseruu(), productUsersList.get(0).getEnuu(), null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -65,7 +61,6 @@ public class ProductUsersController {
         }
         ModelMap map = new ModelMap();
         map.put("success", "true");
-//        logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了个人物料，数量为" + map.size());
         return map;
     }
 
@@ -79,7 +74,7 @@ public class ProductUsersController {
     @RequestMapping(value = "/saveBatch", method = RequestMethod.POST)
     public List<Long> saveProductUsersBatch(@RequestBody String data) throws UnsupportedEncodingException {
         String json = URLDecoder.decode(data, "utf-8");
-        List<Product> productInfo = JSONObject.parseArray(URLDecoder.decode(data, "utf-8"), Product.class);
+        List<Product> productInfo = JSONObject.parseArray(json, Product.class);
         List<Long> resultProducts = new ArrayList<>();
 
         for (Product product : productInfo) {
@@ -133,9 +128,7 @@ public class ProductUsersController {
     public ModelMap deleteById(@RequestParam("id") Long id) {
         ModelMap map = new ModelMap();
         try {
-            waitSyncHelper.preWait("B2B");
             productUsersService.deleteById(id);
-            waitSyncHelper.waitResponse();
             logger.log("成功", "新增个人物料成功，物料id：" + id, null, null, null, null);
         } catch (Exception e) {
             logger.log("失败", "新增个人物料失败，物料id：" + id, null, null, null, null);
@@ -157,9 +150,7 @@ public class ProductUsersController {
         List<Long> idList = JSONObject.parseArray(URLDecoder.decode(ids, "utf-8"), Long.class);
         ModelMap map = new ModelMap();
         try {
-            waitSyncHelper.preWait("B2B");
             productUsersService.deleteByBatch(idList);
-            waitSyncHelper.waitResponse();
             logger.log("成功", "批量删除个人物料成功，数据量：" + idList.size(), null, null, null, null);
         } catch (Exception e) {
             logger.log("失败", "批量删除个人物料失败，数据量：" + idList.size(), null, null, null, null);
@@ -183,9 +174,7 @@ public class ProductUsersController {
         Long userUU = Long.valueOf(String.valueOf(jsonObject.get("userUU")));
         List<Long> prIds = JSON.parseArray(ids, Long.class);
         try {
-            waitSyncHelper.preWait("B2B");
             Integer i = productUsersService.coverToUserProdByIds(prIds, userUU, enUU);
-            waitSyncHelper.waitResponse();
             logger.log("成功", "批量转入我的物料成功，数据量：" + prIds.size(), null, userUU, enUU, null);
             return i;
         } catch (Exception e) {
@@ -209,9 +198,7 @@ public class ProductUsersController {
         Long enUU = (Long) jsonObject.get("enUU");
         Long userUU = (Long) jsonObject.get("userUU");
         try {
-            waitSyncHelper.preWait("B2B");
             productUsersService.coverToUserProdById(id, userUU, enUU);
-            waitSyncHelper.waitResponse();
             logger.log("成功", "单个转入我的物料成功，物料id：" + id, null, userUU, enUU, null);
         } catch (Exception e) {
             logger.log("失败", "单个转入我的物料失败，物料id：" + id, null, userUU, enUU, null);
@@ -229,7 +216,6 @@ public class ProductUsersController {
     @HttpLog
     @RequestMapping(value = "/getProductUsersByEnUUAndCmpCode", method = RequestMethod.GET)
     public List<ProductUsers> getProductUsersByEnUUAndCmpCode(Long enUU, String cmpCode) {
-
         try {
             List<ProductUsers> productUsersList = productUsersService.getProductUsersByEnUUAndCmpCode(enUU, cmpCode);
             logger.log("成功", "根据企业UU和物料原厂型号cmpCode获取个人产品库信息成功，物料型号：" + cmpCode, null, null, enUU, null);