|
@@ -1,6 +1,6 @@
|
|
|
package com.style24.admin.biz.web;
|
|
package com.style24.admin.biz.web;
|
|
|
|
|
|
|
|
-import java.awt.Image;
|
|
|
|
|
|
|
+import java.awt.*;
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -9,10 +9,8 @@ import java.util.Collections;
|
|
|
|
|
|
|
|
import javax.imageio.ImageIO;
|
|
import javax.imageio.ImageIO;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.swing.ImageIcon;
|
|
|
|
|
|
|
+import javax.swing.*;
|
|
|
|
|
|
|
|
-import com.style24.admin.biz.service.*;
|
|
|
|
|
-import com.style24.core.biz.service.TscExcelService;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
import org.springframework.core.env.Environment;
|
|
@@ -37,8 +35,14 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
|
|
|
import com.gagaframework.web.util.GagaDateUtil;
|
|
import com.gagaframework.web.util.GagaDateUtil;
|
|
|
import com.gagaframework.web.util.GagaFileUtil;
|
|
import com.gagaframework.web.util.GagaFileUtil;
|
|
|
import com.gagaframework.web.util.GagaStringUtil;
|
|
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.controller.TsaBaseController;
|
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
|
|
|
+import com.style24.core.biz.service.TscExcelService;
|
|
|
import com.style24.core.biz.service.TscKakaotalkService;
|
|
import com.style24.core.biz.service.TscKakaotalkService;
|
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
|
import com.style24.persistence.TscPageRequest;
|
|
import com.style24.persistence.TscPageRequest;
|
|
@@ -2699,7 +2703,8 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
// DB 처리 시 사용되는 파라미터명(셀명) 설정
|
|
// DB 처리 시 사용되는 파라미터명(셀명) 설정
|
|
|
String[] cellName = {"goodsCd", "resGoodsPrice", "applyStdt", "applyEddt"};
|
|
String[] cellName = {"goodsCd", "resGoodsPrice", "applyStdt", "applyEddt"};
|
|
|
|
|
|
|
|
- Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
|
|
|
|
|
|
|
+ // Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
|
|
|
|
|
+ Collection<GagaMap> ecxelGoodsList = excelService.getExcelList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
|
|
|
|
|
|
|
|
//건수
|
|
//건수
|
|
|
if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
|
|
if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
|
card007