diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryController.java new file mode 100644 index 000000000..05c049d0b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCategory; +import org.jeecg.modules.business.service.ISkuCategoryService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: sku category + * @Author: jeecg-boot + * @Date: 2024-08-26 + * @Version: V1.0 + */ +@Api(tags="sku category") +@RestController +@RequestMapping("/skuCategory") +@Slf4j +public class SkuCategoryController extends JeecgController { + @Autowired + private ISkuCategoryService skuCategoryService; + + /** + * 分页列表查询 + * + * @param skuCategory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "sku category-分页列表查询") + @ApiOperation(value="sku category-分页列表查询", notes="sku category-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuCategory skuCategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuCategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuCategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuCategory + * @return + */ + @AutoLog(value = "sku category-添加") + @ApiOperation(value="sku category-添加", notes="sku category-添加") + @RequiresPermissions("business:sku_category:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuCategory skuCategory) { + skuCategoryService.save(skuCategory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuCategory + * @return + */ + @AutoLog(value = "sku category-编辑") + @ApiOperation(value="sku category-编辑", notes="sku category-编辑") + @RequiresPermissions("business:sku_category:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuCategory skuCategory) { + skuCategoryService.updateById(skuCategory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "sku category-通过id删除") + @ApiOperation(value="sku category-通过id删除", notes="sku category-通过id删除") + @RequiresPermissions("business:sku_category:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuCategoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "sku category-批量删除") + @ApiOperation(value="sku category-批量删除", notes="sku category-批量删除") + @RequiresPermissions("business:sku_category:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuCategoryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "sku category-通过id查询") + @ApiOperation(value="sku category-通过id查询", notes="sku category-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuCategory skuCategory = skuCategoryService.getById(id); + if(skuCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuCategory); + } + + /** + * 导出excel + * + * @param request + * @param skuCategory + */ + @RequiresPermissions("business:sku_category:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuCategory skuCategory) { + return super.exportXls(request, skuCategory, SkuCategory.class, "sku category"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_category:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuCategory.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryCriteriaController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryCriteriaController.java new file mode 100644 index 000000000..4ca12a3a4 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCategoryCriteriaController.java @@ -0,0 +1,162 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCategoryCriteria; +import org.jeecg.modules.business.service.ISkuCategoryCriteriaService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: sku erpCode category criteria joint table + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Api(tags="sku erpCode category criteria joint table") +@RestController +@RequestMapping("/skuCategoryCriteria") +@Slf4j +public class SkuCategoryCriteriaController extends JeecgController { + @Autowired + private ISkuCategoryCriteriaService skuCategoryCriteriaService; + + /** + * 分页列表查询 + * + * @param skuCategoryCriteria + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "sku erpCode category criteria joint table-分页列表查询") + @ApiOperation(value="sku erpCode category criteria joint table-分页列表查询", notes="sku erpCode category criteria joint table-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuCategoryCriteria skuCategoryCriteria, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuCategoryCriteria, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuCategoryCriteriaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuCategoryCriteria + * @return + */ + @AutoLog(value = "sku erpCode category criteria joint table-添加") + @ApiOperation(value="sku erpCode category criteria joint table-添加", notes="sku erpCode category criteria joint table-添加") + @RequiresPermissions("business:sku_category_criteria:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuCategoryCriteria skuCategoryCriteria) { + skuCategoryCriteriaService.save(skuCategoryCriteria); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuCategoryCriteria + * @return + */ + @AutoLog(value = "sku erpCode category criteria joint table-编辑") + @ApiOperation(value="sku erpCode category criteria joint table-编辑", notes="sku erpCode category criteria joint table-编辑") + @RequiresPermissions("business:sku_category_criteria:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuCategoryCriteria skuCategoryCriteria) { + skuCategoryCriteriaService.updateById(skuCategoryCriteria); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "sku erpCode category criteria joint table-通过id删除") + @ApiOperation(value="sku erpCode category criteria joint table-通过id删除", notes="sku erpCode category criteria joint table-通过id删除") + @RequiresPermissions("business:sku_category_criteria:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuCategoryCriteriaService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "sku erpCode category criteria joint table-批量删除") + @ApiOperation(value="sku erpCode category criteria joint table-批量删除", notes="sku erpCode category criteria joint table-批量删除") + @RequiresPermissions("business:sku_category_criteria:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuCategoryCriteriaService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "sku erpCode category criteria joint table-通过id查询") + @ApiOperation(value="sku erpCode category criteria joint table-通过id查询", notes="sku erpCode category criteria joint table-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuCategoryCriteria skuCategoryCriteria = skuCategoryCriteriaService.getById(id); + if(skuCategoryCriteria==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuCategoryCriteria); + } + + /** + * 导出excel + * + * @param request + * @param skuCategoryCriteria + */ + @RequiresPermissions("business:sku_category_criteria:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuCategoryCriteria skuCategoryCriteria) { + return super.exportXls(request, skuCategoryCriteria, SkuCategoryCriteria.class, "sku erpCode category criteria joint table"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_category_criteria:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuCategoryCriteria.class); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java index 298c5ae4e..41b21bda5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java @@ -403,4 +403,9 @@ public class SkuController { page.setTotal(total); return Result.OK(page); } + @GetMapping("/searchExistingSkuByKeywords") + public Result searchExistingSkuByKeywords(@RequestParam("keywords[]") List keywords) { + System.out.println("keywords : " + keywords); + return Result.OK(skuService.searchExistingSkuByKeywords(keywords)); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaController.java new file mode 100644 index 000000000..f60f0868d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaController.java @@ -0,0 +1,176 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCategory; +import org.jeecg.modules.business.entity.SkuCategoryCriteria; +import org.jeecg.modules.business.entity.SkuCriteria; +import org.jeecg.modules.business.service.ISkuCategoryCriteriaService; +import org.jeecg.modules.business.service.ISkuCategoryService; +import org.jeecg.modules.business.service.ISkuCriteriaService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: SKU erpCode criteria + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Api(tags="SKU erpCode criteria") +@RestController +@RequestMapping("/skuCriteria") +@Slf4j +public class SkuCriteriaController extends JeecgController { + @Autowired + private ISkuCriteriaService skuCriteriaService; + @Autowired + private ISkuCategoryService skuCategoryService; + @Autowired + private ISkuCategoryCriteriaService skuCategoryCriteriaService; + + /** + * 分页列表查询 + * + * @param skuCriteria + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "SKU erpCode criteria-分页列表查询") + @ApiOperation(value="SKU erpCode criteria-分页列表查询", notes="SKU erpCode criteria-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuCriteria skuCriteria, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuCriteria, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuCriteriaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuCriteria + * @return + */ + @AutoLog(value = "SKU erpCode criteria-添加") + @ApiOperation(value="SKU erpCode criteria-添加", notes="SKU erpCode criteria-添加") + @RequiresPermissions("business:sku_criteria:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuCriteria skuCriteria) { + skuCriteriaService.save(skuCriteria); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuCriteria + * @return + */ + @AutoLog(value = "SKU erpCode criteria-编辑") + @ApiOperation(value="SKU erpCode criteria-编辑", notes="SKU erpCode criteria-编辑") + @RequiresPermissions("business:sku_criteria:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuCriteria skuCriteria) { + skuCriteriaService.updateById(skuCriteria); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "SKU erpCode criteria-通过id删除") + @ApiOperation(value="SKU erpCode criteria-通过id删除", notes="SKU erpCode criteria-通过id删除") + @RequiresPermissions("business:sku_criteria:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuCriteriaService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "SKU erpCode criteria-批量删除") + @ApiOperation(value="SKU erpCode criteria-批量删除", notes="SKU erpCode criteria-批量删除") + @RequiresPermissions("business:sku_criteria:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuCriteriaService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "SKU erpCode criteria-通过id查询") + @ApiOperation(value="SKU erpCode criteria-通过id查询", notes="SKU erpCode criteria-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuCriteria skuCriteria = skuCriteriaService.getById(id); + if(skuCriteria==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuCriteria); + } + + /** + * 导出excel + * + * @param request + * @param skuCriteria + */ + @RequiresPermissions("business:sku_criteria:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuCriteria skuCriteria) { + return super.exportXls(request, skuCriteria, SkuCriteria.class, "SKU erpCode criteria"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_criteria:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuCriteria.class); + } + @GetMapping(value = "/listByCategory") + public Result listByCategory(@RequestParam(name = "categoryCode") String categoryCode) { + return Result.OK(skuCriteriaService.listByCategoryCode(categoryCode)); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueCategoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueCategoryController.java new file mode 100644 index 000000000..d66a6091b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueCategoryController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCriteriaValueCategory; +import org.jeecg.modules.business.service.ISkuCriteriaValueCategoryService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: SKU erpCode criteria value category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Api(tags="SKU erpCode criteria value category") +@RestController +@RequestMapping("/skuCriteriaValueCategory") +@Slf4j +public class SkuCriteriaValueCategoryController extends JeecgController { + @Autowired + private ISkuCriteriaValueCategoryService skuCriteriaValueCategoryService; + + /** + * 分页列表查询 + * + * @param skuCriteriaValueCategory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "SKU erpCode criteria value category-分页列表查询") + @ApiOperation(value="SKU erpCode criteria value category-分页列表查询", notes="SKU erpCode criteria value category-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuCriteriaValueCategory skuCriteriaValueCategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuCriteriaValueCategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuCriteriaValueCategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuCriteriaValueCategory + * @return + */ + @AutoLog(value = "SKU erpCode criteria value category-添加") + @ApiOperation(value="SKU erpCode criteria value category-添加", notes="SKU erpCode criteria value category-添加") + @RequiresPermissions("business:sku_criteria_value_category:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuCriteriaValueCategory skuCriteriaValueCategory) { + skuCriteriaValueCategoryService.save(skuCriteriaValueCategory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuCriteriaValueCategory + * @return + */ + @AutoLog(value = "SKU erpCode criteria value category-编辑") + @ApiOperation(value="SKU erpCode criteria value category-编辑", notes="SKU erpCode criteria value category-编辑") + @RequiresPermissions("business:sku_criteria_value_category:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuCriteriaValueCategory skuCriteriaValueCategory) { + skuCriteriaValueCategoryService.updateById(skuCriteriaValueCategory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "SKU erpCode criteria value category-通过id删除") + @ApiOperation(value="SKU erpCode criteria value category-通过id删除", notes="SKU erpCode criteria value category-通过id删除") + @RequiresPermissions("business:sku_criteria_value_category:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuCriteriaValueCategoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "SKU erpCode criteria value category-批量删除") + @ApiOperation(value="SKU erpCode criteria value category-批量删除", notes="SKU erpCode criteria value category-批量删除") + @RequiresPermissions("business:sku_criteria_value_category:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuCriteriaValueCategoryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "SKU erpCode criteria value category-通过id查询") + @ApiOperation(value="SKU erpCode criteria value category-通过id查询", notes="SKU erpCode criteria value category-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuCriteriaValueCategory skuCriteriaValueCategory = skuCriteriaValueCategoryService.getById(id); + if(skuCriteriaValueCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuCriteriaValueCategory); + } + + /** + * 导出excel + * + * @param request + * @param skuCriteriaValueCategory + */ + @RequiresPermissions("business:sku_criteria_value_category:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuCriteriaValueCategory skuCriteriaValueCategory) { + return super.exportXls(request, skuCriteriaValueCategory, SkuCriteriaValueCategory.class, "SKU erpCode criteria value category"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_criteria_value_category:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuCriteriaValueCategory.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueController.java new file mode 100644 index 000000000..78942d6aa --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuCriteriaValueController.java @@ -0,0 +1,168 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCriteriaValue; +import org.jeecg.modules.business.service.ISkuCriteriaValueService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: SKU criteria value + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Api(tags="SKU criteria value") +@RestController +@RequestMapping("/skuCriteriaValue") +@Slf4j +public class SkuCriteriaValueController extends JeecgController { + @Autowired + private ISkuCriteriaValueService skuCriteriaValueService; + + /** + * 分页列表查询 + * + * @param skuCriteriaValue + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "SKU criteria value-分页列表查询") + @ApiOperation(value="SKU criteria value-分页列表查询", notes="SKU criteria value-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuCriteriaValue skuCriteriaValue, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuCriteriaValue, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuCriteriaValueService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuCriteriaValue + * @return + */ + @AutoLog(value = "SKU criteria value-添加") + @ApiOperation(value="SKU criteria value-添加", notes="SKU criteria value-添加") + @RequiresPermissions("business:sku_criteria_value:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuCriteriaValue skuCriteriaValue) { + skuCriteriaValueService.save(skuCriteriaValue); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuCriteriaValue + * @return + */ + @AutoLog(value = "SKU criteria value-编辑") + @ApiOperation(value="SKU criteria value-编辑", notes="SKU criteria value-编辑") + @RequiresPermissions("business:sku_criteria_value:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuCriteriaValue skuCriteriaValue) { + skuCriteriaValueService.updateById(skuCriteriaValue); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "SKU criteria value-通过id删除") + @ApiOperation(value="SKU criteria value-通过id删除", notes="SKU criteria value-通过id删除") + @RequiresPermissions("business:sku_criteria_value:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuCriteriaValueService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "SKU criteria value-批量删除") + @ApiOperation(value="SKU criteria value-批量删除", notes="SKU criteria value-批量删除") + @RequiresPermissions("business:sku_criteria_value:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuCriteriaValueService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "SKU criteria value-通过id查询") + @ApiOperation(value="SKU criteria value-通过id查询", notes="SKU criteria value-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuCriteriaValue skuCriteriaValue = skuCriteriaValueService.getById(id); + if(skuCriteriaValue==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuCriteriaValue); + } + + /** + * 导出excel + * + * @param request + * @param skuCriteriaValue + */ + @RequiresPermissions("business:sku_criteria_value:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuCriteriaValue skuCriteriaValue) { + return super.exportXls(request, skuCriteriaValue, SkuCriteriaValue.class, "SKU criteria value"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_criteria_value:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuCriteriaValue.class); + } + @GetMapping(value = "/listByCriteria") + public Result listByCriteria(@RequestParam(name="criteriaId") String criteriaId) { + List list = skuCriteriaValueService.listByCriteria(criteriaId); + return Result.OK(list); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuSubcategoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuSubcategoryController.java new file mode 100644 index 000000000..313c71248 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuSubcategoryController.java @@ -0,0 +1,176 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.SkuCategory; +import org.jeecg.modules.business.entity.SkuSubcategory; +import org.jeecg.modules.business.service.ISkuCategoryService; +import org.jeecg.modules.business.service.ISkuSubcategoryService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: sku erpCode sub category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Api(tags="sku erpCode sub category") +@RestController +@RequestMapping("/skuSubcategory") +@Slf4j +public class SkuSubcategoryController extends JeecgController { + @Autowired + private ISkuSubcategoryService skuSubcategoryService; + @Autowired + private ISkuCategoryService skuCategoryService; + /** + * 分页列表查询 + * + * @param skuSubcategory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "sku erpCode sub category-分页列表查询") + @ApiOperation(value="sku erpCode sub category-分页列表查询", notes="sku erpCode sub category-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SkuSubcategory skuSubcategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(skuSubcategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = skuSubcategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param skuSubcategory + * @return + */ + @AutoLog(value = "sku erpCode sub category-添加") + @ApiOperation(value="sku erpCode sub category-添加", notes="sku erpCode sub category-添加") + @RequiresPermissions("business:sku_subcategory:add") + @PostMapping(value = "/add") + public Result add(@RequestBody SkuSubcategory skuSubcategory) { + skuSubcategoryService.save(skuSubcategory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param skuSubcategory + * @return + */ + @AutoLog(value = "sku erpCode sub category-编辑") + @ApiOperation(value="sku erpCode sub category-编辑", notes="sku erpCode sub category-编辑") + @RequiresPermissions("business:sku_subcategory:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody SkuSubcategory skuSubcategory) { + skuSubcategoryService.updateById(skuSubcategory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "sku erpCode sub category-通过id删除") + @ApiOperation(value="sku erpCode sub category-通过id删除", notes="sku erpCode sub category-通过id删除") + @RequiresPermissions("business:sku_subcategory:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + skuSubcategoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "sku erpCode sub category-批量删除") + @ApiOperation(value="sku erpCode sub category-批量删除", notes="sku erpCode sub category-批量删除") + @RequiresPermissions("business:sku_subcategory:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.skuSubcategoryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "sku erpCode sub category-通过id查询") + @ApiOperation(value="sku erpCode sub category-通过id查询", notes="sku erpCode sub category-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SkuSubcategory skuSubcategory = skuSubcategoryService.getById(id); + if(skuSubcategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(skuSubcategory); + } + + /** + * 导出excel + * + * @param request + * @param skuSubcategory + */ + @RequiresPermissions("business:sku_subcategory:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SkuSubcategory skuSubcategory) { + return super.exportXls(request, skuSubcategory, SkuSubcategory.class, "sku erpCode sub category"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:sku_subcategory:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SkuSubcategory.class); + } + + @GetMapping(value="/listByCategory") + public Result listByCategory(@RequestParam(name="categoryCode") String categoryCode) { + QueryWrapper categoryQuery = new QueryWrapper<>(); + categoryQuery.eq("code", categoryCode); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("sku_category_id", skuCategoryService.list(categoryQuery).stream().map(SkuCategory::getId).toArray()); + List list = skuSubcategoryService.list(queryWrapper); + return Result.OK(list); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategory.java new file mode 100644 index 000000000..faf5d95c1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategory.java @@ -0,0 +1,63 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: sku erpCode category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_category") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_category对象", description="sku erpCode category") +public class SkuCategory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**name*/ + @Excel(name = "name", width = 15) + @ApiModelProperty(value = "name") + private java.lang.String name; + /**code*/ + @Excel(name = "code", width = 15) + @ApiModelProperty(value = "code") + private java.lang.String code; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategoryCriteria.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategoryCriteria.java new file mode 100644 index 000000000..4a98e95ac --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCategoryCriteria.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: sku erpCode category criteria joint table + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_category_criteria") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_category_criteria对象", description="sku erpCode category criteria joint table") +public class SkuCategoryCriteria implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**SKU catergory id (fk)*/ + @Excel(name = "SKU catergory id (fk)", width = 15, dictTable = "sku_category", dicText = "code", dicCode = "id") + @Dict(dictTable = "sku_category", dicText = "code", dicCode = "id") + @ApiModelProperty(value = "SKU catergory id (fk)") + private java.lang.String skuCategoryId; + /**SKU criteria id (fk)*/ + @Excel(name = "SKU criteria id (fk)", width = 15, dictTable = "sku_criteria", dicText = "name_en", dicCode = "id") + @Dict(dictTable = "sku_criteria", dicText = "name_en", dicCode = "id") + @ApiModelProperty(value = "SKU criteria id (fk)") + private java.lang.String skuCriteriaId; + /**Order or place in the erpCode*/ + @Excel(name = "Order or place in the erpCode", width = 15) + @ApiModelProperty(value = "Order or place in the erpCode") + private java.lang.Integer ranking; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteria.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteria.java new file mode 100644 index 000000000..42c4ec11b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteria.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: SKU erpCode criteria + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_criteria") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_criteria对象", description="SKU erpCode criteria") +public class SkuCriteria implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**criteria name*/ + @Excel(name = "criteria name", width = 15) + @ApiModelProperty(value = "criteria name") + private java.lang.String nameZh; + /**english name*/ + @Excel(name = "english name", width = 15) + @ApiModelProperty(value = "english name") + private java.lang.String nameEn; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValue.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValue.java new file mode 100644 index 000000000..3534acd74 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValue.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: SKU criteria value + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_criteria_value") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_criteria_value对象", description="SKU criteria value") +public class SkuCriteriaValue implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**value zh name*/ + @Excel(name = "value zh name", width = 15) + @ApiModelProperty(value = "value zh name") + private java.lang.String nameZh; + /**value en name*/ + @Excel(name = "value en name", width = 15) + @ApiModelProperty(value = "value en name") + private java.lang.String nameEn; + /**value in code form*/ + @Excel(name = "value in code form", width = 15) + @ApiModelProperty(value = "value in code form") + private java.lang.String code; + /**sku criteria id (#fk)*/ + @Excel(name = "sku criteria id (#fk)", width = 15, dictTable = "sku_criteria", dicText = "name_en", dicCode = "id") + @Dict(dictTable = "sku_criteria", dicText = "name_en", dicCode = "id") + @ApiModelProperty(value = "sku criteria id (#fk)") + private java.lang.String skuCriteriaId; + /**sku criteria value category*/ + @Excel(name = "sku criteria value category", width = 15, dictTable = "sku_criteria_value_category", dicText = "name", dicCode = "id") + @Dict(dictTable = "sku_criteria_value_category", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "sku criteria value category") + private java.lang.String category; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValueCategory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValueCategory.java new file mode 100644 index 000000000..75b95a4e4 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuCriteriaValueCategory.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: SKU erpCode criteria value category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_criteria_value_category") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_criteria_value_category对象", description="SKU erpCode criteria value category") +public class SkuCriteriaValueCategory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**name*/ + @Excel(name = "name", width = 15) + @ApiModelProperty(value = "name") + private java.lang.String name; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuSubcategory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuSubcategory.java new file mode 100644 index 000000000..f780e220f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/SkuSubcategory.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: sku erpCode sub category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Data +@TableName("sku_subcategory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sku_subcategory对象", description="sku erpCode sub category") +public class SkuSubcategory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**zh name*/ + @Excel(name = "zh name", width = 15) + @ApiModelProperty(value = "zh name") + private java.lang.String nameZh; + /**english name*/ + @Excel(name = "english name", width = 15) + @ApiModelProperty(value = "english name") + private java.lang.String nameEn; + /**code*/ + @Excel(name = "code", width = 15) + @ApiModelProperty(value = "code") + private java.lang.String code; + /**sku category id*/ + @Excel(name = "sku category id", width = 15, dictTable = "sku_category", dicText = "code", dicCode = "id") + @Dict(dictTable = "sku_category", dicText = "code", dicCode = "id") + @ApiModelProperty(value = "sku category id") + private java.lang.String skuCategoryId; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryCriteriaMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryCriteriaMapper.java new file mode 100644 index 000000000..200a749dd --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryCriteriaMapper.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.business.mapper; + +import org.jeecg.modules.business.entity.SkuCategoryCriteria; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description: sku erpCode category criteria joint table + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Repository +public interface SkuCategoryCriteriaMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryMapper.java new file mode 100644 index 000000000..6904c76ef --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCategoryMapper.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.business.mapper; + +import org.jeecg.modules.business.entity.SkuCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description: sku category + * @Author: jeecg-boot + * @Date: 2024-08-26 + * @Version: V1.0 + */ +@Repository +public interface SkuCategoryMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaMapper.java new file mode 100644 index 000000000..d799e9615 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.business.mapper; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.business.entity.SkuCriteria; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @Description: SKU erpCode criteria + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Repository +public interface SkuCriteriaMapper extends BaseMapper { + + List listByCategoryCode(@Param("category")String categoryCode); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueCategoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueCategoryMapper.java new file mode 100644 index 000000000..9804a750c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueCategoryMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.mapper; + +import org.jeecg.modules.business.entity.SkuCriteriaValueCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: SKU erpCode criteria value category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface SkuCriteriaValueCategoryMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueMapper.java new file mode 100644 index 000000000..1861c67df --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuCriteriaValueMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.business.mapper; + +import io.lettuce.core.dynamic.annotation.Param; +import org.jeecg.modules.business.entity.SkuCriteriaValue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @Description: SKU criteria value + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Repository +public interface SkuCriteriaValueMapper extends BaseMapper { + + List listByCriteria(@Param("criteriaId") String criteriaId); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java index d6f2257ff..c60ff00db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java @@ -72,4 +72,6 @@ public interface SkuMapper extends BaseMapper { List listByClientId(@Param("clientId") String clientId); List listAsMongoCollection(); + + List searchExistingSkuByKeywords(@Param("keywords") List keywords); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuSubcategoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuSubcategoryMapper.java new file mode 100644 index 000000000..be307b37b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuSubcategoryMapper.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.business.mapper; + +import org.jeecg.modules.business.entity.SkuSubcategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description: sku erpCode sub category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Repository +public interface SkuSubcategoryMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryCriteriaMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryCriteriaMapper.xml new file mode 100644 index 000000000..79bdb708c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryCriteriaMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryMapper.xml new file mode 100644 index 000000000..f6bf003a9 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCategoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaMapper.xml new file mode 100644 index 000000000..f05e86677 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaMapper.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueCategoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueCategoryMapper.xml new file mode 100644 index 000000000..4067ad96f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueCategoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueMapper.xml new file mode 100644 index 000000000..ddd1c2024 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuCriteriaValueMapper.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml index 29bb4c203..de7c9c008 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml @@ -584,4 +584,48 @@ WHERE c.active = 1 AND s.status = 3 + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuSubcategoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuSubcategoryMapper.xml new file mode 100644 index 000000000..ce5bece13 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuSubcategoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryCriteriaService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryCriteriaService.java new file mode 100644 index 000000000..5f4b63416 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryCriteriaService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuCategoryCriteria; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: sku erpCode category criteria joint table + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface ISkuCategoryCriteriaService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryService.java new file mode 100644 index 000000000..a2cb2489d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCategoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: sku category + * @Author: jeecg-boot + * @Date: 2024-08-26 + * @Version: V1.0 + */ +public interface ISkuCategoryService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaService.java new file mode 100644 index 000000000..c109e2d4e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuCriteria; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: SKU erpCode criteria + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface ISkuCriteriaService extends IService { + + List listByCategoryCode(String categoryCode); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueCategoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueCategoryService.java new file mode 100644 index 000000000..9711b25d7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueCategoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuCriteriaValueCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: SKU erpCode criteria value category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface ISkuCriteriaValueCategoryService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueService.java new file mode 100644 index 000000000..c39991f8f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuCriteriaValueService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuCriteriaValue; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: SKU criteria value + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface ISkuCriteriaValueService extends IService { + + List listByCriteria(String criteriaId); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java index ca1d352cd..c0ff61d4e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java @@ -115,4 +115,6 @@ public interface ISkuService extends IService { List listByClientId(String clientId); List listAsMongoCollection(); + + List searchExistingSkuByKeywords(List keywords); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuSubcategoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuSubcategoryService.java new file mode 100644 index 000000000..d67bb64a3 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuSubcategoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.SkuSubcategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: sku erpCode sub category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +public interface ISkuSubcategoryService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryCriteriaServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryCriteriaServiceImpl.java new file mode 100644 index 000000000..d5e7a583c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryCriteriaServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuCategoryCriteria; +import org.jeecg.modules.business.mapper.SkuCategoryCriteriaMapper; +import org.jeecg.modules.business.service.ISkuCategoryCriteriaService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: sku erpCode category criteria joint table + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Service +public class SkuCategoryCriteriaServiceImpl extends ServiceImpl implements ISkuCategoryCriteriaService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryServiceImpl.java new file mode 100644 index 000000000..e32dd3474 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCategoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuCategory; +import org.jeecg.modules.business.mapper.SkuCategoryMapper; +import org.jeecg.modules.business.service.ISkuCategoryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: sku category + * @Author: jeecg-boot + * @Date: 2024-08-26 + * @Version: V1.0 + */ +@Service +public class SkuCategoryServiceImpl extends ServiceImpl implements ISkuCategoryService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaServiceImpl.java new file mode 100644 index 000000000..0feefe3b0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaServiceImpl.java @@ -0,0 +1,28 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuCriteria; +import org.jeecg.modules.business.mapper.SkuCriteriaMapper; +import org.jeecg.modules.business.service.ISkuCriteriaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: SKU erpCode criteria + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Service +public class SkuCriteriaServiceImpl extends ServiceImpl implements ISkuCriteriaService { + @Autowired + private SkuCriteriaMapper skuCriteriaMapper; + + @Override + public List listByCategoryCode(String categoryCode) { + return skuCriteriaMapper.listByCategoryCode(categoryCode); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueCategoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueCategoryServiceImpl.java new file mode 100644 index 000000000..4e4f294c9 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueCategoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuCriteriaValueCategory; +import org.jeecg.modules.business.mapper.SkuCriteriaValueCategoryMapper; +import org.jeecg.modules.business.service.ISkuCriteriaValueCategoryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: SKU erpCode criteria value category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Service +public class SkuCriteriaValueCategoryServiceImpl extends ServiceImpl implements ISkuCriteriaValueCategoryService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueServiceImpl.java new file mode 100644 index 000000000..4ce7de495 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuCriteriaValueServiceImpl.java @@ -0,0 +1,28 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuCriteriaValue; +import org.jeecg.modules.business.mapper.SkuCriteriaValueMapper; +import org.jeecg.modules.business.service.ISkuCriteriaValueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: SKU criteria value + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Service +public class SkuCriteriaValueServiceImpl extends ServiceImpl implements ISkuCriteriaValueService { + @Autowired + private SkuCriteriaValueMapper skuCriteriaValueMapper; + + @Override + public List listByCriteria(String criteriaId) { + return skuCriteriaValueMapper.listByCriteria(criteriaId); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java index 3474605c5..e396adf2b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java @@ -572,4 +572,9 @@ public class SkuServiceImpl extends ServiceImpl implements ISkuS return skuMapper.listAsMongoCollection(); } + @Override + public List searchExistingSkuByKeywords(List keywords) { + return skuMapper.searchExistingSkuByKeywords(keywords); + } + } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuSubcategoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuSubcategoryServiceImpl.java new file mode 100644 index 000000000..e6729966a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuSubcategoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.SkuSubcategory; +import org.jeecg.modules.business.mapper.SkuSubcategoryMapper; +import org.jeecg.modules.business.service.ISkuSubcategoryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: sku erpCode sub category + * @Author: jeecg-boot + * @Date: 2024-08-28 + * @Version: V1.0 + */ +@Service +public class SkuSubcategoryServiceImpl extends ServiceImpl implements ISkuSubcategoryService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuCriteriaData.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuCriteriaData.java new file mode 100644 index 000000000..8d7307808 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuCriteriaData.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.business.vo; + +import lombok.Data; + +@Data +public class SkuCriteriaData { + private final String id; + private final String nameZh; + private final String nameEn; + private final Integer ranking; +}