Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

src/main/resources/sqlmapper/mappers/board/board.xml

@@ -156,20 +156,8 @@
 					#{position,jdbcType=VARCHAR}
 		)
 		<selectKey resultType="int" keyProperty="seq" order="AFTER">
-	        SELECT currval(H3_BD_${id}_LIST_SEQ) as seq
+      SELECT currval(#{id}||'_bd_seq') as seq
     </selectKey>
-	<!-- 
-		BD_SEQ, BD_MB_ID, BD_GROUP_SEQ, BD_CATEGORY, BD_NAME, 
-				BD_CONTENT, BD_SUBJECT, BD_PARENT_SEQ, BD_PREV_SEQ, BD_NEXT_SEQ, BD_STEP, 
-				BD_DEPTH, BD_REGDATE, BD_HIT, BD_RECOMMEND, BD_IP, BD_NOTICE, 
-				BD_HTML, BD_NUM1, BD_NUM2, BD_DATA1, BD_DATA2, BD_PLACE1, BD_POSITION
-	
-	
-				#{bd_seq}, #{bd_mb_id}, #{bd_group_seq}, #{bd_category}, #{bd_name},
-				#{bd_content}, #{bd_subject}, #{bd_parent_seq}, #{bd_prev_seq}, #{bd_next_seq}, #{bd_step}, 
-				#{bd_depth}, #{bd_regdate}, #{bd_hit}, #{bd_recommend}, #{bd_ip}, #{bd_notice}, 
-				#{bd_html}, #{bd_num1}, #{bd_num2}, #{bd_data1}, #{bd_data2}, #{bd_place1}, #{bd_position}
-	 -->
 	</insert>
 	
 	<update id="Board.updateGrpSeq" parameterType="boardVO">
@@ -182,61 +170,40 @@
 	</update>
 	
 	<select id="Board.selectPrevBoard" parameterType="boardVO" resultType="boardVO">
-		SELECT
+		SELECT BD_SEQ AS SEQ,
-			ALL_LIST.BD_SEQ AS SEQ, ALL_LIST.BD_MB_ID AS USERID, ALL_LIST.BD_GROUP_SEQ AS GROUPSEQ,
+		       BD_MB_ID AS USERID,
-			ALL_LIST.BD_CATEGORY AS CATEGORY, ALL_LIST.BD_NAME AS USERNAME, ALL_LIST.BD_CONTENT AS CONTENT,
+		       BD_GROUP_SEQ AS GROUPSEQ,
-			ALL_LIST.BD_SUBJECT AS SUBJECT, ALL_LIST.BD_PARENT_SEQ AS PARENTSEQ, ALL_LIST.BD_PREV_SEQ AS PREVSEQ,
+			     BD_CATEGORY AS CATEGORY,
-			ALL_LIST.BD_NEXT_SEQ AS NEXTSEQ, ALL_LIST.BD_STEP AS STEP, ALL_LIST.BD_DEPTH AS DEPTH,
+		       BD_NAME AS USERNAME,
-			ALL_LIST.BD_REGDATE AS REGDATE, ALL_LIST.BD_HIT AS HIT, ALL_LIST.BD_RECOMMEND AS RECOMMEND,
+		       BD_CONTENT AS CONTENT,
-			ALL_LIST.BD_IP AS IP, ALL_LIST.BD_NOTICE AS NOTICE, ALL_LIST.BD_HTML AS HTML,
+			     BD_SUBJECT AS SUBJECT,
-			ALL_LIST.BD_NUM1 AS NUM1, ALL_LIST.BD_NUM2 AS NUM2, ALL_LIST.BD_DATA1 AS DATA1, ALL_LIST.BD_DATA2 AS DATA2,
+		       BD_PARENT_SEQ AS PARENTSEQ,
+		       BD_PREV_SEQ AS PREVSEQ,
+			     BD_NEXT_SEQ AS NEXTSEQ,
+		       BD_STEP AS STEP,
+		       BD_DEPTH AS DEPTH,
+			     BD_REGDATE AS REGDATE,
+		       BD_HIT AS HIT,
+		       BD_RECOMMEND AS RECOMMEND,
+			     BD_IP AS IP,
+		       BD_NOTICE AS NOTICE,
+		       BD_HTML AS HTML,
+			     BD_NUM1 AS NUM1,
+		       BD_NUM2 AS NUM2,
+		       BD_DATA1 AS DATA1,
+		       BD_DATA2 AS DATA2,
 			     #{id} ID
-		FROM  
-		(
-		    SELECT ROWNUM RNUM, ALL_LIST.*
-		    FROM  (
-		    	SELECT
-		              *
 		FROM H3_BD_${id}_LIST
-		        WHERE  1 = 1
+    <where>
-		        <choose>
+      <if test='seq != null and seq != 0'>
-		            <when test='category == " " and id == "stat_bbs"'>
+        AND BD_SEQ = #{seq}
-					</when>
+      </if>
-		            <otherwise>
+      <if test='category != " " and id != "stat_bbs"'>
         AND	BD_CATEGORY = #{category}
-					</otherwise>
+      </if>
-				</choose>
+    </where>
-		        ORDER BY
+    order by bd_seq desc
-		        	BD_GROUP_SEQ DESC,
+    limit 1 offset 1
-		            BD_STEP	ASC
-		    ) ALL_LIST
-		) ALL_LIST
-		JOIN
-		( 
-			SELECT * FROM 
-		    (
-			    SELECT ROWNUM RNUM, BBS.*
-			    FROM  (
-			    	SELECT
-			              *
-			        FROM H3_BD_${id}_LIST BBS
-			        WHERE  1 = 1
-		        <choose>
-		            <when test='category == " " and id == "stat_bbs"'>
-					</when>
-		            <otherwise>
-						AND	BD_CATEGORY = #{category}
-					</otherwise>
-				</choose>
-			        ORDER BY
-			        	BBS.BD_GROUP_SEQ DESC,
-			            BBS.BD_STEP	ASC
-			    ) BBS
-			) BBS 
-			WHERE BD_SEQ = #{seq}
-		)BBS
-		ON
-		  BBS.RNUM + 1 = ALL_LIST.RNUM
   </select>
 	
 	<update id="Board.updateGrpStep" parameterType="boardVO">

src/main/resources/sqlmapper/mappers/board/boardFile.xml

@@ -28,7 +28,7 @@
 	]]>
 	</select>
 	
-	<insert id="BoardFile.insertBoardFile" parameterType="boardFileVO" useGeneratedKeys="true" keyColumn="BF_SEQ">
+	<insert id="BoardFile.insertBoardFile" parameterType="boardFileVO">
 	<![CDATA[
 		INSERT INTO 
 			H3_BD_${id}_FILE (