修改下配置

pom.xml

@@ -50,7 +50,6 @@
         <aliyun.green.version>2.2.8</aliyun.green.version>
         <eaeasypoi.version>4.3.0</eaeasypoi.version>
         <wechatpay-java.version>0.2.17</wechatpay-java.version>
-        <geodesy.version>1.1.3</geodesy.version>
         <!-- jdk11 缺失依赖 jaxb-->
         <jaxb.version>3.0.1</jaxb.version>
 
@@ -301,20 +300,6 @@
                 <version>${thumbnailator.version}</version>
             </dependency>
 
-
-            <!-- 地图 -->
-            <dependency>
-                <groupId>org.gavaghan</groupId>
-                <artifactId>geodesy</artifactId>
-                <version>${geodesy.version}</version>
-            </dependency>
-            <!--screw 数据库文档生成-->
-            <dependency>
-                <groupId>cn.smallbun.screw</groupId>
-                <artifactId>screw-core</artifactId>
-                <version>1.0.5</version>
-            </dependency>
-
             <!-- 定时任务 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -384,37 +369,11 @@
             </dependency>
 
             <!-- 业务模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-games</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-shop</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-shop-api</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-base</artifactId>
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-ticket</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-ticket-api</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-newwxpay</artifactId>
@@ -545,13 +504,8 @@
         <module>ruoyi-weixin</module>
         <module>ruoyi-api</module>
         <module>ruoyi-user</module>
-        <module>ruoyi-shop</module>
         <module>ruoyi-base</module>
-        <module>ruoyi-games</module>
         <module>ruoyi-info</module>
-        <module>ruoyi-shop-api</module>
-        <module>ruoyi-ticket</module>
-        <module>ruoyi-ticket-api</module>
         <module>ruoyi-newwxpay</module>
     </modules>
     <packaging>pom</packaging>

ruoyi-admin/pom.xml

@@ -78,21 +78,6 @@
             <artifactId>ruoyi-user</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-shop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-games</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-ticket</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-newwxpay</artifactId>
@@ -104,12 +89,6 @@
             <artifactId>ruoyi-weixin-miniapp</artifactId>
         </dependency>
 
-        <!--screw 数据库文档生成-->
-        <dependency>
-            <groupId>cn.smallbun.screw</groupId>
-            <artifactId>screw-core</artifactId>
-        </dependency>
-
         <!-- 代码生成-->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -125,7 +104,7 @@
     </dependencies>
 
     <build>
-        <finalName>overlord-guess</finalName>
+        <finalName>hospital-accompaniment</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/DataBaseScrewUtil.java

