From 18098d6e8ae711a6c9856d80bdb88a097903d595 Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Wed, 10 Jan 2024 11:48:34 +0900
Subject: [PATCH] change products

---
 .../com/no1/wms/category/CategoryDto.java     |  2 ++
 .../no1/wms/product/ProductController.java    | 24 +++++++++++--
 .../java/com/no1/wms/product/ProductDto.java  |  2 ++
 .../java/com/no1/wms/vendor/VendorDto.java    |  2 ++
 src/main/resources/mappers/ProductMapper.xml  | 35 ++++++++++---------
 .../webapp/WEB-INF/views/product/list.jsp     |  4 +--
 6 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/no1/wms/category/CategoryDto.java b/src/main/java/com/no1/wms/category/CategoryDto.java
index 0980e34..a0db01b 100644
--- a/src/main/java/com/no1/wms/category/CategoryDto.java
+++ b/src/main/java/com/no1/wms/category/CategoryDto.java
@@ -4,9 +4,11 @@ import org.apache.ibatis.type.Alias;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Alias("CategoryDto")
 public class CategoryDto {
 		
diff --git a/src/main/java/com/no1/wms/product/ProductController.java b/src/main/java/com/no1/wms/product/ProductController.java
index 0c100f7..945fe7e 100644
--- a/src/main/java/com/no1/wms/product/ProductController.java
+++ b/src/main/java/com/no1/wms/product/ProductController.java
@@ -15,12 +15,30 @@ public class ProductController {
 	ProductService productservice;
 	
 	@GetMapping("/product/list")
-	public String list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
+	public void list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
 
 		// 서비스로 카테고리 목록 불러오는 메서드 작성
 		List<ProductDto> dto = productservice.productList(p);
-		m.addAttribute("list", dto);
-		return "product/list";
+		
+		System.out.println(dto.get(0).getId());
+		System.out.println(dto.get(0).getName());
+		System.out.println(dto.get(0).getCompany_name());
+		System.out.println(dto.get(0).getKan_code());
+		System.out.println(dto.get(0).getVendor_id());
+		System.out.println(dto.get(0).getRegistration_date());
+		System.out.println(dto.get(0).getManager_id());
+		System.out.println(dto.get(0).getAccountDto());
+		System.out.println(dto.get(0).getVendorDto().getName());
+		System.out.println(dto.get(0).getVendorDto().getPresident_name());
+		System.out.println(dto.get(0).getAccountDto().getName());
+		System.out.println(dto.get(0).getCategoryDto().getCls_nm_1());
+		System.out.println(dto.get(0).getCategoryDto().getCls_nm_2());
+		System.out.println(dto.get(0).getCategoryDto().getCls_nm_3());
+		System.out.println(dto.get(0).getCategoryDto().getCls_nm_4());
+		
+		
+		//m.addAttribute("list", dto);
+		//return "/";
 	}
 	
 	
diff --git a/src/main/java/com/no1/wms/product/ProductDto.java b/src/main/java/com/no1/wms/product/ProductDto.java
index 211eabf..4848831 100644
--- a/src/main/java/com/no1/wms/product/ProductDto.java
+++ b/src/main/java/com/no1/wms/product/ProductDto.java
@@ -10,9 +10,11 @@ import com.no1.wms.vendor.VendorDto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Alias("ProductDto")
 public class ProductDto {
 	
diff --git a/src/main/java/com/no1/wms/vendor/VendorDto.java b/src/main/java/com/no1/wms/vendor/VendorDto.java
index 7586086..06935a0 100644
--- a/src/main/java/com/no1/wms/vendor/VendorDto.java
+++ b/src/main/java/com/no1/wms/vendor/VendorDto.java
@@ -4,9 +4,11 @@ import org.apache.ibatis.type.Alias;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Alias("VendorDto")
 public class VendorDto {
 	
diff --git a/src/main/resources/mappers/ProductMapper.xml b/src/main/resources/mappers/ProductMapper.xml
index a456e5b..617d634 100644
--- a/src/main/resources/mappers/ProductMapper.xml
+++ b/src/main/resources/mappers/ProductMapper.xml
@@ -3,24 +3,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTO Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.no1.wms.product.ProductMapper">
-	<resultMap id="authorityResultMap" type="AuthorityDto">
-		<id column="id" property="id" />
-		<result column="name" property="name" />
-		<result column="company_name" property="company_name" />
-		<result column="kan_code" property="kan_code" />
-		<result column="vendor_id" property="vendor_id" />
-		<result column="registration_date" property="registration_date" />
-		<result column="manager_id" property="manager_id" />
-		<result column="activation" property="activation" />
-		<association property="vendorDto" javaType="VendorDto">
-			<id column="vendor_name" property="name" />
+	<resultMap id="productResultMap" type="ProductDto">
+		<id column="id" 					property="id" />
+		<result column="name" 				property="name" />
+		<result column="company_name" 		property="company_name" />
+		<result column="kan_code" 			property="kan_code" />
+		<result column="vendor_id" 			property="vendor_id" />
+		<result column="registration_date" 	property="registration_date" />
+		<result column="manager_id" 		property="manager_id" />
+		<result column="activation" 		property="activation" />
+		<association property="vendorDto" 	javaType="VendorDto">
+			<id column="id" 					property="id" />
+			<result column="vendor_name" 		property="name" />
 			<result column="president_name" property="president_name" />
 		</association>
-		<association property="accountDto" javaType="AccountDto">
-			<id column="account_name" property="name" />
+		<association property="accountDto" 	javaType="AccountDto">
+			<id column="id" 					property="id" />
+			<result column="account_name" 		property="name" />
 		</association>
 		<association property="categoryDto" javaType="CategoryDto">
-			<id column="personal_authority_id" property="personalAuthorityId" />
+			<id column="kan_code" 					property="kan_code" />
 			<result column="cls_nm_1" property="cls_nm_1" />
 			<result column="cls_nm_2" property="cls_nm_2" />
 			<result column="cls_nm_3" property="cls_nm_3" />
@@ -28,7 +30,8 @@
 		</association>
 	</resultMap>
 
-	<!-- insert -->
+	<!-- 설명한번 드릴게요 이거 원래 jsp를 부르려고했는데 오류가 자꾸 나서 원인을 찾아보다가 
+	결국 dto에 안담긴다는 것을 알고 컨트롤러코드를 수정했습니다ㅣ.mapper sql문이 아래 있는거?네 -->
 
 
 	<!-- update -->
@@ -38,7 +41,7 @@
 
 
 	<!-- select -->
-	<select id="productList" parameterType="map" resultType="productDto">
+	<select id="productList" resultMap="productResultMap" parameterType="map" >
 		SELECT
 		p.id, p.name, p.company_name, p.kan_code, p.vendor_id, p.registration_date,
 		p.manager_id, p.activation,
diff --git a/src/main/webapp/WEB-INF/views/product/list.jsp b/src/main/webapp/WEB-INF/views/product/list.jsp
index 6e6a710..8c97e6b 100644
--- a/src/main/webapp/WEB-INF/views/product/list.jsp
+++ b/src/main/webapp/WEB-INF/views/product/list.jsp
@@ -54,10 +54,10 @@
 										<td>${dto.vendorDto.name }</td>
 										<td>${dto.registration_date }</td>
 										<td>${dto.accountDto.name }</td>-->
-										<td>1</td>
-										<td>2</td>
 										<td>3</td>
 										<td>4</td>
+										<td>5</td>
+										<td>6</td>
 									</tr>
 								</c:forEach>
 							</tbody>