mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化项目结构，新增量表套餐处理

This commit is contained in:
cjw 2024-10-24 16:39:48 +08:00
parent b3d54790e0
commit 0df23d0900
238 changed files with 1007 additions and 1064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -378,12 +378,6 @@
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>rouyi-scale</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>

5
ruoyi-admin/pom.xml
View File

@ -79,11 +79,6 @@
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- scale模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>rouyi-scale</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>

1
ruoyi-modules/pom.xml
View File

@ -10,7 +10,6 @@
<modelVersion>4.0.0</modelVersion>
<modules>
<module>rouyi-scale</module>
<module>ruoyi-generator</module>
<module>ruoyi-job</module>
<module>ruoyi-system</module>

103
ruoyi-modules/rouyi-scale/pom.xml
View File

@ -1,103 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rouyi-scale</artifactId>
<description>
量表模块
</description>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<!-- OSS功能模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-oss</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<!-- excel-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-excel</artifactId>
</dependency>
<!-- SMS功能模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sms</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-wxpay</artifactId>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-words</artifactId>
</dependency>
</dependencies>
</project>

52
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java
View File

@ -1,52 +0,0 @@
package org.dromara.scale.domain.vo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.scale.domain.SysScale;
import org.dromara.scale.domain.SysScalePackage;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 量表套餐视图对象 sys_scale_package
*
* @author cjw
* @date 2024-10-23
*/
@Data
@AutoMapper(target = SysScalePackage.class)
public class SysScalePackageDetailVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 量表套餐id
*/
private Long packageId;
/**
* 套餐名称
*/
private String packageName;
/**
* 关联量表id
*/
List<SysScale> scaleDetail;
/**
* 备注
*/
private String remark;
/**
* 状态（0正常 1停用）
*/
private String status;
}

7
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml
View File

@ -1,7 +0,0 @@
<?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="org.dromara.scale.mapper.SysScalePackageMapper">
</mapper>

14
ruoyi-modules/ruoyi-system/pom.xml
View File

@ -95,6 +95,20 @@
<artifactId>ruoyi-common-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-wxpay</artifactId>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-words</artifactId>
</dependency>
</dependencies>
</project>

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/MBTICharEnum.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/MBTICharEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.constant;
package org.dromara.system.constant;
import org.dromara.common.core.utils.StringUtils;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScaleDimensionEnum.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScaleDimensionEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.constant;
package org.dromara.system.constant;
import java.util.Objects;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScoreRuleTypeEnum.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScoreRuleTypeEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.constant;
package org.dromara.system.constant;
import java.util.Objects;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/SituationEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.constant;
package org.dromara.system.constant;
import com.fasterxml.jackson.annotation.JsonValue;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/StatusEnum.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/StatusEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.constant;
package org.dromara.system.constant;
import com.fasterxml.jackson.annotation.JsonValue;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ActivityBo;
import org.dromara.scale.domain.vo.ActivityVo;
import org.dromara.scale.service.IActivityService;
import org.dromara.system.domain.bo.ActivityBo;
import org.dromara.system.domain.vo.ActivityVo;
import org.dromara.system.service.IActivityService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityEnterController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -11,9 +11,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ActivityEnterBo;
import org.dromara.scale.domain.vo.ActivityEnterVo;
import org.dromara.scale.service.IActivityEnterService;
import org.dromara.system.domain.bo.ActivityEnterBo;
import org.dromara.system.domain.vo.ActivityEnterVo;
import org.dromara.system.service.IActivityEnterService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java
View File

