|
|
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.style24.core.support.env.TscConstants;
|
|
|
import com.style24.front.biz.dao.TsfDisplayDao;
|
|
|
import com.style24.front.biz.dao.TsfGoodsDao;
|
|
|
@@ -27,6 +28,7 @@ import com.style24.persistence.domain.GoodsStock;
|
|
|
import com.style24.persistence.domain.GoodsVideo;
|
|
|
import com.style24.persistence.domain.GoodsViewHst;
|
|
|
import com.style24.persistence.domain.Measurement;
|
|
|
+import com.style24.persistence.domain.MeasurementStyle;
|
|
|
import com.style24.persistence.domain.Notice;
|
|
|
import com.style24.persistence.domain.ReinboundInform;
|
|
|
import com.style24.persistence.domain.SizeInfo;
|
|
|
@@ -56,6 +58,10 @@ public class TsfGoodsService {
|
|
|
@Autowired
|
|
|
private TsfDisplayDao displayDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ObjectMapper mapper;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 상품뷰이력 생성
|
|
|
*
|
|
|
@@ -667,25 +673,24 @@ public class TsfGoodsService {
|
|
|
* @author eskim
|
|
|
* @date 2021. 3. 10
|
|
|
*/
|
|
|
- public GagaMap getMeasurementListNew(Goods goods) {
|
|
|
+ public Collection<MeasurementStyle> getMeasurementListNew(Goods goods) {
|
|
|
GagaMap result = new GagaMap();
|
|
|
// 행, 열 변환
|
|
|
- Collection<Measurement> getMeasurementList = goodsDao.getMeasurementList(goods);
|
|
|
+ Collection<Measurement> measurementList = goodsDao.getMeasurementList(goods);
|
|
|
+ Collection<MeasurementStyle> measurementStyleList = new ArrayList<MeasurementStyle>();
|
|
|
|
|
|
- if (getMeasurementList == null || getMeasurementList.size() <=0) {
|
|
|
- result.set("flag", "NOT");
|
|
|
- return result;
|
|
|
+ if (measurementList == null || measurementList.isEmpty()) {
|
|
|
+ return measurementStyleList;
|
|
|
}
|
|
|
|
|
|
- int colSize = getMeasurementList.size(); // 열 column
|
|
|
+ int colSize = measurementList.size(); // 열 column
|
|
|
int rowSize = 5; // 상의하위포함 최대사이즈
|
|
|
-
|
|
|
|
|
|
String[][] arrMeasurementList = new String[rowSize + 1][colSize + 1];
|
|
|
|
|
|
// 사이즈 설정
|
|
|
int yIndex = 0;
|
|
|
- for (Measurement measurement : getMeasurementList) {
|
|
|
+ for (Measurement measurement : measurementList) {
|
|
|
arrMeasurementList[0][0] = measurement.getTypecd();
|
|
|
yIndex++;
|
|
|
arrMeasurementList[0][yIndex] = measurement.getOptCd2();
|
|
|
@@ -701,12 +706,53 @@ public class TsfGoodsService {
|
|
|
arrMeasurementList[3][yIndex] = String.valueOf(measurement.getValue3());
|
|
|
arrMeasurementList[4][yIndex] = String.valueOf(measurement.getValue4());
|
|
|
arrMeasurementList[5][yIndex] = String.valueOf(measurement.getValue5());
|
|
|
+
|
|
|
+// arrMeasurementList = [[하의, 100, 110, 120, 130, 140, 150],
|
|
|
+// [하의, 42.0, 44.0, 46.0, 48.0, 52.0, 54.0],
|
|
|
+// [하의, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
|
|
|
+// [하의, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
|
|
|
+// [하의, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
|
|
|
+// [하의, 51.0, 60.0, 65.0, 75.0, 79.0, 87.0]]
|
|
|
+//
|
|
|
}
|
|
|
- log.info("arrMeasurementList = {}", arrMeasurementList);
|
|
|
|
|
|
- result.set("flag", "OK");
|
|
|
- result.set("dataList", arrMeasurementList);
|
|
|
- return result;
|
|
|
+ for(int i=0; i< 6; i++) {
|
|
|
+ MeasurementStyle measurementStyle = new MeasurementStyle();
|
|
|
+ measurementStyle.setGoodsCd(goods.getGoodsCd());
|
|
|
+ measurementStyle.setSizeCount(colSize);
|
|
|
+
|
|
|
+ log.info("arrMeasurementList[0].length = {}", arrMeasurementList[0].length);
|
|
|
+ for(int j=0; j<arrMeasurementList[0].length; j++) {
|
|
|
+ switch(j) {
|
|
|
+ case 0: measurementStyle.setTypecd(arrMeasurementList[i][j]); break;
|
|
|
+ case 1: measurementStyle.setSize1(arrMeasurementList[i][j]); break;
|
|
|
+ case 2: measurementStyle.setSize2(arrMeasurementList[i][j]); break;
|
|
|
+ case 3: measurementStyle.setSize3(arrMeasurementList[i][j]); break;
|
|
|
+ case 4: measurementStyle.setSize4(arrMeasurementList[i][j]); break;
|
|
|
+ case 5: measurementStyle.setSize5(arrMeasurementList[i][j]); break;
|
|
|
+ case 6: measurementStyle.setSize6(arrMeasurementList[i][j]); break;
|
|
|
+ case 7: measurementStyle.setSize7(arrMeasurementList[i][j]); break;
|
|
|
+ case 8: measurementStyle.setSize8(arrMeasurementList[i][j]); break;
|
|
|
+ case 9: measurementStyle.setSize9(arrMeasurementList[i][j]); break;
|
|
|
+ case 10: measurementStyle.setSize10(arrMeasurementList[i][j]); break;
|
|
|
+ case 11: measurementStyle.setSize11(arrMeasurementList[i][j]); break;
|
|
|
+ case 12: measurementStyle.setSize12(arrMeasurementList[i][j]); break;
|
|
|
+ case 13: measurementStyle.setSize13(arrMeasurementList[i][j]); break;
|
|
|
+ case 14: measurementStyle.setSize14(arrMeasurementList[i][j]); break;
|
|
|
+ case 15: measurementStyle.setSize15(arrMeasurementList[i][j]); break;
|
|
|
+ case 16: measurementStyle.setSize16(arrMeasurementList[i][j]); break;
|
|
|
+ case 17: measurementStyle.setSize17(arrMeasurementList[i][j]); break;
|
|
|
+ case 18: measurementStyle.setSize18(arrMeasurementList[i][j]); break;
|
|
|
+ case 19: measurementStyle.setSize19(arrMeasurementList[i][j]); break;
|
|
|
+ case 20: measurementStyle.setSize20(arrMeasurementList[i][j]); break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ measurementStyleList.add(measurementStyle);
|
|
|
+ }
|
|
|
+
|
|
|
+ log.info("measurementStyleList = {}", measurementStyleList);
|
|
|
+
|
|
|
+ return measurementStyleList;
|
|
|
}
|
|
|
|
|
|
/**
|
eskim