diff --git a/src/main/java/com/no1/wms/mypage/MypageController.java b/src/main/java/com/no1/wms/mypage/MypageController.java new file mode 100644 index 0000000..f04e7ae --- /dev/null +++ b/src/main/java/com/no1/wms/mypage/MypageController.java @@ -0,0 +1,51 @@ +package com.no1.wms.mypage; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +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.ResponseBody; + +import com.no1.wms.account.AccountDto; +import com.no1.wms.account.AccountService; + +@Controller +public class MypageController { + + @Autowired + AccountService accountService; + + + + @GetMapping("/mypage") + public String mypage(Model m, HttpServletRequest request) { + + HttpSession session = request.getSession(); + AccountDto dto = (AccountDto) session.getAttribute("userData"); + + AccountDto list = accountService.selectById(dto); + m.addAttribute("list", list); + + return "mypage/mypage"; + } + + @ResponseBody + @PutMapping("/mypage/updateUserInfo") + public boolean updateUserInfo(AccountDto dto) { + int i = accountService.update(dto); + System.out.println(i); + if (i == 1) { + return true; + } else { + return false; + } + } + + + +} diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java index 5b58fb8..87be4e5 100644 --- a/src/main/java/com/no1/wms/planin/PlanInController.java +++ b/src/main/java/com/no1/wms/planin/PlanInController.java @@ -1,5 +1,56 @@ package com.no1.wms.planin; +import com.no1.wms.account.AccountDto; +import com.no1.wms.planin.PlanInService; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + + + +@Controller +@RequestMapping("planin") public class PlanInController { + @Autowired + PlanInService planinservice; + + @GetMapping("/list") + public ModelAndView list(ModelAndView mav,@RequestParam(defaultValue = "0") int searchn, @RequestParam(defaultValue = "") String search, @RequestParam(defaultValue = "1") int page){ + int perPage = 10; + int startRow = (page - 1) * perPage; + int count = planinservice.count(searchn, search, startRow, perPage); + + + + int pageNum = 4;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + + + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List list = planinservice.selectAll(searchn, search, startRow, perPage); + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + mav.addObject("list", list); + mav.addObject("end", end); + mav.addObject("searchn", searchn); + mav.addObject("search", search); + mav.addObject("pageNum", pageNum); + mav.addObject("begin", begin); + mav.addObject("page", page); + mav.setViewName("account/list"); + return mav; + } -} +} \ No newline at end of file diff --git a/src/main/java/com/no1/wms/planin/PlanInMapper.java b/src/main/java/com/no1/wms/planin/PlanInMapper.java index d080568..c25aada 100644 --- a/src/main/java/com/no1/wms/planin/PlanInMapper.java +++ b/src/main/java/com/no1/wms/planin/PlanInMapper.java @@ -1,5 +1,18 @@ package com.no1.wms.planin; -public class PlanInMapper { +import java.util.List; +import java.util.Map; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +import com.no1.wms.account.AccountDto; + +@Repository +@Mapper +public interface PlanInMapper { + + List selectAll(Map m); + + int count(Map m); } diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java index dd0bbb0..d26659a 100644 --- a/src/main/java/com/no1/wms/planin/PlanInService.java +++ b/src/main/java/com/no1/wms/planin/PlanInService.java @@ -1,5 +1,37 @@ package com.no1.wms.planin; -public class PlanInService { +import java.util.HashMap; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.no1.wms.account.AccountDto; + +@Service +public class PlanInService { + @Autowired + PlanInMapper mapper; + + public List selectAll(int searchn, String search, int start, int perPage){ + HashMap map = new HashMap(); + map.put("search", search); + map.put("start", start); + map.put("perPage", perPage); + map.put("searchn", searchn); + + + + return mapper.selectAll(map); + } + + + int count(int searchn, String search, int start, int perPage){ + HashMap m = new HashMap<>(); + m.put("searchn", searchn); + m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); + return mapper.count(m); + } } diff --git a/src/main/resources/static/img/mypage/defaultimg.png b/src/main/resources/static/img/mypage/defaultimg.png new file mode 100644 index 0000000..147064e Binary files /dev/null and b/src/main/resources/static/img/mypage/defaultimg.png differ diff --git a/src/main/webapp/WEB-INF/views/mypage/mypage.jsp b/src/main/webapp/WEB-INF/views/mypage/mypage.jsp new file mode 100644 index 0000000..5e6f162 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/mypage/mypage.jsp @@ -0,0 +1,179 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +Insert title here + + +
+

마이페이지

+
+
+
+
+
+
+ Default Image +
+

+ ${list.positionDto.name }   + ${list.name} +

+
+
+ +
+
+ + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+ +
+
+ + + + + + +
+
+
+
+
+ + + + + + \ No newline at end of file