Merge remote-tracking branch 'origin/master'

platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java

@@ -234,14 +234,14 @@ public class TbCfStationItemController extends ApiBaseAction {
      */
     @RequestMapping("/itemTop")
     @ResponseBody
-    public R itemTop(@RequestParam("itemId") String itemId) {
-        int res = tbCfStationItemService.itemTop(itemId);
+    public R itemTop(@RequestBody String[] itemIds) {
+        int res = tbCfStationItemService.itemTop(itemIds);
         if (res > 0) {
             return R.ok();
         } else if (res == -1) {
             return R.error("该商品已下架，不能置顶");
         } else if (res == -2) {
-            return R.error("最多置顶2400个商品");
+            return R.error("最多置顶300个商品");
         }
         return R.error("置顶失败");
     }
@@ -251,8 +251,8 @@ public class TbCfStationItemController extends ApiBaseAction {
      */
     @RequestMapping("/cancelTop")
     @ResponseBody
-    public R cancelTop(@RequestParam("itemId") String itemId) {
-        int res = tbCfStationItemService.cancelTop(itemId);
+    public R cancelTop(@RequestBody String[] itemIds) {
+        int res = tbCfStationItemService.cancelTop(itemIds);
         if (res > 0) {
             return R.ok();
         }

platform-admin/src/main/java/com/platform/service/TbCfStationItemService.java

@@ -100,9 +100,9 @@ public interface TbCfStationItemService {
 
     List<SysUserEntity> queryCreator();
 
-    int itemTop(String itemId);
+    int itemTop(String[] itemIds);
 
-    int cancelTop(String itemId);
+    int cancelTop(String[] itemIds);
 
     int itemUpward(String itemId);
 

platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java

@@ -54,6 +54,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     @Autowired
     private TbCfItemParamDao tbCfItemParamDao;
 
+    private ReentrantLock lock = new ReentrantLock();
 
     @Override
     public ItemInfo queryItemInfoById(String itemId) {
@@ -483,27 +484,38 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     }
 
     @Override
-    public int itemTop(String itemId) {
-        TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemId);
-        if ("2".equals(String.valueOf(item.getEnableFlag()))) {
-            return -1;
-        }
-        int topCount = tbCfStationItemDao.queryTopCount();
-        if (topCount >= 2400) {
-            return -2;
+    public int itemTop(String[] itemIds) {
+        int res = 0;
+        for (int i = 0; i < itemIds.length; i++) {
+            TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemIds[i]);
+            if ("2".equals(String.valueOf(item.getEnableFlag()))) {
+                return -1;
+            }
+            int topCount = tbCfStationItemDao.queryTopCount();
+            if (topCount >= 300) {
+                return -2;
+            }
+            synchronized (this) {
+                item.setItemTop(1);
+                int maxSort = tbCfStationItemDao.maxSort();
+                item.setSort(++maxSort);
+                res = tbCfStationItemDao.update(item);
+            }
+
         }
-        item.setItemTop(1);
-        int maxSort = tbCfStationItemDao.maxSort();
-        item.setSort(++maxSort);
-        return tbCfStationItemDao.update(item);
+        return res;
     }
 
     @Override
-    public int cancelTop(String itemId) {
-        TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemId);
-        item.setItemTop(0);
-        item.setSort(0);
-        return tbCfStationItemDao.update(item);
+    public int cancelTop(String[] itemIds) {
+        int res = 0;
+        for (int i = 0; i < itemIds.length; i++) {
+            TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemIds[i]);
+            item.setItemTop(0);
+            item.setSort(0);
+            res = tbCfStationItemDao.update(item);
+        }
+        return res;
     }
 
     @Override