feat: 添加游轮类型和游轮管理

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/ErrorCodeConstants.java

@@ -13,4 +13,8 @@ public interface ErrorCodeConstants {
     ErrorCode SCENIC_NOT_EXISTS = new ErrorCode(1_003_000_003, "景区不存在");
 
     ErrorCode ROUTE_NOT_EXISTS = new ErrorCode(1_003_000_004, "航线不存在");
+
+    ErrorCode SHIP_TYPE_NOT_EXISTS = new ErrorCode(1_003_000_005, "游轮类型不存在");
+
+    ErrorCode SHIP_NOT_EXISTS = new ErrorCode(1_003_000_006, "资源管理-游轮管理不存在");
 }

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

@@ -94,12 +94,10 @@ public class ResourceDockController {
             if(item.getCountyId() != null) {
                 String area = AreaUtils.format(item.getCountyId());
                 item.setArea(area);
-            }
-            if(item.getCityId() != null) {
+            }else if(item.getCityId() != null) {
                 String area = AreaUtils.format(item.getCityId());
                 item.setArea(area);
-            }
-            if(item.getProvinceId() != null) {
+            }else if(item.getProvinceId() != null) {
                 String area = AreaUtils.format(item.getProvinceId());
                 item.setArea(area);
             }
@@ -127,4 +125,11 @@ public class ResourceDockController {
         return success(BeanUtils.toBean(list, ResourceDockRespVO.class));
     }
 
+    @GetMapping("/list-simple")
+    @Operation(summary = "获得资源管理-码头列表")
+    public CommonResult<List<ResourceDockRespVO>> getDockListSimple() {
+        List<ResourceDockDO> list = dockService.getListSimple();
+        return success(BeanUtils.toBean(list, ResourceDockRespVO.class));
+    }
+
 }

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

@@ -99,4 +99,11 @@ public class ResourcePortController {
                         BeanUtils.toBean(list, ResourcePortRespVO.class));
     }
 
+    @GetMapping("/list-simple")
+    @Operation(summary = "获得资源管理-口岸列表")
+    public CommonResult<List<ResourcePortRespVO>> getPortListSimple() {
+        List<ResourcePortDO> list = portService.getListSimple();
+        return success(BeanUtils.toBean(list, ResourcePortRespVO.class));
+    }
+
 }

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

@@ -93,12 +93,10 @@ public class ResourceScenicController {
             if(item.getCountyId() != null) {
                 String area = AreaUtils.format(item.getCountyId());
                 item.setArea(area);
-            }
-            if(item.getCityId() != null) {
+            }else if(item.getCityId() != null) {
                 String area = AreaUtils.format(item.getCityId());
                 item.setArea(area);
-            }
-            if(item.getProvinceId() != null) {
+            }else if(item.getProvinceId() != null) {
                 String area = AreaUtils.format(item.getProvinceId());
                 item.setArea(area);
             }
@@ -125,5 +123,11 @@ public class ResourceScenicController {
         List<ResourceScenicDO> list = scenicService.getEnableScenicList();
         return success(BeanUtils.toBean(list, ResourceScenicRespVO.class));
     }
+    @GetMapping("/list-simple")
+    @Operation(summary = "获得资源管理-景区列表")
+    public CommonResult<List<ResourceScenicRespVO>> getScenicListSimple() {
+        List<ResourceScenicDO> list = scenicService.getListSimple();
+        return success(BeanUtils.toBean(list, ResourceScenicRespVO.class));
+    }
 
 }

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