@ -1,13 +1,13 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.vo.ArchiveStatisticVo;
import org.dromara.scale.domain.vo.ArchiveVo;
import org.dromara.scale.service.IArchiveService;
import org.dromara.system.domain.vo.ArchiveStatisticVo;
import org.dromara.system.domain.vo.ArchiveVo;
import org.dromara.system.service.IArchiveService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.CounselorBo;
import org.dromara.scale.domain.vo.CounselorVo;
import org.dromara.scale.domain.vo.ReservationOrderListVo;
import org.dromara.scale.service.ICounselorService;
import org.dromara.scale.service.IReservationService;
import org.dromara.system.domain.bo.CounselorBo;
import org.dromara.system.domain.vo.CounselorVo;
import org.dromara.system.domain.vo.ReservationOrderListVo;
import org.dromara.system.service.ICounselorService;
import org.dromara.system.service.IReservationService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorExperienceController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorExperienceController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.CounselorExperienceBo;
import org.dromara.scale.domain.vo.CounselorExperienceVo;
import org.dromara.scale.service.ICounselorExperienceService;
import org.dromara.system.domain.bo.CounselorExperienceBo;
import org.dromara.system.domain.vo.CounselorExperienceVo;
import org.dromara.system.service.ICounselorExperienceService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorQualificationController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorQualificationController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.CounselorQualificationBo;
import org.dromara.scale.domain.vo.CounselorQualificationVo;
import org.dromara.scale.service.ICounselorQualificationService;
import org.dromara.system.domain.bo.CounselorQualificationBo;
import org.dromara.system.domain.vo.CounselorQualificationVo;
import org.dromara.system.service.ICounselorQualificationService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -8,9 +8,9 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysEvaluationConclusionBo;
import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
import org.dromara.scale.service.ISysEvaluationConclusionService;
import org.dromara.system.domain.bo.SysEvaluationConclusionBo;
import org.dromara.system.domain.vo.SysEvaluationConclusionVo;
import org.dromara.system.service.ISysEvaluationConclusionService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.io.FileUtil;
@ -14,11 +14,11 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.BaseQueryBo;
import org.dromara.scale.domain.bo.SysEvaluationRecordBo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.service.ISysEvaluationRecordService;
import org.dromara.scale.utils.AsposeUtil;
import org.dromara.system.domain.bo.BaseQueryBo;
import org.dromara.system.domain.bo.SysEvaluationRecordBo;
import org.dromara.system.domain.vo.SysEvaluationRecordVo;
import org.dromara.system.service.ISysEvaluationRecordService;
import org.dromara.system.utils.AsposeUtil;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/InterveneRecordController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -13,10 +13,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysInterveneRecordBo;
import org.dromara.scale.domain.vo.SysInterveneRecordVo;
import org.dromara.scale.domain.vo.TimeAxisVo;
import org.dromara.scale.service.ISysInterveneRecordService;
import org.dromara.system.domain.bo.SysInterveneRecordBo;
import org.dromara.system.domain.vo.SysInterveneRecordVo;
import org.dromara.system.domain.vo.TimeAxisVo;
import org.dromara.system.service.ISysInterveneRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationOrderController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -11,9 +11,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ReservationOrderBo;
import org.dromara.scale.domain.vo.ReservationOrderVo;
import org.dromara.scale.service.IReservationOrderService;
import org.dromara.system.domain.bo.ReservationOrderBo;
import org.dromara.system.domain.vo.ReservationOrderVo;
import org.dromara.system.service.IReservationOrderService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ReservationRefundBo;
import org.dromara.scale.domain.vo.ReservationRefundVo;
import org.dromara.scale.service.IReservationRefundService;
import org.dromara.system.domain.bo.ReservationRefundBo;
import org.dromara.system.domain.vo.ReservationRefundVo;
import org.dromara.system.service.IReservationRefundService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty;
@ -13,10 +13,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.SysScale;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.ISysScaleService;
import org.dromara.system.domain.SysScale;
import org.dromara.system.domain.bo.SysScaleBo;
import org.dromara.system.domain.vo.SysScaleVo;
import org.dromara.system.service.ISysScaleService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleFactorBo;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import org.dromara.scale.service.ISysScaleFactorService;
import org.dromara.system.domain.bo.SysScaleFactorBo;
import org.dromara.system.domain.vo.SysScaleFactorVo;
import org.dromara.system.service.ISysScaleFactorService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorRangeController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -9,9 +9,9 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
import org.dromara.scale.service.ISysScaleFactorRangeService;
import org.dromara.system.domain.bo.SysScaleFactorRangeBo;
import org.dromara.system.domain.vo.SysScaleFactorRangeVo;
import org.dromara.system.service.ISysScaleFactorRangeService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScalePublishController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.io.FileUtil;
@ -17,12 +17,12 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.BaseQueryBo;
import org.dromara.scale.domain.bo.SysScalePublishBo;
import org.dromara.scale.domain.vo.EvaluationVo;
import org.dromara.scale.domain.vo.SysScalePublishVo;
import org.dromara.scale.service.ISysScalePublishService;
import org.dromara.scale.utils.AsposeUtil;
import org.dromara.system.domain.bo.BaseQueryBo;
import org.dromara.system.domain.bo.SysScalePublishBo;
import org.dromara.system.domain.vo.EvaluationVo;
import org.dromara.system.domain.vo.SysScalePublishVo;
import org.dromara.system.service.ISysScalePublishService;
import org.dromara.system.utils.AsposeUtil;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleQuestionController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -14,10 +14,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleQuestionBo;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import org.dromara.scale.domain.vo.SysScaleQuestionVo;
import org.dromara.scale.service.ISysScaleQuestionService;
import org.dromara.system.domain.bo.SysScaleQuestionBo;
import org.dromara.system.domain.vo.SysScaleFactorVo;
import org.dromara.system.domain.vo.SysScaleQuestionVo;
import org.dromara.system.service.ISysScaleQuestionService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/StatisticController.java
View File

