충돌 병합 작업

src/main/java/nlib/cmm/snslogin/KakaoController.java

@@ -22,11 +22,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @Controller
 public class KakaoController {
 	
-	private final static String K_CLIENT_ID = "e74d25210853313dd1fead4c6c1f06ec";
+	private final static String K_CLIENT_ID = "dawsdasd";
 	
 	public static String getAuthorizationUrl(HttpSession session,String K_REDIRECT_URI) {
-		String kakaoUrl = "https://kauth.kakao.com/oauth/authorize?" + "client_id=" + K_CLIENT_ID + "&redirect_uri="
+		String kakaoUrl = "https://kauth.kakao.com/oauth/authorize?" + "client_id=" + K_CLIENT_ID
-				+ K_REDIRECT_URI + "&response_type=code";
+				+ "&redirect_uri="+ K_REDIRECT_URI + "&response_type=code";
 		return kakaoUrl;
 	}
 

src/main/java/nlib/col/service/CollectionService.java

@@ -22,6 +22,10 @@ public interface CollectionService
 
 	public RisVO selectRisInfo(RisVO vo);
 	
-	public List<DeptVO> selectOrgList(CollectionVO vo);
+	public List<DeptVO> selectOrgList();
+
+	public List<CollectionVO> listItems(CollectionVO searchCollectionVO);
+
+	public int countListItems(CollectionVO searchCollectionVO);
 
 }

src/main/java/nlib/col/service/InterestService.java

@@ -17,4 +17,6 @@ public interface InterestService
 
 	public int countInterest(CollectionVO vo);
 
+	public List<DeptVO> selectOrgList(CollectionVO vo);
+
 }

src/main/java/nlib/col/service/impl/CollectionServiceImpl.java

@@ -69,11 +69,29 @@ public class CollectionServiceImpl implements CollectionService
 	}
 	
 	/* 
-	 * 문화원 목록 조회
+	 * 문화원 목록 조회(검색 필터용)
 	 * (non-Javadoc)
 	 * @see nlib.col.service.CollectionService#selectOrgList()
 	 */
-	public List<DeptVO> selectOrgList(CollectionVO vo) {
+	public List<DeptVO> selectOrgList() {
-		return collectionDAO.selectOrgList(vo);
+		return collectionDAO.selectOrgList();
+	}
+
+	/* 
+	 * 소장자료 목록 조회
+	 * (non-Javadoc)
+	 * @see nlib.col.service.CollectionService#listItems(nlib.col.service.CollectionVO)
+	 */
+	public List<CollectionVO> listItems(CollectionVO searchCollectionVO) {
+		return collectionDAO.listItems(searchCollectionVO);
+	}
+
+	/* 
+	 * 소장자료 목록 개수 조회
+	 * (non-Javadoc)
+	 * @see nlib.col.service.CollectionService#countListItems(nlib.col.service.CollectionVO)
+	 */
+	public int countListItems(CollectionVO searchCollectionVO) {
+		return collectionDAO.countListItems(searchCollectionVO);
 	}
 }

src/main/java/nlib/col/service/impl/InterestDAO.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository;
 
 import egovframework.com.cmm.service.impl.EgovComAbstractDAO;
 import nlib.col.service.CollectionVO;
+import nlib.col.service.DeptVO;
 import nlib.restful.DataApi;
 import nlib.restful.service.DataApiReqVO;
 import nlib.restful.service.DataApiResVO;
@@ -60,4 +61,11 @@ public class InterestDAO extends EgovComAbstractDAO
 	public void insertInterest(CollectionVO vo) {
 		insert("InterestDAO.insertInterest",vo);
 	}
+	/**
+	 * 문화원 목록 조회
+	 * @return
+	 */
+	public List<DeptVO> selectOrgList(CollectionVO vo) {
+		return selectList("InterestDAO.selectOrgList",vo);
+	}
 }

src/main/java/nlib/col/service/impl/InterestServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import nlib.col.service.CartService;
 import nlib.col.service.CollectionVO;
+import nlib.col.service.DeptVO;
 import nlib.col.service.InterestService;
 import nlib.restful.service.DataApiReqVO;
 import nlib.restful.service.DataApiResVO;
