|
|
@@ -11,6 +11,8 @@ import javax.imageio.ImageIO;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.swing.ImageIcon;
|
|
|
|
|
|
+import com.style24.admin.biz.service.*;
|
|
|
+import com.style24.core.biz.service.TscExcelService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
@@ -35,11 +37,6 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
|
|
|
import com.gagaframework.web.util.GagaDateUtil;
|
|
|
import com.gagaframework.web.util.GagaFileUtil;
|
|
|
import com.gagaframework.web.util.GagaStringUtil;
|
|
|
-import com.style24.admin.biz.service.TsaCommonService;
|
|
|
-import com.style24.admin.biz.service.TsaCustomerService;
|
|
|
-import com.style24.admin.biz.service.TsaGoodsService;
|
|
|
-import com.style24.admin.biz.service.TsaRendererService;
|
|
|
-import com.style24.admin.biz.service.TsaSystemService;
|
|
|
import com.style24.admin.support.controller.TsaBaseController;
|
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
|
import com.style24.core.biz.service.TscKakaotalkService;
|
|
|
@@ -121,6 +118,9 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
@Autowired
|
|
|
private ObjectMapper mapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TscExcelService excelService;
|
|
|
+
|
|
|
private static final int EXCEL_ROW_COUNT = 500;
|
|
|
|
|
|
/**
|
|
|
@@ -3094,7 +3094,8 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
"niContent17", "niContent18", "niContent19", "niContent20", "niContent21", "niContent22", "niContent23",
|
|
|
"niContent24", "niContent25", "niContent26", "niContent27", "niContent28"};
|
|
|
|
|
|
- ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
|
|
|
+
|
|
|
+ ecxelGoodsList = excelService.getExcelList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
|
|
|
|
|
|
//건수
|
|
|
if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
|
yujung