@ -1,14 +1,14 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.BaseQueryBo;
import org.dromara.scale.domain.vo.StatisticFactorVo;
import org.dromara.scale.domain.vo.StatisticNumVo;
import org.dromara.scale.domain.vo.StatisticPublishVo;
import org.dromara.scale.domain.vo.StatisticWarnVo;
import org.dromara.scale.service.IStatisticService;
import org.dromara.system.domain.bo.BaseQueryBo;
import org.dromara.system.domain.vo.StatisticFactorVo;
import org.dromara.system.domain.vo.StatisticNumVo;
import org.dromara.system.domain.vo.StatisticPublishVo;
import org.dromara.system.domain.vo.StatisticWarnVo;
import org.dromara.system.service.IStatisticService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/WarnController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.scale;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@ -14,12 +14,12 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.BaseQueryBo;
import org.dromara.scale.domain.bo.SysWarnRecordBo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.domain.vo.SysWarnConfigVo;
import org.dromara.scale.domain.vo.SysWarnRecordVo;
import org.dromara.scale.service.ISysWarnRecordService;
import org.dromara.system.domain.bo.BaseQueryBo;
import org.dromara.system.domain.bo.SysWarnRecordBo;
import org.dromara.system.domain.vo.SysEvaluationRecordVo;
import org.dromara.system.domain.vo.SysWarnConfigVo;
import org.dromara.system.domain.vo.SysWarnRecordVo;
import org.dromara.system.service.ISysWarnRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller;
package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaCheckRole;
@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScalePackageBo;
import org.dromara.scale.domain.vo.SysScalePackageVo;
import org.dromara.scale.service.ISysScalePackageService;
import org.dromara.system.domain.bo.SysScalePackageBo;
import org.dromara.system.domain.vo.SysScalePackageVo;
import org.dromara.system.service.ISysScalePackageService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxActivityController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@ -10,11 +10,11 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ActivityBo;
import org.dromara.scale.domain.bo.ActivityEnterBo;
import org.dromara.scale.domain.vo.ActivityVo;
import org.dromara.scale.service.IActivityEnterService;
import org.dromara.scale.service.IActivityService;
import org.dromara.system.domain.bo.ActivityBo;
import org.dromara.system.domain.bo.ActivityEnterBo;
import org.dromara.system.domain.vo.ActivityVo;
import org.dromara.system.service.IActivityEnterService;
import org.dromara.system.service.IActivityService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxCounselorController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@ -12,12 +12,12 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.*;
import org.dromara.scale.domain.vo.*;
import org.dromara.scale.service.ICounselorExperienceService;
import org.dromara.scale.service.ICounselorQualificationService;
import org.dromara.scale.service.ICounselorService;
import org.dromara.scale.service.IReservationService;
import org.dromara.system.service.ICounselorExperienceService;
import org.dromara.system.service.ICounselorQualificationService;
import org.dromara.system.service.ICounselorService;
import org.dromara.system.service.IReservationService;
import org.dromara.system.domain.bo.*;
import org.dromara.system.domain.vo.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxEvaluationController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxEvaluationController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@ -10,11 +10,11 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SubmitAnswerBo;
import org.dromara.scale.domain.vo.QuestionAnswerVo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.IEvaluationService;
import org.dromara.system.domain.bo.SubmitAnswerBo;
import org.dromara.system.domain.vo.QuestionAnswerVo;
import org.dromara.system.domain.vo.SysEvaluationRecordVo;
import org.dromara.system.domain.vo.SysScaleVo;
import org.dromara.system.service.IEvaluationService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

