|
|
@@ -11,6 +11,7 @@ import javax.imageio.ImageIO;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.swing.ImageIcon;
|
|
|
|
|
|
+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;
|
|
|
@@ -96,6 +97,9 @@ public class TssGoodsController extends TssBaseController {
|
|
|
@Autowired
|
|
|
private ObjectMapper mapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TscExcelService excelService;
|
|
|
+
|
|
|
private static final int EXCEL_ROW_COUNT = 500;
|
|
|
|
|
|
/**
|
|
|
@@ -1267,7 +1271,7 @@ public class TssGoodsController extends TssBaseController {
|
|
|
"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() > 100) { //안전인증 로직 추가로 건수 줄임
|
|
|
@@ -1327,7 +1331,7 @@ public class TssGoodsController extends TssBaseController {
|
|
|
"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 (!"G001_B000".equals(TssSession.getInfo().getRoleCd()) && !"G001_E000".equals(TssSession.getInfo().getRoleCd())) {
|
yujung