Merge remote-tracking branch 'origin/main' into main

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/print/PrintController.java

@@ -30,7 +30,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 打印模板")
 @RestController
-@RequestMapping("/print/")
+@RequestMapping("/otc/print")
 @Validated
 public class PrintController {
 

ship-module-product/ship-module-product-biz/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>module-infra-api</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-resource-biz</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/DistributorDiscountController.java

@@ -28,7 +28,7 @@ import static com.yc.ship.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 分销商专属折扣")
 @RestController
-@RequestMapping("/distributor-discount")
+@RequestMapping("/product/distributor-discount")
 @Validated
 public class DistributorDiscountController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/productBase/ProductBaseController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.controller.admin.productBase;
+package com.yc.ship.module.product.controller.admin.productBase;
 
 import cn.hutool.core.lang.tree.TreeNode;
 import com.yc.ship.framework.common.pojo.CommonResult;
@@ -6,10 +6,10 @@ import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBasePageReqVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseSaveReqVO;
-import com.yc.ship.module.resource.service.productBase.ProductBaseService;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBasePageReqVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseSaveReqVO;
+import com.yc.ship.module.product.service.productBase.ProductBaseService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,7 +30,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.PRODUC
 
 @Tag(name = "管理后台 - 基础产品")
 @RestController
-@RequestMapping("/base")
+@RequestMapping("/product/base")
 @Validated
 public class ProductBaseController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/productBase/vo/ProductBasePageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.controller.admin.productBase.vo;
+package com.yc.ship.module.product.controller.admin.productBase.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/productBase/vo/ProductBaseRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.controller.admin.productBase.vo;
+package com.yc.ship.module.product.controller.admin.productBase.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/productBase/vo/ProductBaseSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.controller.admin.productBase.vo;
+package com.yc.ship.module.product.controller.admin.productBase.vo;
 
 import com.yc.ship.module.resource.controller.admin.baseprice.vo.ProductBasePriceSaveReqVO;
 import com.yc.ship.module.resource.controller.admin.checkchannel.vo.CheckChannelSaveReqVO;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/productBase/ProductBaseDO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.dal.dataobject.productBase;
+package com.yc.ship.module.product.dal.dataobject.productBase;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/productBase/ProductBaseMapper.java

@@ -1,12 +1,12 @@
-package com.yc.ship.module.resource.dal.mysql.productBase;
+package com.yc.ship.module.product.dal.mysql.productBase;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBasePageReqVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO;
-import com.yc.ship.module.resource.dal.dataobject.productBase.ProductBaseDO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBasePageReqVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO;
+import com.yc.ship.module.product.dal.dataobject.productBase.ProductBaseDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/productBase/ProductBaseService.java

@@ -1,11 +1,11 @@
-package com.yc.ship.module.resource.service.productBase;
+package com.yc.ship.module.product.service.productBase;
 
 import cn.hutool.core.lang.tree.TreeNode;
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBasePageReqVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseSaveReqVO;
-import com.yc.ship.module.resource.dal.dataobject.productBase.ProductBaseDO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBasePageReqVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseSaveReqVO;
+import com.yc.ship.module.product.dal.dataobject.productBase.ProductBaseDO;
 
 import javax.validation.Valid;
 import java.util.List;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/productBase/ProductBaseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.service.productBase;
+package com.yc.ship.module.product.service.productBase;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -10,20 +10,20 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBasePageReqVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseSaveReqVO;
+import com.yc.ship.module.product.dal.dataobject.productBase.ProductBaseDO;
+import com.yc.ship.module.product.dal.mysql.productBase.ProductBaseMapper;
 import com.yc.ship.module.resource.controller.admin.baseprice.vo.ProductBasePriceRespVO;
 import com.yc.ship.module.resource.controller.admin.baseprice.vo.ProductBasePriceSaveReqVO;
 import com.yc.ship.module.resource.controller.admin.checkchannel.vo.CheckChannelRespVO;
 import com.yc.ship.module.resource.controller.admin.checkchannel.vo.CheckChannelSaveReqVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBasePageReqVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO;
-import com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseSaveReqVO;
 import com.yc.ship.module.resource.controller.admin.resource.vo.ResourceSimpleRespVO;
 import com.yc.ship.module.resource.dal.dataobject.checkchannel.CheckChannelDO;
-import com.yc.ship.module.resource.dal.dataobject.productBase.ProductBaseDO;
 import com.yc.ship.module.resource.dal.dataobject.project.ProjectDO;
 import com.yc.ship.module.resource.dal.dataobject.resource.ResourceDO;
 import com.yc.ship.module.resource.dal.mysql.checkchannel.CheckChannelMapper;
-import com.yc.ship.module.resource.dal.mysql.productBase.ProductBaseMapper;
 import com.yc.ship.module.resource.dal.mysql.resource.ResourceMapper;
 import com.yc.ship.module.resource.enums.ErrorCodeConstants;
 import com.yc.ship.module.resource.enums.UseStatusEnum;

ship-module-resource/ship-module-resource-biz/src/main/resources/mapper/productBase/ProductBaseMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yc.ship.module.resource.dal.mysql.productBase.ProductBaseMapper">
+<mapper namespace="com.yc.ship.module.product.dal.mysql.productBase.ProductBaseMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-    <select id="queryProductBasePage" resultType="com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO">
+    <select id="queryProductBasePage" resultType="com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO">
         SELECT
             pb.id,
             pb.`name`,
@@ -50,7 +50,7 @@
         ORDER BY pb.create_time desc,pb.id
     </select>
 
-    <select id="selectProductBasePage" resultType="com.yc.ship.module.resource.controller.admin.productBase.vo.ProductBaseRespVO">
+    <select id="selectProductBasePage" resultType="com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO">
         SELECT
         DISTINCT
             pb.id,

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/baseprice/ProductBasePriceController.java

@@ -30,7 +30,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 基础产品价格")
 @RestController
-@RequestMapping("/baseprice")
+@RequestMapping("/resource/baseprice")
 @Validated
 public class ProductBasePriceController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/category/CategoryController.java

@@ -34,7 +34,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 资源-产品分类")
 @RestController
-@RequestMapping("category")
+@RequestMapping("/resource/category")
 @Validated
 public class CategoryController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/channel/ScenicChannelController.java

@@ -35,7 +35,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 通道")
 @RestController
-@RequestMapping("/scenic-channel")
+@RequestMapping("/resource/scenic-channel")
 @Validated
 public class ScenicChannelController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/checkchannel/CheckChannelController.java

@@ -30,7 +30,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 产品检票通道")
 @RestController
-@RequestMapping("/checkchannel")
+@RequestMapping("/resource/checkchannel")
 @Validated
 public class CheckChannelController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/machine/ScenicMachineController.java

@@ -40,7 +40,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 设备")
 @RestController
-@RequestMapping("/scenic-machine")
+@RequestMapping("/resource/scenic-machine")
 @Validated
 public class ScenicMachineController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/project/ProjectController.java

@@ -36,7 +36,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 产品项目")
 @RestController
-@RequestMapping("/project")
+@RequestMapping("/resource/project")
 @Validated
 public class ProjectController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/resource/ResourceController.java

@@ -28,7 +28,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 产品资源")
 @RestController
-@RequestMapping("/resource")
+@RequestMapping("/resource/resource")
 @Validated
 public class ResourceController {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/routepoint/RoutePointController.java

@@ -30,7 +30,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 产品路线点位")
 @RestController
-@RequestMapping("/route-point")
+@RequestMapping("/resource/routePoint")
 @Validated
 public class RoutePointController {
 
@@ -39,14 +39,14 @@ public class RoutePointController {
 
     @PostMapping("/create")
     @Operation(summary = "创建产品路线点位")
-    @PreAuthorize("@ss.hasPermission('product:route-point:create')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:create')")
     public CommonResult<Long> createRoutePoint(@Valid @RequestBody RoutePointSaveReqVO createReqVO) {
         return success(routePointService.createRoutePoint(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新产品路线点位")
-    @PreAuthorize("@ss.hasPermission('product:route-point:update')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:update')")
     public CommonResult<Boolean> updateRoutePoint(@Valid @RequestBody RoutePointSaveReqVO updateReqVO) {
         routePointService.updateRoutePoint(updateReqVO);
         return success(true);
@@ -55,7 +55,7 @@ public class RoutePointController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除产品路线点位")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('product:route-point:delete')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:delete')")
     public CommonResult<Boolean> deleteRoutePoint(@RequestParam("id") Long id) {
         routePointService.deleteRoutePoint(id);
         return success(true);
@@ -64,7 +64,7 @@ public class RoutePointController {
     @GetMapping("/get")
     @Operation(summary = "获得产品路线点位")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('product:route-point:query')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:query')")
     public CommonResult<RoutePointRespVO> getRoutePoint(@RequestParam("id") Long id) {
         RoutePointDO routePoint = routePointService.getRoutePoint(id);
         return success(BeanUtils.toBean(routePoint, RoutePointRespVO.class));
@@ -72,7 +72,7 @@ public class RoutePointController {
 
     @GetMapping("/page")
     @Operation(summary = "获得产品路线点位分页")
-    @PreAuthorize("@ss.hasPermission('product:route-point:query')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:query')")
     public CommonResult<PageResult<RoutePointRespVO>> getRoutePointPage(@Valid RoutePointPageReqVO pageReqVO) {
         PageResult<RoutePointDO> pageResult = routePointService.getRoutePointPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RoutePointRespVO.class));
@@ -80,7 +80,7 @@ public class RoutePointController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出产品路线点位 Excel")
-    @PreAuthorize("@ss.hasPermission('product:route-point:export')")
+    @PreAuthorize("@ss.hasPermission('resource:route-point:export')")
     @OperateLog(type = EXPORT,enable = false)
     public void exportRoutePointExcel(@Valid RoutePointPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/site/ScenicSiteController.java

@@ -31,7 +31,7 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT
 
 @Tag(name = "管理后台 - 站点")
 @RestController
-@RequestMapping("/scenic-site")
+@RequestMapping("/resource/scenic-site")
 @Validated
 public class ScenicSiteController {