批量添加

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -6,10 +6,7 @@ import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.AccountRepository;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
 import com.edgec.browserbackend.browser.domain.*;
-import com.edgec.browserbackend.browser.dto.ShopFilterDto;
-import com.edgec.browserbackend.browser.dto.ShopResultDto;
-import com.edgec.browserbackend.browser.dto.PageInfo;
-import com.edgec.browserbackend.browser.dto.ShopPageResultDto;
+import com.edgec.browserbackend.browser.dto.*;
 import com.edgec.browserbackend.browser.repository.GroupRepository;
 import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.ShopRepository;
@@ -101,9 +98,60 @@ public class ShopServiceImpl implements ShopService {
 
     @Override
     public List<String> addShops(String username, MultipartFile file) throws IOException {
-        List<Object> list = FileUtil.readExcel(file.getInputStream());
-        logger.error(list.toString());
-        return null;
+        List<String> ids = new ArrayList<>();
+        List<List<Object>> list = FileUtil.readExcel(file.getInputStream());
+        Account account = accountRepository.findByName(username);
+        if (account == null) {
+            throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
+        }
+        if (account.getPermission() < 4) {
+            throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
+        }
+        if (account.getShopCount() >= 10000) {
+            throw new ClientRequestException(AccountErrorCode.SHOPMAX);
+        }
+        for (List<Object> l : list) {
+            ShopResultDto shopResultDto = new ShopResultDto();
+            shopResultDto.setOwner(username);
+            shopResultDto.setShopName(l.get(0).toString());
+            shopResultDto.setShopPlatform(l.get(1).toString());
+            shopResultDto.setGroup("-1");
+            if (StringUtils.isNotBlank(l.get(2).toString()))
+                shopResultDto.setShopAccount(l.get(2).toString());
+            if (StringUtils.isNotBlank(l.get(3).toString()))
+                shopResultDto.setShopPassword(l.get(3).toString());
+            String id = null;
+            UserShop us = null;
+            if (shopResultDto.getShopId() != null)
+                us = userShopRepository.findByUsernameAndShopId(username, shopResultDto.getShopId());
+            if (shopResultDto.getGroup() == null)
+                throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
+            Group group = groupRepository.findById(shopResultDto.getGroup()).orElse(null);
+            if (group == null) {
+                throw new ClientRequestException(BrowserErrorCode.GROUPNOTEXIST);
+            }
+            try {
+                shopResultDto.setOwner(username);
+                Shop shop = new Shop();
+                shop.of(shopResultDto);
+                id = shopRepository.save(shop).getShopId();
+                UserShop userShop = new UserShop();
+                userShop.setUsername(username);
+                userShop.setShopId(id);
+                if (shopResultDto.getGroup() != null && us == null) {
+                    userShop.setGroupId(shopResultDto.getGroup());
+                }
+                userShopRepository.save(userShop);
+                //可以优化
+                account.setShopCount(account.getShopCount() + 1);
+                accountRepository.save(account);
+                ids.add(id);
+            }catch (Exception e) {
+                logger.error("fail to add shops", e.getMessage());
+                throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
+            }
+        }
+        return ids;
     }
 
     @Override

src/main/java/com/edgec/browserbackend/common/utils/FileUtil.java

@@ -69,8 +69,8 @@ public class FileUtil {
     }
 
     //读取excel
-    public static List<Object> readExcel(InputStream inputStream){
-        List<Object> list = new ArrayList<>();
+    public static List<List<Object>> readExcel(InputStream inputStream){
+        List<List<Object>> list = new ArrayList<>();
         Workbook workbook = null;
         try {
             workbook = WorkbookFactory.create(inputStream);
@@ -86,19 +86,27 @@ public class FileUtil {
             int colLength = row.getLastCellNum();
             //得到指定的单元格
             Cell cell = row.getCell(0);;
+            int size = 1;
             for (int i = 2; i < rowLength; i++) {
                 row = sheet.getRow(i);
+                List<Object> rowvalue = new ArrayList<>();
+                size = 0;
                 for (int j = 0; j < colLength; j++) {
                     cell = row.getCell(j);
 //                    System.out.println(cell);
-                    if (cell == null)
-                        throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
-                    if (cell != null) {
+                    if (cell!=null) {
                         Object cellValue = getCellFormatValue(cell);
-                        if (StringUtils.isNotBlank(cellValue.toString()))
-                            log.error(cellValue.toString());
+                        rowvalue.add(cellValue);
+                        if (StringUtils.isNotBlank(cellValue.toString())) {
+                            size++;
+                        }
                     }
                 }
+                if (size == 0)
+                    break;
+                if (StringUtils.isBlank(rowvalue.get(0).toString()) || StringUtils.isBlank(rowvalue.get(1).toString()))
+                    throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
+                list.add(rowvalue);
             }
         } catch (Exception e) {
             log.error("parse excel file error :", e);
@@ -113,7 +121,7 @@ public class FileUtil {
             //判断cell类型
             switch(cell.getCellType()){
                 case Cell.CELL_TYPE_NUMERIC:{
-                    cellValue = String.valueOf(cell.getNumericCellValue());
+                    cellValue = String.valueOf((int)cell.getNumericCellValue());
                     break;
                 }
                 case Cell.CELL_TYPE_FORMULA:{