Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/dao/TsaCommonDao.java

@@ -13,24 +13,6 @@ import com.style24.persistence.domain.Sequence;
 @ShopDs
 public interface TsaCommonDao {
 
-	/**
-	 * 시퀀스 조회
-	 * @param value - 시퀀스명
-	 * @return
-	 * @author gagamel
-	 * @since 2021. 1. 4
-	 */
-	Integer getNextSequence(String value);
-
-	/**
-	 * 시퀀스 생성
-	 * @param sequence - 시퀀스정보
-	 * @return
-	 * @author gagamel
-	 * @since 2021. 1. 4
-	 */
-	void createNextSequence(Sequence sequence);
-
 	/**
 	 * 엑셀조회를 위한 SEARCH 테이블 삭제
 	 *

src/main/java/com/style24/admin/biz/service/TsaBusinessService.java

@@ -14,6 +14,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.admin.biz.dao.TsaBusinessDao;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscCommonService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Aflink;
@@ -55,8 +56,8 @@ public class TsaBusinessService {
 	private TsaBusinessDao businessDao;
 	
 	@Autowired
-	private TsaCommonService commonService;
-	
+	private TscCommonService commonService;
+
 	@Autowired
 	private TsaDisplayService displayService;
 	

src/main/java/com/style24/admin/biz/service/TsaCommonService.java

@@ -2,13 +2,9 @@ package com.style24.admin.biz.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.style24.admin.biz.dao.TsaCommonDao;
 import com.style24.persistence.domain.SearchData;
-import com.style24.persistence.domain.Sequence;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -25,25 +21,6 @@ public class TsaCommonService {
 	@Autowired
 	private TsaCommonDao commonDao;
 
-	/**
-	 * 시퀀스 조회(중첩트랜잭션으로 처리. 부모 트랜잭션의 커밋과 롤백에는 영향을 받지만 자신의 커밋과 롤백은 부모 트랜잭션에게 영향을 주지 않는다.)
-	 * @param sequenceNm - 시퀀스명
-	 * @return
-	 * @author gagamel
-	 * @since 2021. 1. 4
-	 */
-	@Transactional(value = "shopTxnManager", isolation = Isolation.SERIALIZABLE, propagation = Propagation.NESTED)
-	public Integer getNextSequence(String sequenceNm) {
-		Integer nextVal = commonDao.getNextSequence(sequenceNm);
-
-		Sequence sequence = new Sequence();
-		sequence.setSequenceNm(sequenceNm);
-		sequence.setNextVal(nextVal);
-		commonDao.createNextSequence(sequence);
-
-		return sequence.getNextVal();
-	}
-
 	/**
 	 * 엑셀조회를 위한 SEARCH 테이블 삭제
 	 *

src/main/java/com/style24/admin/biz/service/TsaDisplayService.java

@@ -22,6 +22,7 @@ import org.springframework.util.StringUtils;
 
 import com.style24.admin.biz.dao.TsaDisplayDao;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscCommonService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -42,7 +43,7 @@ public class TsaDisplayService {
 	private TsaDisplayDao displayDao;
 
 	@Autowired
-	private TsaCommonService commonService;
+	private TscCommonService commonService;
 
 	@Autowired
 	private Environment env;

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.admin.biz.dao.TsaGoodsDao;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscCommonService;
 import com.style24.core.biz.thirdparty.NaverLowestPriceApi;
 import com.style24.core.biz.thirdparty.SafetyKoreaApi;
 import com.style24.core.support.message.TscMessageByLocale;
@@ -94,6 +95,9 @@ public class TsaGoodsService {
 	@Autowired
 	private TsaCommonService commonService;
 
+	@Autowired
+	private TscCommonService tscCommonService;
+
 	@Autowired
 	private TsaNoticeService noticeService;
 
@@ -3583,14 +3587,14 @@ public class TsaGoodsService {
 			}
 
 			if (StringUtils.isBlank(sizeInfo.getSizeCate2Cd())) {
-				sizeCate2Cd = commonService.getNextSequence("SEQ_CATE").toString();
+				sizeCate2Cd = tscCommonService.getNextSequence("SEQ_CATE").toString();
 				sizeInfo.setSizeCate2Cd(sizeCate2Cd);
 			}
 
 		} else {
 
 			if (StringUtils.isBlank(sizeInfo.getSizeCate1Cd())) {
-				sizeCate1Cd = commonService.getNextSequence("SEQ_CATE").toString();
+				sizeCate1Cd = tscCommonService.getNextSequence("SEQ_CATE").toString();
 				sizeInfo.setSizeCate1Cd(sizeCate1Cd);
 				sizeInfo.setSizeCate2Cd(sizeCate1Cd);
 			}

src/main/java/com/style24/persistence/domain/Sequence.java

@@ -1,20 +0,0 @@
-package com.style24.persistence.domain;
-
-import java.io.Serializable;
-
-import lombok.Data;
-
-/**
- * SEQUENCE Domain
- * 
- * @author gagamel
- * @since 2021. 1. 4
- */
-@SuppressWarnings("serial")
-@Data
-public class Sequence implements Serializable {
-
-	private String sequenceNm;	// 시퀀스명
-	private Integer nextVal;	// 다음값
-
-}

src/main/java/com/style24/persistence/mybatis/shop/TsaCommon.xml

@@ -2,22 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaCommonDao">
 
-	<!-- 시퀀스 값 조회 -->
-	<select id="getNextSequence" parameterType="String" resultType="Integer">
-		/* TsaCommon.getNextSequence */
-		SELECT IFNULL((SELECT NEXT_VAL
-		               FROM   TB_SEQUENCE
-		               WHERE  SEQUENCE_NM = #{sequenceNm}
-		              ),0) + 1 AS NEXT_VAL
-	</select>
-
-	<!-- 시퀀스 생성 -->
-	<insert id="createNextSequence" parameterType="Sequence">
-		/* TsaCommon.createNextSequence */
-		INSERT INTO TB_SEQUENCE (SEQUENCE_NM, NEXT_VAL) VALUES (#{sequenceNm}, #{nextVal})
-		ON DUPLICATE KEY UPDATE NEXT_VAL = #{nextVal}
-	</insert>
-	
 	<!-- 엑셀조회를 위한 SEARCH 테이블 삭제  -->
 	<delete id="deleteExceluploadSearCh" parameterType="SearchData">
 		/* TsaCommon.deleteExceluploadSearCh */