@@ -70,4 +71,12 @@ public class InterestServiceImpl implements InterestService
 	public void insertInterest(CollectionVO vo) {
 		interestDAO.insertInterest(vo);
 	}
+	/* 
+	 * 문화원 목록 조회
+	 * (non-Javadoc)
+	 * @see nlib.col.service.CollectionService#selectOrgList()
+	 */
+	public List<DeptVO> selectOrgList(CollectionVO vo) {
+		return interestDAO.selectOrgList(vo);
+	}
 }

src/main/java/nlib/col/web/CollectionController.java

@@ -30,13 +30,14 @@ import nlib.bbs.service.ArticleVO;
 import nlib.cmm.NlibCommonController;
 import nlib.cmm.service.CodeService;
 import nlib.cmm.service.NlibProperty;
+import nlib.cmm.service.PagingVO;
 import nlib.col.service.CollectionService;
 import nlib.col.service.CollectionVO;
 import nlib.col.service.DeptVO;
+import nlib.col.service.InterestService;
 import nlib.col.service.RisVO;
 import nlib.restful.service.DataApiReqVO;
 import nlib.restful.service.DataApiResVO;
-import nlib.restful.service.DataApiVO;
 import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;
 
@@ -56,6 +57,9 @@ public class CollectionController extends NlibCommonController
 	@Resource(name="collectionService")
 	private CollectionService collectionService;
 
+	@Resource(name = "interestService")
+	private InterestService interestService;
+	
 	/**
 	 * 소장자료 화면을 호출한다.
 	 * 
@@ -67,15 +71,31 @@ public class CollectionController extends NlibCommonController
 		String searchKeyword = paramMap.get("searchKeyword");
 		String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1");
 		String pageSize  = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE);
+		List<DeptVO> vo = new ArrayList();
 		
 		// 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM)
 		List<HashMap<String,String>> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION");
 		
+		// 자료유형 코드 목록 조회
+		List<HashMap<String,String>> masterType = codeService.listCodes("MASTER_TYPE_DIV_CD");
+		List<HashMap<String,String>> dtlsType = codeService.listCodes("DTLS_TYPE_DIV_CD");
+		
+		//주제분야 목록 조회
+		List<HashMap<String,String>> clsf = codeService.listCtClsfs();
+		
+		//문화원 목록 조회
+		vo = collectionService.selectOrgList();
+		
 		// 반환 정보 
     	model.addAttribute("pageIndex"    , pageIndex);
     	model.addAttribute("pageSize"     , pageSize);
     	model.addAttribute("searchKeyword", searchKeyword);
     	model.addAttribute("pageSizeCodes", pageSizeCodes);
+    	model.addAttribute("masterType", masterType);
+    	model.addAttribute("dtlsType", dtlsType);
+    	model.addAttribute("masterClsf", clsf);
+    	model.addAttribute("dtlsClsf", clsf);
+    	model.addAttribute("orgList",vo);
 		return "nlib/collection/listItems";
 	}
 	
@@ -87,22 +107,37 @@ public class CollectionController extends NlibCommonController
 	 */
 	@RequestMapping(value="/collection/listItemsAjax.do")
 	public ResponseEntity<String> listItemsAjax(HttpServletRequest req, 
-			Authentication authentication, @RequestBody Map<String, String> paramMap)  {
+			Authentication authentication, @RequestBody CollectionVO searchCollectionVO)  {
 
-		String searchKeyword = paramMap.get("searchKeyword");
+		//String searchKeyword = paramMap.get("searchKeyword");
-		String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1");
+		if(searchCollectionVO.getPageIndex() < 1) searchCollectionVO.setPageIndex(1);
-		String pageSize  = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE);
+		if(searchCollectionVO.getPageSize() < 1) searchCollectionVO.setPageSize(DEFUALT_PAGE_SIZE);
+		
+		
+		int totalCount= 0;
+		//사용자 정보를 가져온다.
+		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+				
+		searchCollectionVO.setPageStart(searchCollectionVO.getPageIndex(), searchCollectionVO.getPageSize());
+    	List<CollectionVO> List = new ArrayList();
+    	
+    	// 요청 
+    	List = collectionService.listItems(searchCollectionVO);
+    	totalCount = collectionService.countListItems(searchCollectionVO);
+    	
+    	PagingVO pageVO = new PagingVO();
+    	pageVO.setPagingVO(totalCount, searchCollectionVO.getPageIndex(), searchCollectionVO.getPageSize());
     	
 		//-------------------------------
 		// REQ VO 구성 
 		//-------------------------------