18
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxMyController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
@ -11,14 +11,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.BaseQueryBo;
import org.dromara.scale.domain.bo.ReservationOrderBo;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.*;
import org.dromara.scale.service.IArchiveService;
import org.dromara.scale.service.IMyService;
import org.dromara.scale.service.ISysEvaluationRecordService;
import org.dromara.scale.utils.AsposeUtil;
import org.dromara.system.domain.bo.BaseQueryBo;
import org.dromara.system.domain.bo.ReservationOrderBo;
import org.dromara.system.domain.bo.SysScaleBo;
import org.dromara.system.service.IArchiveService;
import org.dromara.system.service.IMyService;
import org.dromara.system.service.ISysEvaluationRecordService;
import org.dromara.system.utils.AsposeUtil;
import org.dromara.system.domain.vo.*;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;

18
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import jakarta.servlet.http.HttpServletRequest;
@ -13,14 +13,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ReservationOrderBo;
import org.dromara.scale.domain.bo.ReservationRefundBo;
import org.dromara.scale.domain.bo.SysScaleOrderBo;
import org.dromara.scale.domain.vo.ReservationOrderVo;
import org.dromara.scale.domain.vo.SysScaleOrderVo;
import org.dromara.scale.service.IReservationOrderService;
import org.dromara.scale.service.IReservationRefundService;
import org.dromara.scale.service.ISysScaleOrderService;
import org.dromara.system.domain.bo.ReservationOrderBo;
import org.dromara.system.domain.bo.ReservationRefundBo;
import org.dromara.system.domain.bo.SysScaleOrderBo;
import org.dromara.system.domain.vo.ReservationOrderVo;
import org.dromara.system.domain.vo.SysScaleOrderVo;
import org.dromara.system.service.IReservationOrderService;
import org.dromara.system.service.IReservationRefundService;
import org.dromara.system.service.ISysScaleOrderService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxPayController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import cn.dev33.satoken.annotation.SaIgnore;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
@ -8,9 +8,9 @@ import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.scale.service.IReservationOrderService;
import org.dromara.scale.service.IReservationRefundService;
import org.dromara.scale.service.ISysScaleOrderService;
import org.dromara.system.service.IReservationOrderService;
import org.dromara.system.service.IReservationRefundService;
import org.dromara.system.service.ISysScaleOrderService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@ -8,9 +8,9 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.ISysScaleService;
import org.dromara.system.domain.bo.SysScaleBo;
import org.dromara.system.domain.vo.SysScaleVo;
import org.dromara.system.service.ISysScaleService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScoreRecordController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScoreRecordController.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.controller.wx;
package org.dromara.system.controller.wx;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotNull;
@ -11,9 +11,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ScoreRecordBo;
import org.dromara.scale.domain.vo.ScoreRecordVo;
import org.dromara.scale.service.IScoreRecordService;
import org.dromara.system.domain.bo.ScoreRecordBo;
import org.dromara.system.domain.vo.ScoreRecordVo;
import org.dromara.system.service.IScoreRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Activity.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ActivityEnter.java
View File