@@ -0,0 +1,115 @@
+package com.yc.ship.module.resource.controller.admin.ship;
+
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
+import com.yc.ship.module.resource.service.shiptype.ResourceShipTypeService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+
+import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
+import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.yc.ship.module.resource.controller.admin.ship.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
+import com.yc.ship.module.resource.service.ship.ResourceShipService;
+
+@Tag(name = "管理后台 - 资源管理-游轮管理")
+@RestController
+@RequestMapping("/resource/ship")
+@Validated
+public class ResourceShipController {
+
+    @Resource
+    private ResourceShipService shipService;
+
+    @Resource
+    private ResourceShipTypeService shipTypeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建资源管理-游轮管理")
+    @PreAuthorize("@ss.hasPermission('resource:ship:create')")
+    public CommonResult<Long> createShip(@Valid @RequestBody ResourceShipSaveReqVO createReqVO) {
+        return success(shipService.createShip(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新资源管理-游轮管理")
+    @PreAuthorize("@ss.hasPermission('resource:ship:update')")
+    public CommonResult<Boolean> updateShip(@Valid @RequestBody ResourceShipSaveReqVO updateReqVO) {
+        shipService.updateShip(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除资源管理-游轮管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('resource:ship:delete')")
+    public CommonResult<Boolean> deleteShip(@RequestParam("id") Long id) {
+        shipService.deleteShip(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得资源管理-游轮管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('resource:ship:query')")
+    public CommonResult<ResourceShipRespVO> getShip(@RequestParam("id") Long id) {
+        ResourceShipDO ship = shipService.getShip(id);
+        return success(BeanUtils.toBean(ship, ResourceShipRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得资源管理-游轮管理分页")
+    @PreAuthorize("@ss.hasPermission('resource:ship:query')")
+    public CommonResult<PageResult<ResourceShipRespVO>> getShipPage(@Valid ResourceShipPageReqVO pageReqVO) {
+        PageResult<ResourceShipDO> pageResult = shipService.getShipPage(pageReqVO);
+        PageResult<ResourceShipRespVO> page = BeanUtils.toBean(pageResult, ResourceShipRespVO.class);
+        List<ResourceShipRespVO> list = page.getList();
+        List<Long> typeIds = CollectionUtils.convertList(list, ResourceShipRespVO::getShipTypeId);
+        List<ResourceShipTypeDO> typeList = shipTypeService.getList(typeIds);
+        Map<Long, ResourceShipTypeDO> longResourceShipTypeDOMap = CollectionUtils.convertMap(typeList, ResourceShipTypeDO::getId);
+        list.stream().forEach(item -> {
+            item.setShipTypeName(longResourceShipTypeDOMap.get(item.getShipTypeId()).getName());
+        });
+        return success(page);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出资源管理-游轮管理 Excel")
+    @PreAuthorize("@ss.hasPermission('resource:ship:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportShipExcel(@Valid ResourceShipPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ResourceShipDO> list = shipService.getShipPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "资源管理-游轮管理.xls", "数据", ResourceShipRespVO.class,
+                        BeanUtils.toBean(list, ResourceShipRespVO.class));
+    }
+    @GetMapping("/list-simple")
+    @Operation(summary = "获得资源管理-游轮列表")
+    public CommonResult<List<ResourceShipRespVO>> getShipListSimple() {
+        List<ResourceShipDO> list = shipService.getListSimple();
+        return success(BeanUtils.toBean(list, ResourceShipRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.yc.ship.module.resource.controller.admin.ship.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.yc.ship.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 资源管理-游轮管理分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ResourceShipPageReqVO extends PageParam {
+
+    @Schema(description = "游轮名称", example = "王五")
+    private String name;
+
+    @Schema(description = "游轮编码")
+    private String code;
+
+    @Schema(description = "所属供应商", example = "10578")
+    private Long supplierId;
+
+    @Schema(description = "游轮类型", example = "20445")
+    private Long shipTypeId;
+
+    @Schema(description = "状态", example = "2")
+    private Integer status;
+
+}

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

@@ -0,0 +1,82 @@
+package com.yc.ship.module.resource.controller.admin.ship.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 资源管理-游轮管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ResourceShipRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24474")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "游轮名称", example = "王五")
+    @ExcelProperty("游轮名称")
+    private String name;
+
+    @Schema(description = "游轮编码")
+    @ExcelProperty("游轮编码")
+    private String code;
+
+    @Schema(description = "所属供应商", example = "10578")
+    @ExcelProperty("所属供应商")
+    private Long supplierId;
+
+    @Schema(description = "游轮类型", example = "20445")
+    @ExcelProperty("游轮类型")
+    private Long shipTypeId;
+
+    @Schema(description = "游轮类型名称")
+    @ExcelProperty("游轮类型名称")
+    private String shipTypeName;
+
+    @Schema(description = "船长（米）")
+    @ExcelProperty("船长（米）")
+    private Double shipLength;
+
+    @Schema(description = "船宽（米）")
+    @ExcelProperty("船宽（米）")
+    private Double shipWidth;
+
+    @Schema(description = "船舶净吨(吨)")
+    @ExcelProperty("船舶净吨(吨)")
+    private Double shipWeight;
+
+    @Schema(description = "吃水深度(米)")
+    @ExcelProperty("吃水深度(米)")
+    private Double shipDraft;
+
+    @Schema(description = "楼层数量")
+    @ExcelProperty("楼层数量")
+    private Integer floorsNum;
+
+    @Schema(description = "排水量")
+    @ExcelProperty("排水量")
+    private Double displacement;
+
+    @Schema(description = "规模")
+    @ExcelProperty("规模")
+    private String shipScale;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,55 @@
+package com.yc.ship.module.resource.controller.admin.ship.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 资源管理-游轮管理新增/修改 Request VO")
+@Data
+public class ResourceShipSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24474")
+    private Long id;
+
+    @Schema(description = "游轮名称", example = "王五")
+    private String name;
+
+    @Schema(description = "游轮编码")
+    private String code;
+
+    @Schema(description = "所属供应商", example = "10578")
+    private Long supplierId;
+
+    @Schema(description = "游轮类型", example = "20445")
+    private Long shipTypeId;
+
+    @Schema(description = "船长（米）")
+    private Double shipLength;
+
+    @Schema(description = "船宽（米）")
+    private Double shipWidth;
+
+    @Schema(description = "船舶净吨(吨)")
+    private Double shipWeight;
+
+    @Schema(description = "吃水深度(米)")
+    private Double shipDraft;
+
+    @Schema(description = "楼层数量")
+    private Integer floorsNum;
+
+    @Schema(description = "排水量")
+    private Double displacement;
+
+    @Schema(description = "规模")
+    private String shipScale;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}

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

@@ -0,0 +1,102 @@
+package com.yc.ship.module.resource.controller.admin.shiptype;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+
+import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
+import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.yc.ship.module.resource.controller.admin.shiptype.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
+import com.yc.ship.module.resource.service.shiptype.ResourceShipTypeService;
+
+@Tag(name = "管理后台 - 资源管理-游轮类型管理")
+@RestController
+@RequestMapping("/resource/ship-type")
+@Validated
+public class ResourceShipTypeController {
+
+    @Resource
+    private ResourceShipTypeService shipTypeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建资源管理-游轮类型管理")
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:create')")
+    public CommonResult<Long> createShipType(@Valid @RequestBody ResourceShipTypeSaveReqVO createReqVO) {
+        return success(shipTypeService.createShipType(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新资源管理-游轮类型管理")
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:update')")
+    public CommonResult<Boolean> updateShipType(@Valid @RequestBody ResourceShipTypeSaveReqVO updateReqVO) {
+        shipTypeService.updateShipType(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除资源管理-游轮类型管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:delete')")
+    public CommonResult<Boolean> deleteShipType(@RequestParam("id") Long id) {
+        shipTypeService.deleteShipType(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得资源管理-游轮类型管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:query')")
+    public CommonResult<ResourceShipTypeRespVO> getShipType(@RequestParam("id") Long id) {
+        ResourceShipTypeDO shipType = shipTypeService.getShipType(id);
+        return success(BeanUtils.toBean(shipType, ResourceShipTypeRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得资源管理-游轮类型管理分页")
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:query')")
+    public CommonResult<PageResult<ResourceShipTypeRespVO>> getShipTypePage(@Valid ResourceShipTypePageReqVO pageReqVO) {
+        PageResult<ResourceShipTypeDO> pageResult = shipTypeService.getShipTypePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ResourceShipTypeRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出资源管理-游轮类型管理 Excel")
+    @PreAuthorize("@ss.hasPermission('resource:ship-type:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportShipTypeExcel(@Valid ResourceShipTypePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ResourceShipTypeDO> list = shipTypeService.getShipTypePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "资源管理-游轮类型管理.xls", "数据", ResourceShipTypeRespVO.class,
+                        BeanUtils.toBean(list, ResourceShipTypeRespVO.class));
+    }
+
+    @GetMapping("/list-simple")
+    @Operation(summary = "获得资源管理-游轮类型管理列表")
+    public CommonResult<List<ResourceShipTypeRespVO>> getShipTypeListSimple() {
+        List<ResourceShipTypeDO> list = shipTypeService.getListSimple();
+        return success(BeanUtils.toBean(list, ResourceShipTypeRespVO.class));
+    }
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/shiptype/vo/ResourceShipTypePageReqVO.java

@@ -0,0 +1,27 @@
+package com.yc.ship.module.resource.controller.admin.shiptype.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.yc.ship.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 资源管理-游轮类型管理分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ResourceShipTypePageReqVO extends PageParam {
+
+    @Schema(description = "类型名称", example = "张三")
+    private String name;
+
+    @Schema(description = "类型编码")
+    private String code;
+
+    @Schema(description = "状态", example = "1")
+    private Integer status;
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/shiptype/vo/ResourceShipTypeRespVO.java

@@ -0,0 +1,38 @@
+package com.yc.ship.module.resource.controller.admin.shiptype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 资源管理-游轮类型管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ResourceShipTypeRespVO {
+
+    @Schema(description = " ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23740")
+    @ExcelProperty(" ID")
+    private Long id;
+
+    @Schema(description = "类型名称", example = "张三")
+    @ExcelProperty("类型名称")
+    private String name;
+
+    @Schema(description = "类型编码")
+    @ExcelProperty("类型编码")
+    private String code;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/shiptype/vo/ResourceShipTypeSaveReqVO.java

@@ -0,0 +1,28 @@
+package com.yc.ship.module.resource.controller.admin.shiptype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 资源管理-游轮类型管理新增/修改 Request VO")
+@Data
+public class ResourceShipTypeSaveReqVO {
+
+    @Schema(description = " ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23740")
+    private Long id;
+
+    @Schema(description = "类型名称", example = "张三")
+    private String name;
+
+    @Schema(description = "类型编码")
+    private String code;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}

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

@@ -0,0 +1,86 @@
+package com.yc.ship.module.resource.dal.dataobject.ship;
+
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 资源管理-游轮管理 DO
+ *
+ * @author fycloud
+ */
+@TableName("resource_ship")
+@KeySequence("resource_ship_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResourceShipDO extends TenantBaseDO {
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 游轮名称
+     */
+    private String name;
+    /**
+     * 游轮编码
+     */
+    private String code;
+    /**
+     * 所属供应商
+     */
+    private Long supplierId;
+    /**
+     * 游轮类型
+     */
+    private Long shipTypeId;
+    /**
+     * 船长（米）
+     */
+    private Double shipLength;
+    /**
+     * 船宽（米）
+     */
+    private Double shipWidth;
+    /**
+     * 船舶净吨(吨)
+     */
+    private Double shipWeight;
+    /**
+     * 吃水深度(米)
+     */
+    private Double shipDraft;
+    /**
+     * 楼层数量
+     */
+    private Integer floorsNum;
+    /**
+     * 排水量
+     */
+    private Double displacement;
+    /**
+     * 规模
+     */
+    private String shipScale;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态
+     *
+     * 枚举 {@link TODO common_status 对应的类}
+     */
+    private Integer status;
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/shiptype/ResourceShipTypeDO.java

@@ -0,0 +1,46 @@
+package com.yc.ship.module.resource.dal.dataobject.shiptype;
+
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 资源管理-游轮类型管理 DO
+ *
+ * @author flycloud
+ */
+@TableName("resource_ship_type")
+@KeySequence("resource_ship_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResourceShipTypeDO extends TenantBaseDO {
+
+    /**
+     *  ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 类型名称
+     */
+    private String name;
+    /**
+     * 类型编码
+     */
+    private String code;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态
+     *
+     * 枚举 {@link TODO common_status 对应的类}
+     */
+    private Integer status;
+
+}

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

@@ -0,0 +1,30 @@
+package com.yc.ship.module.resource.dal.mysql.ship;
+
+import java.util.*;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.yc.ship.module.resource.controller.admin.ship.vo.*;
+
+/**
+ * 资源管理-游轮管理 Mapper
+ *
+ * @author fycloud
+ */
+@Mapper
+public interface ResourceShipMapper extends BaseMapperX<ResourceShipDO> {
+
+    default PageResult<ResourceShipDO> selectPage(ResourceShipPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ResourceShipDO>()
+                .likeIfPresent(ResourceShipDO::getName, reqVO.getName())
+                .eqIfPresent(ResourceShipDO::getCode, reqVO.getCode())
+                .eqIfPresent(ResourceShipDO::getSupplierId, reqVO.getSupplierId())
+                .eqIfPresent(ResourceShipDO::getShipTypeId, reqVO.getShipTypeId())
+                .eqIfPresent(ResourceShipDO::getStatus, reqVO.getStatus())
+                .orderByDesc(ResourceShipDO::getId));
+    }
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/shiptype/ResourceShipTypeMapper.java

@@ -0,0 +1,28 @@
+package com.yc.ship.module.resource.dal.mysql.shiptype;
+
+import java.util.*;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.yc.ship.module.resource.controller.admin.shiptype.vo.*;
+
+/**
+ * 资源管理-游轮类型管理 Mapper
+ *
+ * @author flycloud
+ */
+@Mapper
+public interface ResourceShipTypeMapper extends BaseMapperX<ResourceShipTypeDO> {
+
+    default PageResult<ResourceShipTypeDO> selectPage(ResourceShipTypePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ResourceShipTypeDO>()
+                .likeIfPresent(ResourceShipTypeDO::getName, reqVO.getName())
+                .eqIfPresent(ResourceShipTypeDO::getCode, reqVO.getCode())
+                .eqIfPresent(ResourceShipTypeDO::getStatus, reqVO.getStatus())
+                .orderByDesc(ResourceShipTypeDO::getId));
+    }
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/dock/ResourceDockService.java

@@ -64,4 +64,9 @@ public interface ResourceDockService {
      */
     List<ResourceDockDO> getList(List<Long> ids);
 
+    /**
+     *  获取码头列表
+     * @return
+     */
+    List<ResourceDockDO> getListSimple();
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/dock/ResourceDockServiceImpl.java

@@ -84,4 +84,9 @@ public class ResourceDockServiceImpl implements ResourceDockService {
         return dockMapper.selectByIds(ids);
     }
 
+    @Override
+    public List<ResourceDockDO> getListSimple() {
+        return dockMapper.selectList();
+    }
+
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/port/ResourcePortService.java

@@ -64,4 +64,10 @@ public interface ResourcePortService {
      * @return
      */
     List<ResourcePortDO> getList(List<Long> ids);
+
+    /**
+     *  获取所有列表
+     * @return
+     */
+    List<ResourcePortDO> getListSimple();
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/port/ResourcePortServiceImpl.java

@@ -87,4 +87,9 @@ public class ResourcePortServiceImpl implements ResourcePortService {
         return portMapper.selectByIds(ids);
     }
 
+    @Override
+    public List<ResourcePortDO> getListSimple() {
+        return portMapper.selectList();
+    }
+
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/scenic/ResourceScenicService.java

@@ -64,4 +64,6 @@ public interface ResourceScenicService {
      * @return
      */
     List<ResourceScenicDO> getList(List<Long> scenicIds);
+
+    List<ResourceScenicDO> getListSimple();
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/scenic/ResourceScenicServiceImpl.java

@@ -84,4 +84,9 @@ public class ResourceScenicServiceImpl implements ResourceScenicService {
         return scenicMapper.selectByIds(scenicIds);
     }
 
+    @Override
+    public List<ResourceScenicDO> getListSimple() {
+        return scenicMapper.selectList();
+    }
+
 }

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

@@ -0,0 +1,58 @@
+package com.yc.ship.module.resource.service.ship;
+
+import java.util.*;
+import javax.validation.*;
+import com.yc.ship.module.resource.controller.admin.ship.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+
+/**
+ * 资源管理-游轮管理 Service 接口
+ *
+ * @author fycloud
+ */
+public interface ResourceShipService {
+
+    /**
+     * 创建资源管理-游轮管理
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createShip(@Valid ResourceShipSaveReqVO createReqVO);
+
+    /**
+     * 更新资源管理-游轮管理
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateShip(@Valid ResourceShipSaveReqVO updateReqVO);
+
+    /**
+     * 删除资源管理-游轮管理
+     *
+     * @param id 编号
+     */
+    void deleteShip(Long id);
+
+    /**
+     * 获得资源管理-游轮管理
+     *
+     * @param id 编号
+     * @return 资源管理-游轮管理
+     */
+    ResourceShipDO getShip(Long id);
+
+    /**
+     * 获得资源管理-游轮管理分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 资源管理-游轮管理分页
+     */
+    PageResult<ResourceShipDO> getShipPage(ResourceShipPageReqVO pageReqVO);
+
+    List<ResourceShipDO> getListSimple();
+
+    List<ResourceShipDO> getList(List<Long> ids);
+}

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

@@ -0,0 +1,87 @@
+package com.yc.ship.module.resource.service.ship;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.yc.ship.module.resource.controller.admin.ship.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+
+import com.yc.ship.module.resource.dal.mysql.ship.ResourceShipMapper;
+
+import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.yc.ship.module.resource.enums.ErrorCodeConstants.*;
+
+/**
+ * 资源管理-游轮管理 Service 实现类
+ *
+ * @author fycloud
+ */
+@Service
+@Validated
+public class ResourceShipServiceImpl implements ResourceShipService {
+
+    @Resource
+    private ResourceShipMapper shipMapper;
+
+    @Override
+    public Long createShip(ResourceShipSaveReqVO createReqVO) {
+        // 插入
+        ResourceShipDO ship = BeanUtils.toBean(createReqVO, ResourceShipDO.class);
+        shipMapper.insert(ship);
+        // 返回
+        return ship.getId();
+    }
+
+    @Override
+    public void updateShip(ResourceShipSaveReqVO updateReqVO) {
+        // 校验存在
+        validateShipExists(updateReqVO.getId());
+        // 更新
+        ResourceShipDO updateObj = BeanUtils.toBean(updateReqVO, ResourceShipDO.class);
+        shipMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteShip(Long id) {
+        // 校验存在
+        validateShipExists(id);
+        // 删除
+        shipMapper.deleteById(id);
+    }
+
+    private void validateShipExists(Long id) {
+        if (shipMapper.selectById(id) == null) {
+            throw exception(SHIP_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ResourceShipDO getShip(Long id) {
+        return shipMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ResourceShipDO> getShipPage(ResourceShipPageReqVO pageReqVO) {
+        return shipMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ResourceShipDO> getListSimple() {
+        return shipMapper.selectList();
+    }
+
+    @Override
+    public List<ResourceShipDO> getList(List<Long> ids) {
+        if(ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return shipMapper.selectByIds(ids);
+    }
+
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/shiptype/ResourceShipTypeService.java

@@ -0,0 +1,67 @@
+package com.yc.ship.module.resource.service.shiptype;
+
+import java.util.*;
+import javax.validation.*;
+import com.yc.ship.module.resource.controller.admin.shiptype.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+
+/**
+ * 资源管理-游轮类型管理 Service 接口
+ *
+ * @author flycloud
+ */
+public interface ResourceShipTypeService {
+
+    /**
+     * 创建资源管理-游轮类型管理
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createShipType(@Valid ResourceShipTypeSaveReqVO createReqVO);
+
+    /**
+     * 更新资源管理-游轮类型管理
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateShipType(@Valid ResourceShipTypeSaveReqVO updateReqVO);
+
+    /**
+     * 删除资源管理-游轮类型管理
+     *
+     * @param id 编号
+     */
+    void deleteShipType(Long id);
+
+    /**
+     * 获得资源管理-游轮类型管理
+     *
+     * @param id 编号
+     * @return 资源管理-游轮类型管理
+     */
+    ResourceShipTypeDO getShipType(Long id);
+
+    /**
+     * 获得资源管理-游轮类型管理分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 资源管理-游轮类型管理分页
+     */
+    PageResult<ResourceShipTypeDO> getShipTypePage(ResourceShipTypePageReqVO pageReqVO);
+
+    /**
+     * 获取列表
+     * @return
+     */
+    List<ResourceShipTypeDO> getListSimple();
+
+    /**
+     * 获取列表
+     * @param ids
+     * @return
+     */
+    List<ResourceShipTypeDO> getList(List<Long> ids);
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/shiptype/ResourceShipTypeServiceImpl.java

@@ -0,0 +1,87 @@
+package com.yc.ship.module.resource.service.shiptype;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.yc.ship.module.resource.controller.admin.shiptype.vo.*;
+import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+
+import com.yc.ship.module.resource.dal.mysql.shiptype.ResourceShipTypeMapper;
+
+import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.yc.ship.module.resource.enums.ErrorCodeConstants.*;
+
+/**
+ * 资源管理-游轮类型管理 Service 实现类
+ *
+ * @author flycloud
+ */
+@Service
+@Validated
+public class ResourceShipTypeServiceImpl implements ResourceShipTypeService {
+
+    @Resource
+    private ResourceShipTypeMapper shipTypeMapper;
+
+    @Override
+    public Long createShipType(ResourceShipTypeSaveReqVO createReqVO) {
+        // 插入
+        ResourceShipTypeDO shipType = BeanUtils.toBean(createReqVO, ResourceShipTypeDO.class);
+        shipTypeMapper.insert(shipType);
+        // 返回
+        return shipType.getId();
+    }
+
+    @Override
+    public void updateShipType(ResourceShipTypeSaveReqVO updateReqVO) {
+        // 校验存在
+        validateShipTypeExists(updateReqVO.getId());
+        // 更新
+        ResourceShipTypeDO updateObj = BeanUtils.toBean(updateReqVO, ResourceShipTypeDO.class);
+        shipTypeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteShipType(Long id) {
+        // 校验存在
+        validateShipTypeExists(id);
+        // 删除
+        shipTypeMapper.deleteById(id);
+    }
+
+    private void validateShipTypeExists(Long id) {
+        if (shipTypeMapper.selectById(id) == null) {
+            throw exception(SHIP_TYPE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ResourceShipTypeDO getShipType(Long id) {
+        return shipTypeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ResourceShipTypeDO> getShipTypePage(ResourceShipTypePageReqVO pageReqVO) {
+        return shipTypeMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ResourceShipTypeDO> getListSimple() {
+        return shipTypeMapper.selectList();
+    }
+
+    @Override
+    public List<ResourceShipTypeDO> getList(List<Long> ids) {
+        if(ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return shipTypeMapper.selectByIds(ids);
+    }
+
+}