-    	DataApiReqVO reqVO = new DataApiReqVO();
+    	/*DataApiReqVO reqVO = new DataApiReqVO();
     	reqVO.setPageIndex(pageIndex);
     	reqVO.setPageSize(pageSize);
-    	reqVO.putInfoItem("searchKeyword", searchKeyword);
+    	reqVO.putInfoItem("searchKeyword", searchKeyword);*/
 
     	// 요청 
-    	DataApiResVO resVO = collectionService.listItems(reqVO);
+    	//DataApiResVO resVO = collectionService.listItems(reqVO);
     	
 		//-------------------------------
 		// JSON변환 응답 처리
@@ -112,8 +147,10 @@ public class CollectionController extends NlibCommonController
     	//  itemsCount: 255
     	// }
     	HashMap<String, Object> retMap = new HashMap<String, Object>();
-    	retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
+    	/*retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
-    	retMap.put("itemsCount", resVO.getRecordTotCount());
+    	retMap.put("itemsCount", resVO.getRecordTotCount());*/
+    	retMap.put("data", List);
+    	retMap.put("pageVO", pageVO);
     	
     	return makeResponseEntityJson(retMap);
 	}
@@ -159,7 +196,7 @@ public class CollectionController extends NlibCommonController
 		
 		if(Ty.length() > 3)
 		{
-			Ty.replace("IT_", "");
+			Ty = Ty.replaceFirst("IT_", "");
 		}
 				
         String s = "TY - " + Ty;
@@ -191,7 +228,7 @@ public class CollectionController extends NlibCommonController
 	 * 
 	 * @param req
 	 * @return
-	 */
+	 *//*
 	@RequestMapping("/collection/selectItemInfo.do")
 	public String selectItemInfo(HttpServletRequest req, Authentication authentication, @RequestParam Map<String, String> paramMap, ModelMap model)  {
 		// 목록 이동시 전달할 매개변수 
@@ -215,8 +252,8 @@ public class CollectionController extends NlibCommonController
 		    	DataApiReqVO reqVO = new DataApiReqVO();
 		    	reqVO.setPageIndex(pageIndex);
 		    	reqVO.setPageSize(pageSize);
-		    	reqVO.putInfoItem("boardNo", "QNA");       // 게시판ID
+		    	reqVO.addInfoItem("boardNo", "QNA");       // 게시판ID
-		    	reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
+		    	reqVO.addInfoItem("articleNo", articleNo); // 게시물번호
 
 		    	// 요청 
 		    	DataApiResVO resVO = collectionService.selectItemInfo(reqVO);
@@ -230,5 +267,5 @@ public class CollectionController extends NlibCommonController
 		    	model.addAttribute("searchKeyword", searchKeyword);
 
 				return "nlib/collection/selectItemInfo";
-	}
+	}*/
 }

src/main/java/nlib/col/web/InterestController.java

@@ -86,7 +86,7 @@ public class InterestController extends NlibCommonController
 		searchCollectionVO.setMbInfoId(loginVO.getMbInfoId());
 				
 		//문화원 목록 조회
-		vo = collectionService.selectOrgList(searchCollectionVO);
+		vo = interestService.selectOrgList(searchCollectionVO);
 		
 		model.addAttribute("deptList",vo);
     	model.addAttribute("searchCollection", searchCollectionVO);
@@ -111,7 +111,7 @@ public class InterestController extends NlibCommonController
 		NlibLoginVO loginVO = getNlibLoginVO(authentication);
 				
 		searchCollectionVO.setMbInfoId(loginVO.getMbInfoId());
