Merge remote-tracking branch 'origin/master'

src/main/java/com/no1/wms/category/CategoryDto.java

@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
 @Alias("CategoryDto")
 public class CategoryDto {
 		

src/main/java/com/no1/wms/product/ProductController.java

@@ -6,39 +6,73 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
+@RequestMapping("/product")
 public class ProductController {
 	
 	@Autowired
 	ProductService productservice;
 	
-	@GetMapping("/product/list")
-	public void list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
+	@GetMapping("list")
+	public String list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
 
 		// 서비스로 카테고리 목록 불러오는 메서드 작성
 		List<ProductDto> dto = productservice.productList(p);
+		m.addAttribute("list", dto);
+		return "/product/list";
+	}
+	
+	// 생성 - 폼
+	@PostMapping("/create")
+	public String create() {
+		return "/product/create";
+	}
+	
+	// 생성 - Ajax
+	@PostMapping("/create_process")
+	@ResponseBody
+	public boolean createProcess(ProductDto dto) {
+		int i = productservice.createProcess(dto);
+		if (i == 1) {
+			return true;
+		} else {
+			return false;
+		}	
+	}
+	
+	// 상세페이지
+	@PostMapping("/read")
+	public String read(String id, Model m) {
+		ProductDto dto = productservice.selectById(id);
+		m.addAttribute("dto", dto);
+		return "product/read";
+	}
+	
+	@PostMapping("/update")
+	public String update(String id, Model m) {
+		ProductDto dto = productservice.selectById(id);
+		m.addAttribute("dto", dto);
+		return "product/update";
+	}
+	
+	// 수정 - Ajax
+	@PutMapping("update_process")
+	@ResponseBody
+	public boolean update_process(ProductDto dto) {
+		System.out.println(dto.getId());
 		
-		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 "/";
+		int i = productservice.updateById(dto);
+		if (i == 1) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	

src/main/java/com/no1/wms/product/ProductDto.java

@@ -5,14 +5,17 @@ import java.util.Date;
 import org.apache.ibatis.type.Alias;
 
 import com.no1.wms.account.AccountDto;
+import com.no1.wms.authority.AuthorityDto;
 import com.no1.wms.category.CategoryDto;
 import com.no1.wms.vendor.VendorDto;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Alias("ProductDto")
@@ -20,7 +23,8 @@ public class ProductDto {
 	
 	private String id;//id
 	private String name;//제품명
-	private String company_name;//회사명
+	@Builder.Default
+	private String company_name = "미지정";//회사명
 	private String kan_code;//분류코드
 	private String vendor_id;//거래처 id
 	private Date registration_date;//등록날짜

src/main/java/com/no1/wms/product/ProductMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface ProductMapper {
 	
 	List<ProductDto> productList(Map<String, Object> m);
-	
-	
-	
+	int createProcess(ProductDto dto);
+	ProductDto selectById(String id);
+	int updateById(ProductDto dto);
 }

src/main/java/com/no1/wms/product/ProductService.java

@@ -26,4 +26,16 @@ public class ProductService {
 		return mapper.productList(m);
 	}
 	
+	public int createProcess(ProductDto dto) {
+		return mapper.createProcess(dto);
+	}
+	
+	public ProductDto selectById(String id) {
+		return mapper.selectById(id);
+	}
+	
+	public int updateById(ProductDto dto) {
+		return mapper.updateById(dto);
+	}
+	
 }