@ -1,9 +1,11 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Counselor.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Counselor.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.vo.CounselorVo;
import org.dromara.system.domain.vo.CounselorVo;
import java.io.Serial;
import java.math.BigDecimal;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorExperience.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorQualification.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorQualification.java
View File

@ -1,9 +1,11 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationDay.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationDay.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

9
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationOrder.java
View File

@ -1,12 +1,13 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 预约订单对象 m_reservation_order

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationRefund.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationTime.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationTime.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ScoreRecord.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ScoreRecord.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationAnswer.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationConclusion.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationRecord.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysInterveneRecord.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScale.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.system.domain.vo.SysScaleVo;
import java.io.Serial;
import java.math.BigDecimal;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleAnswer.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleAnswer.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactor.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactor.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import org.dromara.scale.domain.vo.SysScaleFactorVo;
import org.dromara.system.domain.vo.SysScaleFactorVo;
import java.io.Serial;
import java.math.BigDecimal;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactorRange.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

9
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleOrder.java
View File

@ -1,12 +1,13 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 量表订单对象 sys_scale_order

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@ -9,7 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.vo.SysScalePackageVo;
import org.dromara.system.domain.vo.SysScalePackageVo;
import java.io.Serial;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePublish.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@ -9,7 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.dromara.common.tenant.core.TenantEntity;
import org.dromara.scale.domain.vo.SysScalePublishVo;
import org.dromara.system.domain.vo.SysScalePublishVo;
import java.io.Serial;
import java.util.Date;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleQuestion.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleQuestion.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysWarnRecord.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain;
package org.dromara.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.Activity;
import org.dromara.system.domain.Activity;
import java.util.Date;

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityEnterBo.java
View File

@ -1,13 +1,13 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.ActivityEnter;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.ActivityEnter;
/**
* 活动报名业务对象 m_activity_enter

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BaseQueryBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import lombok.Data;

15
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorBo.java
View File

@ -1,14 +1,15 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapping;
import org.dromara.scale.domain.Counselor;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.Counselor;
import java.math.BigDecimal;
import java.util.Date;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorExperienceBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.CounselorExperience;
import org.dromara.system.domain.CounselorExperience;
import java.util.Date;

15
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorQualificationBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorQualificationBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.CounselorQualification;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.CounselorQualification;
/**
* 资质证书业务对象 m_counselor_qualification
@ -21,7 +22,7 @@ import jakarta.validation.constraints.*;
public class CounselorQualificationBo extends BaseEntity {
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/QueryCounselorBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/QueryCounselorBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import lombok.Data;

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationDayBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.ReservationDay;
import org.dromara.scale.domain.ReservationTime;
import org.dromara.system.domain.ReservationDay;
import org.dromara.system.domain.ReservationTime;
import java.util.Date;
import java.util.List;

13
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationOrderBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationOrderBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.ReservationOrder;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.ReservationOrder;
import java.math.BigDecimal;
/**

13
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationRefundBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.ReservationRefund;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.ReservationRefund;
/**
* 预约退款业务对象 m_reservation_refund

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationTimeBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.ReservationTime;
import org.dromara.system.domain.ReservationTime;
import java.util.Date;

17
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ScoreRecordBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ScoreRecordBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.ScoreRecord;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.ScoreRecord;
import java.math.BigDecimal;
/**
@ -22,7 +23,7 @@ import java.math.BigDecimal;
public class ScoreRecordBo extends BaseEntity {
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
@ -40,7 +41,7 @@ public class ScoreRecordBo extends BaseEntity {
private Integer recordStatus;
/**
*
*
*/
@NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal score;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitAnswerBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitAnswerBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import lombok.Data;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitExperienceBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitExperienceBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import lombok.Data;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationAnswerBo.java
View File