-		searchCollectionVO.setPageStart((searchCollectionVO.getPageIndex()-1) * searchCollectionVO.getPageSize());
+		searchCollectionVO.setPageStart(searchCollectionVO.getPageIndex(), searchCollectionVO.getPageSize());
     	List<CollectionVO> List = new ArrayList();
     	
     	// 요청 

src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml

@@ -13,8 +13,8 @@
             AND MASTER_ID = #{masterId} 
     </select>
     
-    <select id="selectOrgList" parameterType="CollectionVO" resultType="DeptVO" >
+    <select id="selectOrgList" resultType="DeptVO" >
-    /* CollectionDAO.selectOrgList 문화원 목록 조회 */
+    /* CollectionDAO.selectOrgList 문화원 목록 조회 (검색 필터용) */
        <![CDATA[  
        SELECT 
               ORG_CD
@@ -24,17 +24,37 @@
             INNER JOIN
             RG_MASTER RM 
             ON SD.ORG_CD = RM.MNG_ORG_CD 
-            INNER JOIN 
-            MB_INTEREST MI 
-            ON RM.MASTER_ID = MI.MASTER_ID 
           WHERE 1=1
            AND SD.USE_YN = "Y"
            AND SD.CLOSE_FLAG = "0"
            AND IFNULL(NULLIF(SD.APPLY_START_YMD,''),"99999999") < date_format(NOW(), '%Y%m%d')
            AND IFNULL(NULLIF(SD.APPLY_CLOSE_YMD,''),"99999999") > date_format(NOW(), '%Y%m%d')
-           AND MI.USE_YN = "Y"
-           AND MI.MB_INFO_ID = #{mbInfoId}
            GROUP BY ORG_CD,DEPT_NM
+           ORDER BY ORG_CD
      ]]>
     </select>
+    
+    <select id="listItems" parameterType="CollectionVO" resultType="CollectionVO">
+    /* CollectionDAO.listItems 소장자료 목록조회 */
+        SELECT 
+            *
+           FROM
+               RG_MASTER RM 
+             WHERE 1=1
+             AND USE_FLAG = "Y"
+           LIMIT #{pageStart},#{pageSize}
+    </select>
+    
+    <select id="countListItems" parameterType="CollectionVO" resultType="Integer">
+    /* CollectionDAO.countListItems 소장자료 목록 개수 조회 */
+        SELECT 
+             COUNT(*)
+           FROM
+               RG_MASTER RM 
+             WHERE 1=1
+             AND USE_FLAG = "Y"
+            <!-- <if test='mngOrgCd != null and !mngOrgCd.equals("")'>
+             AND MNG_ORG_CD = #{mngOrgCd}
+            </if> -->
+    </select>
 </mapper>

src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml

@@ -82,4 +82,29 @@
               AND MI.MB_INFO_ID = #{mbInfoId}
               AND MI.USE_YN = "Y"
     </select>
+    
+    <select id="selectOrgList" parameterType="CollectionVO" resultType="DeptVO" >
+    /* InterestDAO.selectOrgList 문화원 목록 조회 */
+       <![CDATA[  
+       SELECT 
+              ORG_CD
+             ,DEPT_NM
+        FROM
+            SM_DEPT SD
+            INNER JOIN
+            RG_MASTER RM 
+            ON SD.ORG_CD = RM.MNG_ORG_CD 
+            INNER JOIN 
+            MB_INTEREST MI 
+            ON RM.MASTER_ID = MI.MASTER_ID 
+          WHERE 1=1
+           AND SD.USE_YN = "Y"
+           AND SD.CLOSE_FLAG = "0"
+           AND IFNULL(NULLIF(SD.APPLY_START_YMD,''),"99999999") < date_format(NOW(), '%Y%m%d')
+           AND IFNULL(NULLIF(SD.APPLY_CLOSE_YMD,''),"99999999") > date_format(NOW(), '%Y%m%d')
+           AND MI.USE_YN = "Y"
+           AND MI.MB_INFO_ID = #{mbInfoId}
+           GROUP BY ORG_CD,DEPT_NM
+     ]]>
+    </select>
 </mapper>