@@ -1,95 +0,0 @@
-package com.ruoyi.web.controller.common;
-
-import cn.smallbun.screw.core.Configuration;
-import cn.smallbun.screw.core.engine.EngineConfig;
-import cn.smallbun.screw.core.engine.EngineFileType;
-import cn.smallbun.screw.core.engine.EngineTemplateType;
-import cn.smallbun.screw.core.execute.DocumentationExecute;
-import cn.smallbun.screw.core.process.ProcessConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 数据库设计文档生成工具类
- * 仅支持mysql数据库
- * 文档更详细
- */
-public class DataBaseScrewUtil {
-
-    public static final String driverUrl = "jdbc:mysql://192.168.0.119:3308/jijiu_car_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
-    public static final String dataBase = "jijiu_car_system";
-    public static final String username = "root";
-    public static final String password = "songlanyun";
-    public final static String filePath = "d:\\疾控备案";
-
-    public static void main(String[] args)throws Exception {
-        System.out.println("开始生成文档~~~");
-        generate();
-        System.out.println("\n文档生成结果：SUCCESS ...");
-    }
-
-    private static void generate() {
-        // 生成文件配置
-        EngineConfig engineConfig = EngineConfig.builder()
-            // 生成文件路径，自己mac本地的地址，这里需要自己更换下路径
-            .fileOutputDir(filePath)
-            // 打开目录
-            .openOutputDir(false)
-            // 文件类型 HTML/WORD/MD 三种格式
-            .fileType(EngineFileType.WORD)
-            // 生成模板实现
-            .produceType(EngineTemplateType.freemarker).build();
-
-        //数据库名称
-        String[] dbNames = {dataBase};
-        for (String dbName : dbNames) {
-            HikariDataSource hikariDataSource = new HikariDataSource();
-            //设置数据库连接
-            hikariDataSource.setJdbcUrl(driverUrl);
-            hikariDataSource.setUsername(username);
-            hikariDataSource.setPassword(password);
-            // 生成文档配置（包含以下自定义版本号、描述等配置连接）
-            Configuration config = Configuration.builder()
-                .version("1.0.1")
-                .description("数据库设计文档")
-                .dataSource(hikariDataSource)
-                .engineConfig(engineConfig)
-                .produceConfig(getProcessConfig())
-                .build();
-
-            // 执行生成
-            new DocumentationExecute(config).execute();
-        }
-
-    }
-
-    /**
-     * 配置想要生成的表+ 配置想要忽略的表
-     * @return 生成表配置
-     */
-    private static ProcessConfig getProcessConfig(){
-        // 忽略表名
-        List<String> ignoreTableName = Arrays.asList("test_a","test_b");
-        // 忽略表前缀
-        List<String> ignorePrefix = Arrays.asList("test_a","test_b");
-        // 忽略表后缀
-        List<String> ignoreSuffix = Arrays.asList("a_test","b_test");
-        return ProcessConfig.builder()
-            //根据名称指定表生成 我需要生成所有表 这里暂时不设置
-            .designatedTableName(new ArrayList<>())
-            //根据表前缀生成 我需要生成所有表 这里暂时不设置
-            .designatedTablePrefix(new ArrayList<>())
-            //根据表后缀生成 我需要生成所有表 这里暂时不设置
-            .designatedTableSuffix(new ArrayList<>())
-            //忽略表名
-            .ignoreTableName(ignoreTableName)
-            //忽略表前缀
-            .ignoreTablePrefix(ignorePrefix)
-            //忽略表后缀
-            .ignoreTableSuffix(ignoreSuffix).build();
-    }
-
-}

ruoyi-admin/src/main/resources/application-prod.yml

@@ -60,8 +60,8 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/overlord-guess?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: overlord-guess
+          url: jdbc:mysql://localhost:3306/hospital-accompaniment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: hospital-accompaniment
           password: BrtWXzyrbZ4wiFpG
         # 从库数据源
         slave:

ruoyi-api/pom.xml

@@ -36,21 +36,6 @@
             <artifactId>ruoyi-info</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-games</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-shop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-ticket</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-newwxpay</artifactId>

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserCollectController.java

@@ -1,74 +0,0 @@
-package com.ruoyi.api.controller.user;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.api.controller.common.AbstractApiController;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.userCollect.domain.bo.UserCollectBo;
-import com.ruoyi.userCollect.domain.vo.UserCollectVo;
-import com.ruoyi.userCollect.service.IUserCollectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.Arrays;
-
-/**
- * 用户收藏Controller
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@Validated
-@Api(value = "用户收藏控制器", tags = {"用户收藏管理"})
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/user/userCollect")
-public class ApiUserCollectController extends AbstractApiController {
-
-    private final IUserCollectService iUserCollectService;
-
-    /**
-     * 新增用户收藏
-     */
-    @ApiOperation("新增用户收藏")
-    @RepeatSubmit()
-    @PostMapping("/add")
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCollectBo bo) {
-        bo.setUserId(getUserId());
-        iUserCollectService.insertByBo(bo);
-        return R.ok();
-    }
-
-    /**
-     * 获取用户收藏
-     */
-    @ApiOperation("获取用户收藏")
-    @PostMapping("/getUserCollect")
-    public R<UserCollectVo> info(@RequestBody UserCollectBo bo) {
-        Long userId = getUserId(false);
-        if(ObjectUtil.isNull(userId)) {
-            return R.ok(null);
-        }
-        bo.setUserId(userId);
-        return R.ok(iUserCollectService.getUserCollect(bo));
-    }
-
-    /**
-     * 删除用户收藏
-     */
-    @ApiOperation("删除用户收藏")
-    @PostMapping("/del/{ids}")
-    public R<Void> remove(@ApiParam("主键串") @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        getUserId();
-        iUserCollectService.deleteWithValidByIds(Arrays.asList(ids),true);
-        return R.ok();
-    }
-
-}

ruoyi-base/pom.xml

@@ -21,10 +21,7 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-shop-api</artifactId>
-        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/pom.xml