@ -1,8 +1,8 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.scale.domain.SysEvaluationAnswer;
import org.dromara.system.domain.SysEvaluationAnswer;
/**
* 量测回答记录业务对象 sys_evaluation_answer

5
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationConclusionBo.java
View File

@ -1,12 +1,11 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.scale.domain.SysEvaluationConclusion;
import org.dromara.system.domain.SysEvaluationConclusion;
import java.math.BigDecimal;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationRecordBo.java
View File

@ -1,11 +1,11 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.scale.domain.SysEvaluationRecord;
import org.dromara.system.domain.SysEvaluationRecord;
import java.util.Date;

13
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysInterveneRecordBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.SysInterveneRecord;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.SysInterveneRecord;
import java.util.Date;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleAnswerBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleAnswerBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.scale.domain.SysScaleAnswer;
import org.dromara.system.domain.SysScaleAnswer;
import java.math.BigDecimal;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScale;
import org.dromara.system.domain.SysScale;
import java.math.BigDecimal;
import java.util.List;

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScaleFactor;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.system.domain.SysScaleFactor;
import org.dromara.system.domain.SysScaleFactorRange;
import java.math.BigDecimal;
import java.util.List;

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorRangeBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorRangeBo.java
View File

@ -1,13 +1,15 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import org.dromara.scale.domain.SysScaleFactorRange;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.domain.SysScaleFactorRange;
import java.math.BigDecimal;
/**

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleOrderBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleOrderBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.tenant.core.TenantEntity;
import org.dromara.scale.domain.SysScaleOrder;
import org.dromara.system.domain.SysScaleOrder;
import java.math.BigDecimal;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScalePackage;
import org.dromara.system.domain.SysScalePackage;
import java.util.List;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePublishBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
@ -8,7 +8,7 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.scale.domain.SysScalePublish;
import org.dromara.system.domain.SysScalePublish;
import java.util.Date;
import java.util.List;

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleQuestionBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleQuestionBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScaleAnswer;
import org.dromara.scale.domain.SysScaleQuestion;
import org.dromara.system.domain.SysScaleAnswer;
import org.dromara.system.domain.SysScaleQuestion;
import java.util.List;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysWarnRecordBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.bo;
package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysWarnRecord;
import org.dromara.system.domain.SysWarnRecord;
import java.util.Date;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityEnterVo.java
View File

@ -1,10 +1,10 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.scale.domain.ActivityEnter;
import org.dromara.system.domain.ActivityEnter;
import java.io.Serial;
import java.io.Serializable;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.scale.domain.Activity;
import org.dromara.system.domain.Activity;
import java.io.Serial;
import java.io.Serializable;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveStatisticVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveStatisticVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import lombok.Data;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorExperienceVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -8,7 +8,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.scale.domain.CounselorExperience;
import org.dromara.system.domain.CounselorExperience;
import java.io.Serial;
import java.io.Serializable;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorQualificationVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.scale.domain.CounselorQualification;
import org.dromara.system.domain.CounselorQualification;
import java.io.Serial;
import java.io.Serializable;

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorVo.java
View File

@ -1,11 +1,11 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.scale.domain.Counselor;
import org.dromara.system.domain.Counselor;
import java.io.Serial;
import java.io.Serializable;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/EvaluationVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EvaluationVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/QuestionAnswerVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/QuestionAnswerVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import lombok.Data;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDateVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import lombok.Data;

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDayVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDayVo.java
View File

@ -1,10 +1,10 @@
package org.dromara.scale.domain.vo;
package org.dromara.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.scale.domain.ReservationDay;
import org.dromara.scale.domain.ReservationTime;
import org.dromara.system.domain.ReservationDay;
import org.dromara.system.domain.ReservationTime;
import java.io.Serial;
import java.io.Serializable;

Some files were not shown because too many files have changed in this diff Show More