diff --git a/stockMate/bin/pom.xml b/stockMate/bin/pom.xml deleted file mode 100644 index 57aeede..0000000 --- a/stockMate/bin/pom.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - 4.0.0 - com.stockm8 - controller - SpringBoard - war - 1.0.0-BUILD-SNAPSHOT - - 1.11 - 4.3.8.RELEASE - 1.6.10 - 1.6.6 - - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - - - org.aspectj - aspectjrt - ${org.aspectj-version} - - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - runtime - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - - javax.inject - javax.inject - 1 - - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - - - - junit - junit - 4.12 - test - - - - - - com.mysql - mysql-connector-j - 8.0.32 - - - - - org.mybatis - mybatis - 3.4.1 - - - - org.mybatis - mybatis-spring - 1.3.0 - - - - org.springframework - spring-jdbc - 4.3.8.RELEASE - - - - - org.springframework - spring-test - ${org.springframework-version} - - - - - org.projectlombok - lombok - 1.18.34 - provided - - - - - org.bgee.log4jdbc-log4j2 - log4jdbc-log4j2-jdbc4.1 - 1.16 - - - - - com.zaxxer - HikariCP - 5.1.0 - - - - - org.springframework - spring-context-support - 4.3.8.RELEASE - - - - - javax.mail - javax.mail-api - 1.6.2 - - - - - com.sun.mail - javax.mail - 1.6.2 - - - - - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.11 - 1.11 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.test.int1.Main - - - - - diff --git a/stockMate/bin/src/main/resources/log4j.xml b/stockMate/bin/src/main/resources/log4j.xml deleted file mode 100644 index 141ebc6..0000000 --- a/stockMate/bin/src/main/resources/log4j.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/stockMate/bin/src/main/resources/logback.xml b/stockMate/bin/src/main/resources/logback.xml deleted file mode 100644 index 1f2526b..0000000 --- a/stockMate/bin/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/stockMate/bin/src/main/resources/mappers/productMapper.xml b/stockMate/bin/src/main/resources/mappers/productMapper.xml deleted file mode 100644 index 80dc296..0000000 --- a/stockMate/bin/src/main/resources/mappers/productMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO products (name, barcode, category_id, base_unit, set_size, price, - business_id, qr_code_path, barcode_path, description) - VALUES (#{name}, #{barcode}, #{categoryId}, #{baseUnit}, #{setSize}, #{price}, - #{businessId}, #{qrCodePath}, #{barcodePath}, #{description}) - - - - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/resources/mappers/receivingMapper.xml b/stockMate/bin/src/main/resources/mappers/receivingMapper.xml deleted file mode 100644 index 21b9a5d..0000000 --- a/stockMate/bin/src/main/resources/mappers/receivingMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/resources/mappers/shipmentMapper.xml b/stockMate/bin/src/main/resources/mappers/shipmentMapper.xml deleted file mode 100644 index 6c32878..0000000 --- a/stockMate/bin/src/main/resources/mappers/shipmentMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/resources/mappers/warehouseMapper.xml b/stockMate/bin/src/main/resources/mappers/warehouseMapper.xml deleted file mode 100644 index 8159e1f..0000000 --- a/stockMate/bin/src/main/resources/mappers/warehouseMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - INSERT INTO warehouses (warehouse_name, location, business_id, manager_id) - VALUES (#{warehouseName}, #{location}, #{businessId}, #{managerId}) - - - - - - - - - - - - - - UPDATE warehouses - SET warehouse_name = #{warehouseName}, - location = #{location}, - business_id = #{businessId}, - manager_id = #{managerId} - WHERE warehouse_id = #{warehouseId} - - - - - DELETE FROM warehouses WHERE warehouse_id = #{warehouseId} - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/resources/mybatis-config.xml b/stockMate/bin/src/main/resources/mybatis-config.xml deleted file mode 100644 index 59bc022..0000000 --- a/stockMate/bin/src/main/resources/mybatis-config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/stockMate/bin/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml deleted file mode 100644 index 4b5bae1..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/stockMate/bin/src/main/webapp/WEB-INF/spring/root-context.xml b/stockMate/bin/src/main/webapp/WEB-INF/spring/root-context.xml deleted file mode 100644 index 78353c2..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/spring/root-context.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/stockMate/bin/src/main/webapp/WEB-INF/views/commonErr.jsp b/stockMate/bin/src/main/webapp/WEB-INF/views/commonErr.jsp deleted file mode 100644 index 7a1785c..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/views/commonErr.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - -Insert title here - - - -

commonErr.jsp

- - - \ No newline at end of file diff --git a/stockMate/bin/src/main/webapp/WEB-INF/views/home.jsp b/stockMate/bin/src/main/webapp/WEB-INF/views/home.jsp deleted file mode 100644 index 4783383..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/views/home.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ page session="false" %> - - - Home - - -

- Hello world! -

- -

The time on the server is ${serverTime}.

- - diff --git a/stockMate/bin/src/main/webapp/WEB-INF/views/receiving/main.jsp b/stockMate/bin/src/main/webapp/WEB-INF/views/receiving/main.jsp deleted file mode 100644 index da3a309..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/views/receiving/main.jsp +++ /dev/null @@ -1,160 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=EUC-KR" - pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - - - - -입고 메인 페이지 - - - - -

입고 메인

- -${ReceivingList } -${YesterdayReceivingList } -${TDBYReceivingList } - - -

가장 많이 나간 상품 수량

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
입고 번호입고 출고입고 일자입고 상태제품 번호제품명옵션명입고 수량수량 단위작업 메모공급사 회사 이름
${vo.receivingShipmentNo }${vo.transactionType }${vo.status }${vo.productId }${vo.name }${vo.description }${vo.changeQuantity }${vo.transactionUnit }${vo.memo }${vo.companyName }
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
입고 번호입고 출고입고 일자입고 상태제품 번호제품명옵션명입고 수량수량 단위작업 메모공급사 회사 이름
${vo.receivingShipmentNo }${vo.transactionType }${vo.status }${vo.productId }${vo.name }${vo.description }${vo.changeQuantity }${vo.transactionUnit }${vo.memo }${vo.companyName }
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
입고 번호입고 출고입고 일자입고 상태제품 번호제품명옵션명입고 수량수량 단위작업 메모공급사 회사 이름
${vo.receivingShipmentNo }${vo.transactionType }${vo.status }${vo.productId }${vo.name }${vo.description }${vo.changeQuantity }${vo.transactionUnit }${vo.memo }${vo.companyName }
- - - - - \ No newline at end of file diff --git a/stockMate/bin/src/main/webapp/WEB-INF/views/warehouse/create.jsp b/stockMate/bin/src/main/webapp/WEB-INF/views/warehouse/create.jsp deleted file mode 100644 index 408dcd8..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/views/warehouse/create.jsp +++ /dev/null @@ -1,19 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - -Create warehouse - - -

창고 등록 페이지

-
- - - - - -
- - \ No newline at end of file diff --git a/stockMate/bin/src/main/webapp/WEB-INF/web.xml b/stockMate/bin/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 93104e4..0000000 --- a/stockMate/bin/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - contextConfigLocation - /WEB-INF/spring/*-context.xml - - - - - org.springframework.web.context.ContextLoaderListener - - - - - appServlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/spring/appServlet/servlet-context.xml - - 1 - - - - appServlet - / - - - - - setUTF8 - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - - - setUTF8 - /* - - - - - diff --git a/stockMate/bin/src/test/resources/log4j.xml b/stockMate/bin/src/test/resources/log4j.xml deleted file mode 100644 index 6a0a3ed..0000000 --- a/stockMate/bin/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/stockMate/pom.xml b/stockMate/pom.xml index 549f19c..0b68114 100644 --- a/stockMate/pom.xml +++ b/stockMate/pom.xml @@ -15,7 +15,7 @@ 1.6.6 - + org.springframework @@ -260,7 +260,13 @@ 2.18.2 - + + com.google.code.gson + gson + 2.10.1 + + + diff --git a/stockMate/src/main/java/com/stockm8/controller/ProductController.java b/stockMate/src/main/java/com/stockm8/controller/ProductController.java index 758765a..88e6791 100644 --- a/stockMate/src/main/java/com/stockm8/controller/ProductController.java +++ b/stockMate/src/main/java/com/stockm8/controller/ProductController.java @@ -104,7 +104,7 @@ public String productRegistPOST(ProductVO product, // QR코드 등록 처리 @GetMapping("/generateQR") - public String generateQR(@RequestParam("productId") int productId, RedirectAttributes rttr) throws Exception { + public String generateQRGET(@RequestParam("productId") int productId, RedirectAttributes rttr) throws Exception { logger.info("generateQR() 호출"); logger.info("전송된 productId: {}", productId); @@ -129,7 +129,7 @@ public String generateQR(@RequestParam("productId") int productId, RedirectAttri // http://localhost:8088/product/downloadQr // QR코드 다운로드 처리 @GetMapping("/downloadQr") - public void downloadQrCode( + public void downloadQrCodeGET( @RequestParam("productId") int productId, HttpServletResponse response) throws Exception { @@ -168,7 +168,7 @@ public void downloadQrCode( // http://localhost:8088/product/detail // 상품 상세 정보 페이지 @GetMapping("/detail") - public String detail(@RequestParam("productId") int productId, Model model) throws Exception { + public String detailGET(@RequestParam("productId") int productId, Model model) throws Exception { // 상품 상세 정보 조회 ProductVO product = productService.getProductByID(productId); if (product == null) { @@ -191,7 +191,7 @@ public String detail(@RequestParam("productId") int productId, Model model) thro // http://localhost:8088/product/list @GetMapping("/list") - public String listProducts(HttpServletRequest request, Model model) throws Exception{ + public String listProductsGET(HttpServletRequest request, Model model) throws Exception{ // 세션에서 userId 가져오기 HttpSession session = request.getSession(false); Long userId = (session != null) ? (Long)session.getAttribute("userId") : null; diff --git a/stockMate/src/main/java/com/stockm8/controller/StockController.java b/stockMate/src/main/java/com/stockm8/controller/StockController.java index f66b9d0..e39d337 100644 --- a/stockMate/src/main/java/com/stockm8/controller/StockController.java +++ b/stockMate/src/main/java/com/stockm8/controller/StockController.java @@ -71,7 +71,7 @@ public String stockRegisterGET(@SessionAttribute("userId") Long userId, Model mo } // 재고 등록 처리 - @PostMapping("/stock/register") + @PostMapping("/register") public String registerStock(@ModelAttribute StockVO stock, @SessionAttribute("userId") Long userId, Model model) throws Exception { @@ -133,36 +133,4 @@ public String getStockList(StockVO stock, Model model, HttpServletRequest reques return sortOrder; // 이부분 수정 필요 확인해주세요 } - // http://localhost:8088/stock/list - /** - * 비즈니스 ID를 기반으로 재고 목록 조회 - */ - @RequestMapping(value = "/list", method = RequestMethod.GET) - public String list(@SessionAttribute("userId") Long userId, Model model) throws Exception { - logger.info("Fetching stock list for userId: {}", userId); - - UserVO user = userService.getUserById(userId); - int businessId = user.getBusinessId(); - logger.info("Business ID for user: {}", businessId); - - // 재고 및 카테고리 데이터 조회 - List stockList = stockService.getStockListByBusinessId(businessId); - List categoryList = categoryService.getCategoriesByBusinessId(businessId); - - logger.info("Fetched stockList: {}", stockList); - logger.info("Fetched categoryList: {}", categoryList); - - model.addAttribute("stockList", stockList); - model.addAttribute("categoryList", categoryList); - - return "/stock/list"; - } - - // 상품명 클릭 시 상품 상세 페이지로 리다이렉트 - @RequestMapping("/detail/{productId}") - public String productDetail(@PathVariable("productId") int productId) { - // 상품 상세 페이지로 리다이렉트 - logger.info("상품 상세 페이지로 이동: productId = {}", productId); - return "redirect:/product/detail/" + productId; - } } diff --git a/stockMate/src/main/java/com/stockm8/controller/api/QRCodeApiController.java b/stockMate/src/main/java/com/stockm8/controller/api/QRCodeApiController.java index bb49304..d700b1c 100644 --- a/stockMate/src/main/java/com/stockm8/controller/api/QRCodeApiController.java +++ b/stockMate/src/main/java/com/stockm8/controller/api/QRCodeApiController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; import com.google.gson.Gson; -import com.google.gson.JsonObject; import com.stockm8.domain.dto.QRCodeDTO; import com.stockm8.domain.dto.ScanProductDTO; import com.stockm8.domain.vo.ProductVO;