@@ -151,10 +151,6 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.gavaghan</groupId>
-            <artifactId>geodesy</artifactId>
-        </dependency>
         <!--  自动生成YML配置关联JSON文件  -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

ruoyi-common/src/main/java/com/ruoyi/common/enums/collect/CollectEntityType.java

@@ -1,45 +0,0 @@
-package com.ruoyi.common.enums.collect;
-
-import com.ruoyi.common.enums.IIntegerEnum;
-
-import java.util.Objects;
-
-/**
- * 收藏实体类型
- * 实体类型(景区0,门票1)
- * @author weibocy
- */
-public enum CollectEntityType implements IIntegerEnum {
-    //
-    SCENIC(0, "景区"),
-    TICKET(1, "门票"),
-    ;
-
-
-    private Integer code;
-    private String msg;
-
-    CollectEntityType(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-
-    @Override
-    public String getMsg() {
-        return this.msg;
-    }
-
-    public static CollectEntityType getByCode(int code, CollectEntityType[] values) {
-        for (CollectEntityType value : values) {
-            if (Objects.equals(code, value.getCode())) {
-                return value;
-            }
-        }
-        return null;
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/utils/MapTools.java

@@ -1,72 +0,0 @@
-package com.ruoyi.common.utils;
-
-
-import org.gavaghan.geodesy.Ellipsoid;
-import org.gavaghan.geodesy.GeodeticCalculator;
-import org.gavaghan.geodesy.GeodeticCurve;
-import org.gavaghan.geodesy.GlobalCoordinates;
-
-/**
- * 地图工具类
- */
-public class MapTools {
-
-    private static final double EARTH_RADIUS = 6371000; // 地球半径，单位：米
-    /**
-     * 计算经纬度
-     */
-    public static double calculate(String lon1, String lat1, String lon2, String lat2) {
-
-        double meter1 = 0D;
-        try {
-            // //121.717594,31.12055    121.817629,31.090867
-            GlobalCoordinates source = new GlobalCoordinates(Double.parseDouble(lat1), Double.parseDouble(lon1));
-            GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(lat2), Double.parseDouble(lon2));
-            meter1 = getDistanceMeter(source, target, Ellipsoid.Sphere);
-            return meter1;
-        } catch (Exception e) {
-            return meter1;
-        }
-
-    }
-
-//    public static double calculate(String lon1, String lat1, String lon2, String lat2) {
-//
-//        double distance = getDistance(Double.parseDouble(lat1), Double.parseDouble(lon1), Double.parseDouble(lat2), Double.parseDouble(lon2));
-//        return distance;
-//
-//    }
-
-    private static double getDistanceMeter(GlobalCoordinates gpsFrom, GlobalCoordinates gpsTo,
-                                           Ellipsoid ellipsoid) {
-        //创建GeodeticCalculator，调用计算方法，传入坐标系、经纬度用于计算距离
-        GeodeticCurve geoCurve = new GeodeticCalculator().calculateGeodeticCurve(ellipsoid, gpsFrom, gpsTo);
-        return geoCurve.getEllipsoidalDistance();
-    }
-
-    public static double getDistance(double lat1, double lon1, double lat2, double lon2) {
-        double lat1Rad = toRadians(lat1);
-        double lon1Rad = toRadians(lon1);
-        double lat2Rad = toRadians(lat2);
-        double lon2Rad = toRadians(lon2);
-
-        double a = Math.sin((lat2Rad - lat1Rad) / 2) *
-            Math.sin((lat2Rad - lat1Rad) / 2) +
-            Math.cos(lat1Rad) *
-                Math.cos(lat2Rad) *
-                Math.sin((lon2Rad - lon1Rad) / 2) *
-                Math.sin((lon2Rad - lon1Rad) / 2);
-
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
-        return EARTH_RADIUS * c;
-    }
-
-    private static double toRadians(double degree) {
-        return degree * Math.PI / 180;
-    }
-
-
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/enums/SequencePrefixEnum.java

@@ -10,16 +10,6 @@ import java.util.Objects;
 public enum SequencePrefixEnum implements IIntegerEnum<String> {
 
     PRE_ORDER("P", "订单号"),
-    TICKET_BUY_ORDER("TB", "门票订单"),
-    TICKET_REWARD_ORDER("TR", "门票奖励订单"),
-    TICKET_REFUND_ORDER("TT", "门票退款订单"),
-    SHOP_ORDER("S", "商城订单"),
-    PROFIT_DETAIL("PD", "利润明细"),
-    GAME_DETAIL("G", "游戏明细"),
-    WITHDRAWAL("XF", "分销提现"),
-
-    TICKET_CODE_BATCH("C", "券码批次"),
-
     ;
 
     private String code;

ruoyi-user/src/main/java/com/ruoyi/userCollect/controller/UserCollectController.java

@@ -1,117 +0,0 @@
-package com.ruoyi.userCollect.controller;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.userCollect.domain.vo.UserCollectVo;
-import com.ruoyi.userCollect.domain.bo.UserCollectBo;
-import com.ruoyi.userCollect.service.IUserCollectService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 用户收藏Controller
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@Validated
-@Api(value = "用户收藏控制器", tags = {"用户收藏管理"})
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/system/userCollect")
-public class UserCollectController extends BaseController {
-
-    private final IUserCollectService iUserCollectService;
-
-    /**
-     * 分页查询用户收藏列表
-     */
-    @ApiOperation("查询用户收藏列表")
-    @SaCheckPermission("system:userCollect:list")
-    @GetMapping("/page")
-    public TableDataInfo<UserCollectVo> page(@Validated(QueryGroup.class) UserCollectBo bo, PageQuery pageQuery) {
-        return iUserCollectService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 获取用户收藏详细信息
-     */
-    @ApiOperation("获取用户收藏详细信息")
-    @SaCheckPermission("system:userCollect:query")
-    @GetMapping("/info/{id}")
-    public R<UserCollectVo> getInfo(@ApiParam("主键")
-                                                  @NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
-        return R.ok(iUserCollectService.queryById(id));
-    }
-
-    /**
-     * 新增用户收藏
-     */
-    @ApiOperation("新增用户收藏")
-    @SaCheckPermission("system:userCollect:add")
-    @Log(title = "用户收藏", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("/add")
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCollectBo bo) {
-        return toAjax(iUserCollectService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改用户收藏
-     */
-    @ApiOperation("修改用户收藏")
-    @SaCheckPermission("system:userCollect:edit")
-    @Log(title = "用户收藏", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PostMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCollectBo bo) {
-        return toAjax(iUserCollectService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除用户收藏
-     */
-    @ApiOperation("删除用户收藏")
-    @SaCheckPermission("system:userCollect:remove")
-    @Log(title = "用户收藏", businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public R<Void> remove(@ApiParam("主键串")
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        return toAjax(iUserCollectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-
-    /**
-     * 导出用户收藏列表
-     */
-    @ApiOperation("导出用户收藏列表")
-    @SaCheckPermission("system:userCollect:export")
-    @Log(title = "用户收藏", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(@Validated UserCollectBo bo, HttpServletResponse response) {
-        List<UserCollectVo> list = iUserCollectService.queryList(bo);
-        ExcelUtil.exportExcel(list, "用户收藏", UserCollectVo.class, response);
-    }
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/domain/UserCollect.java

@@ -1,44 +0,0 @@
-package com.ruoyi.userCollect.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.core.domain.BaseTimeEntity;
-import com.ruoyi.common.enums.collect.CollectEntityType;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 用户收藏对象 tb_user_collect
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@Data
-@TableName("tb_user_collect")
-public class UserCollect extends BaseTimeEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 用户ID
-     */
-    private Long userId;
-    /**
-     * 实体ID
-     */
-    private Long entityId;
-    /**
-     * 实体类型(景区1,门票1)
-     */
-    private CollectEntityType entityType;
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/domain/bo/UserCollectBo.java

@@ -1,55 +0,0 @@
-package com.ruoyi.userCollect.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.enums.collect.CollectEntityType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 用户收藏业务对象 tb_user_collect
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("用户收藏业务对象")
-public class UserCollectBo extends BaseEntity {
-
-    /**
-     * 主键ID
-     */
-    @ApiModelProperty(value = "主键ID", required = true)
-    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty(value = "用户ID", required = true)
-    private Long userId;
-
-    /**
-     * 实体ID
-     */
-    @ApiModelProperty(value = "实体ID", required = true)
-    @NotNull(message = "实体ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long entityId;
-
-    /**
-     * 实体类型(景区0,门票1)
-     */
-    @ApiModelProperty(value = "实体类型(景区0,门票1)", required = true)
-    @NotNull(message = "实体类型(景区0,门票1)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private CollectEntityType entityType;
-
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/domain/vo/UserCollectVo.java

@@ -1,57 +0,0 @@
-package com.ruoyi.userCollect.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import com.ruoyi.common.core.domain.BaseVo;
-import com.ruoyi.common.enums.collect.CollectEntityType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 用户收藏视图对象 tb_user_collect
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@Data
-@ApiModel("用户收藏视图对象")
-@ExcelIgnoreUnannotated
-public class UserCollectVo extends BaseVo {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @ExcelProperty(value = "主键ID")
-    @ApiModelProperty("主键ID")
-    private Long id;
-
-    /**
-     * 用户ID
-     */
-    @ExcelProperty(value = "用户ID")
-    @ApiModelProperty("用户ID")
-    private Long userId;
-
-    /**
-     * 实体ID
-     */
-    @ExcelProperty(value = "实体ID")
-    @ApiModelProperty("实体ID")
-    private Long entityId;
-
-    /**
-     * 实体类型(景区0,门票2)
-     */
-    @ExcelProperty(value = "实体类型(景区0,门票1)")
-    @ApiModelProperty("实体类型(景区0,门票1)")
-    private CollectEntityType entityType;
-
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/exception/UserCollectExceptionEnum.java

@@ -1,53 +0,0 @@
-package com.ruoyi.userCollect.exception;
-
-import com.ruoyi.common.enums.IIntegerEnum;
-import java.util.Objects;
-
-
-/**
- * 异常枚举
- */
-public enum UserCollectExceptionEnum implements IIntegerEnum {
-
-    // TODO 注意检查错误码，保证系统内唯一
-    UserCollect_IS_NOT_EXISTS(200001, "用户收藏不存在"),
-
-    ;
-
-    private Integer code;
-
-    private String msg;
-
-    UserCollectExceptionEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    @Override
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public static UserCollectExceptionEnum getByCode(int code, UserCollectExceptionEnum[] values) {
-        for (UserCollectExceptionEnum value : values) {
-            if (Objects.equals(code, value.getCode())) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/mapper/UserCollectMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.userCollect.mapper;
-
-import com.ruoyi.userCollect.domain.UserCollect;
-import com.ruoyi.userCollect.domain.vo.UserCollectVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 用户收藏Mapper接口
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-public interface UserCollectMapper extends BaseMapperPlus<UserCollectMapper, UserCollect, UserCollectVo> {
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/service/IUserCollectService.java

@@ -1,82 +0,0 @@
-package com.ruoyi.userCollect.service;
-
-import com.ruoyi.common.enums.collect.CollectEntityType;
-import com.ruoyi.userCollect.domain.UserCollect;
-import com.ruoyi.userCollect.domain.vo.UserCollectVo;
-import com.ruoyi.userCollect.domain.bo.UserCollectBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 用户收藏Service接口
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-public interface IUserCollectService {
-
-    /**
-     * 查询用户收藏分页
-     *
-     * @param bo 用户收藏
-     * @return 用户收藏集合
-     */
-    TableDataInfo<UserCollectVo> queryPageList(UserCollectBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询用户收藏列表
-     *
-     * @param bo 用户收藏
-     * @return 用户收藏集合
-     */
-    List<UserCollectVo> queryList(UserCollectBo bo);
-
-    /**
-     * 查询用户收藏
-     *
-     * @param id 用户收藏主键
-     * @return 用户收藏
-     */
-    UserCollectVo queryById(Long id);
-
-    /**
-     * 详情用户收藏
-     *
-     * @param id 用户收藏主键
-     * @return 用户收藏
-     */
-    UserCollect loadById(Long id, Boolean tw);
-
-    /**
-     * 新增用户收藏
-     *
-     * @param bo 用户收藏
-     * @return 结果
-     */
-    Boolean insertByBo(UserCollectBo bo);
-
-    /**
-     * 修改用户收藏
-     *
-     * @param bo 用户收藏
-     * @return 结果
-     */
-    Boolean updateByBo(UserCollectBo bo);
-
-    /**
-     * 校验并批量删除用户收藏信息
-     *
-     * @param ids 需要删除的用户收藏主键集合
-     * @param isValid 是否校验,true-删除前校验,false-不校验
-     * @return 结果
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    UserCollectVo getUserCollect(UserCollectBo bo);
-
-    UserCollectVo getUserCollect(Long userId, CollectEntityType entityType, Long entityId);
-
-}

ruoyi-user/src/main/java/com/ruoyi/userCollect/service/impl/UserCollectServiceImpl.java

@@ -1,171 +0,0 @@
-package com.ruoyi.userCollect.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.collect.CollectEntityType;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.userCollect.domain.UserCollect;
-import com.ruoyi.userCollect.domain.bo.UserCollectBo;
-import com.ruoyi.userCollect.domain.vo.UserCollectVo;
-import com.ruoyi.userCollect.exception.UserCollectExceptionEnum;
-import com.ruoyi.userCollect.mapper.UserCollectMapper;
-import com.ruoyi.userCollect.service.IUserCollectService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 用户收藏Service业务层处理
- *
- * @author ruoyi
- * @date 2025-04-18
- */
-@RequiredArgsConstructor
-@Service
-public class UserCollectServiceImpl implements IUserCollectService {
-
-    private final UserCollectMapper baseMapper;
-
-    /**
-     * 查询用户收藏分页
-     *
-     * @param bo 用户收藏
-     * @return 用户收藏
-     */
-    @Override
-    public TableDataInfo<UserCollectVo> queryPageList(UserCollectBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<UserCollect> lqw = buildQueryWrapper(bo);
-        Page<UserCollectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询用户收藏列表
-     *
-     * @param bo 用户收藏
-     * @return 用户收藏
-     */
-    @Override
-    public List<UserCollectVo> queryList(UserCollectBo bo) {
-        LambdaQueryWrapper<UserCollect> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<UserCollect> buildQueryWrapper(UserCollectBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<UserCollect> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getUserId() != null, UserCollect::getUserId, bo.getUserId());
-        lqw.eq(bo.getEntityId() != null, UserCollect::getEntityId, bo.getEntityId());
-        lqw.eq(bo.getEntityType() != null, UserCollect::getEntityType, bo.getEntityType());
-        return lqw;
-    }
-
-    /**
-     * 查询用户收藏
-     *
-     * @param id 用户收藏主键
-     * @return 用户收藏
-     */
-    @Override
-    public UserCollectVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 详情用户收藏
-     *
-     * @param id 用户收藏主键
-     * @return 用户收藏
-     */
-    @Override
-    public UserCollect loadById(Long id, Boolean tw){
-        UserCollect info = this.baseMapper.selectById(id);
-        if(ObjectUtil.isEmpty(info) && tw){
-            throw new ServiceException(UserCollectExceptionEnum.UserCollect_IS_NOT_EXISTS);
-        }
-        return info;
-    }
-
-    /**
-     * 新增用户收藏
-     *
-     * @param bo 用户收藏
-     * @return 结果
-     */
-    @Override
-    public Boolean insertByBo(UserCollectBo bo) {
-        UserCollect add = BeanUtil.toBean(bo, UserCollect.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改用户收藏
-     *
-     * @param bo 用户收藏
-     * @return 结果
-     */
-    @Override
-    public Boolean updateByBo(UserCollectBo bo) {
-        UserCollect userCollect = baseMapper.selectById(bo.getId());
-        UserCollect update = BeanCopyUtils.copy(bo, userCollect);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(UserCollect entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除用户收藏
-     *
-     * @param ids 需要删除的用户收藏主键
-     * @return 结果
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-
-    @Override
-    public UserCollectVo getUserCollect(UserCollectBo bo) {
-        return baseMapper.selectVoOne(Wrappers.lambdaQuery(UserCollect.class).eq(UserCollect::getUserId, bo.getUserId())
-            .eq(UserCollect::getEntityId, bo.getEntityId())
-            .eq(UserCollect::getEntityType, bo.getEntityType())
-            .last("limit 1")
-        );
-    }
-
-    @Override
-    public UserCollectVo getUserCollect(Long userId, CollectEntityType entityType, Long entityId) {
-        return this.baseMapper.selectVoOne(new LambdaQueryWrapper<UserCollect>()
-            .eq(UserCollect::getUserId, userId)
-            .eq(UserCollect::getEntityType, entityType)
-            .eq(UserCollect::getEntityId, entityId)
-            .last("limit 1")
-        );
-    }
-
-}