diff --git a/pom.xml b/pom.xml index c3e4885..281acff 100644 --- a/pom.xml +++ b/pom.xml @@ -378,12 +378,6 @@ ${revision} - - org.dromara - rouyi-scale - ${revision} - - com.github.binarywang weixin-java-pay diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 08d646e..a651dfb 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -79,11 +79,6 @@ ruoyi-generator - - - org.dromara - rouyi-scale - de.codecentric spring-boot-admin-starter-client diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 3cd8b7e..6a6ad3e 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - rouyi-scale ruoyi-generator ruoyi-job ruoyi-system diff --git a/ruoyi-modules/rouyi-scale/pom.xml b/ruoyi-modules/rouyi-scale/pom.xml deleted file mode 100644 index da09f7e..0000000 --- a/ruoyi-modules/rouyi-scale/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - rouyi-scale - - - 量表模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-system - - - - org.dromara - ruoyi-common-mybatis - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-wxpay - - - - com.deepoove - poi-tl - - - - com.luhuiguo - aspose-words - - - - diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java deleted file mode 100644 index d75a355..0000000 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java +++ /dev/null @@ -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 scaleDetail; - - /** - * 备注 - */ - private String remark; - - /** - * 状态（0正常 1停用） - */ - private String status; - - -} diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml deleted file mode 100644 index 4e6b09f..0000000 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index acf33ce..fda31d7 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -95,6 +95,20 @@ ruoyi-common-websocket + + org.dromara + ruoyi-common-wxpay + + + + com.deepoove + poi-tl + + + + com.luhuiguo + aspose-words + diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/MBTICharEnum.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/MBTICharEnum.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/MBTICharEnum.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/MBTICharEnum.java index f9237c1..0569fdb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/MBTICharEnum.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/MBTICharEnum.java @@ -1,4 +1,4 @@ -package org.dromara.scale.constant; +package org.dromara.system.constant; import org.dromara.common.core.utils.StringUtils; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScaleDimensionEnum.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScaleDimensionEnum.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScaleDimensionEnum.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScaleDimensionEnum.java index d08b1cd..af1e309 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScaleDimensionEnum.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScaleDimensionEnum.java @@ -1,4 +1,4 @@ -package org.dromara.scale.constant; +package org.dromara.system.constant; import java.util.Objects; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScoreRuleTypeEnum.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScoreRuleTypeEnum.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScoreRuleTypeEnum.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScoreRuleTypeEnum.java index 857d2dc..fa0dd85 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/ScoreRuleTypeEnum.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/ScoreRuleTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.scale.constant; +package org.dromara.system.constant; import java.util.Objects; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/SituationEnum.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/SituationEnum.java index a4a0f99..5ad37b8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/SituationEnum.java @@ -1,4 +1,4 @@ -package org.dromara.scale.constant; +package org.dromara.system.constant; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/StatusEnum.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/StatusEnum.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/StatusEnum.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/StatusEnum.java index 5e2d10e..c2abd07 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/StatusEnum.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/StatusEnum.java @@ -1,4 +1,4 @@ -package org.dromara.scale.constant; +package org.dromara.system.constant; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityController.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityController.java index 765a44f..16537f6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityEnterController.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityEnterController.java index 8913e49..b78cbdc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ActivityEnterController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java index 91dd2be..c0958d5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorController.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorController.java index 9667b75..e02cb25 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorExperienceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorExperienceController.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorExperienceController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorExperienceController.java index 1cc054d..a6f5399 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorExperienceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorExperienceController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorQualificationController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorQualificationController.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorQualificationController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorQualificationController.java index 51939fb..7c8711e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorQualificationController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/CounselorQualificationController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java index 219d73b..e52817b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java index cc66590..a336385 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/InterveneRecordController.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/InterveneRecordController.java index 066c591..6331a6c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/InterveneRecordController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/InterveneRecordController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationOrderController.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationOrderController.java index e92bffd..cea4619 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationOrderController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java index 1811ccb..18be51e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleController.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleController.java index 09b7245..3875db1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorController.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorController.java index 6d9a6d0..9c37aa2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorRangeController.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorRangeController.java index 6acad49..42bb96c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleFactorRangeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleFactorRangeController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScalePublishController.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScalePublishController.java index bd81e14..51015d3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScalePublishController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleQuestionController.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleQuestionController.java index ef0932f..0d6cd17 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleQuestionController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ScaleQuestionController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/StatisticController.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/StatisticController.java index 282d92e..ae2ec95 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/StatisticController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/WarnController.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/WarnController.java index 5bcd74b..942b370 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/WarnController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java index 777b99d..c3ee264 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxActivityController.java similarity index 87% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxActivityController.java index 1a9e876..aa0749a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxActivityController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxCounselorController.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxCounselorController.java index 0f63f54..3505e69 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxCounselorController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxEvaluationController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxEvaluationController.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxEvaluationController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxEvaluationController.java index ec4c1c9..048e530 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxEvaluationController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxEvaluationController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxMyController.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxMyController.java index bb45852..1565821 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxMyController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java index 4ce3a77..2bef0e9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxPayController.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxPayController.java index 336cfe5..02985fe 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxPayController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java index a4a8623..0d28f0e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScoreRecordController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScoreRecordController.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScoreRecordController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScoreRecordController.java index 6e57677..82f5653 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScoreRecordController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScoreRecordController.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Activity.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Activity.java index 59c45fc..cbdd2ce 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Activity.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ActivityEnter.java similarity index 77% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ActivityEnter.java index 0da5521..a50f726 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ActivityEnter.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Counselor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Counselor.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Counselor.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Counselor.java index 73c6feb..354b00c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Counselor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Counselor.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorExperience.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorExperience.java index 0cdca0f..0d034fa 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorExperience.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorExperience.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorQualification.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorQualification.java similarity index 79% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorQualification.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorQualification.java index 826a63b..42dd934 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/CounselorQualification.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CounselorQualification.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationDay.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationDay.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationDay.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationDay.java index 98f00af..f9d4be6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationDay.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationDay.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationOrder.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationOrder.java index 34c5057..7ce74ef 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationOrder.java @@ -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 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationRefund.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationRefund.java index fffaa76..ae47161 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationRefund.java @@ -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.*; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationTime.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationTime.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationTime.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationTime.java index 21a350d..0aaa97d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationTime.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ReservationTime.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ScoreRecord.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ScoreRecord.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ScoreRecord.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ScoreRecord.java index 471f3e7..81ab869 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ScoreRecord.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ScoreRecord.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationAnswer.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationAnswer.java index 7a234fb..8bd0bbb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationAnswer.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationConclusion.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationConclusion.java index dfbadb3..412d381 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationConclusion.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationRecord.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationRecord.java index 5826805..ecde6b7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysEvaluationRecord.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysInterveneRecord.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysInterveneRecord.java index bdd25db..3122a6e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysInterveneRecord.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScale.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScale.java index 0bdc1fc..1c4846b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScale.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleAnswer.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleAnswer.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleAnswer.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleAnswer.java index cf77223..466a988 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleAnswer.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleAnswer.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactor.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactor.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactor.java index 860a527..16301da 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactor.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactorRange.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactorRange.java index 1cf59c7..19ae598 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleFactorRange.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleOrder.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleOrder.java index 91bc2cc..9ce5970 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleOrder.java @@ -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 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java index 1e9b029..c53fcca 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePublish.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePublish.java index ce815c0..d10d8be 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePublish.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleQuestion.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleQuestion.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleQuestion.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleQuestion.java index 183f17e..9d5404f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleQuestion.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScaleQuestion.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysWarnRecord.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysWarnRecord.java index 34ec1a4..7cd0b93 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysWarnRecord.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityBo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityBo.java index 42b80a5..c5c13b0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityEnterBo.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityEnterBo.java index 06f6adc..edf0dfa 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ActivityEnterBo.java @@ -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 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BaseQueryBo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BaseQueryBo.java index ed2a674..f9d5040 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BaseQueryBo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.bo; +package org.dromara.system.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorBo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorBo.java index d2df93d..8d58c34 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorExperienceBo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorExperienceBo.java index 02bbd73..af87739 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorExperienceBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorQualificationBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorQualificationBo.java similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorQualificationBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorQualificationBo.java index ef17185..5a321ee 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorQualificationBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/CounselorQualificationBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/QueryCounselorBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/QueryCounselorBo.java similarity index 79% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/QueryCounselorBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/QueryCounselorBo.java index e1dbb71..86e8135 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/QueryCounselorBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/QueryCounselorBo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.bo; +package org.dromara.system.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationDayBo.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationDayBo.java index b3bf866..8466562 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationDayBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationOrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationOrderBo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationOrderBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationOrderBo.java index b831360..fb86db1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationOrderBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationOrderBo.java @@ -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; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationRefundBo.java similarity index 87% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationRefundBo.java index 5e8e60d..48e7c85 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationRefundBo.java @@ -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 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationTimeBo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationTimeBo.java index a880580..1ed430a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ReservationTimeBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ScoreRecordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ScoreRecordBo.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ScoreRecordBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ScoreRecordBo.java index 07bd1cd..8ff4ed6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ScoreRecordBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ScoreRecordBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitAnswerBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitAnswerBo.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitAnswerBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitAnswerBo.java index 790c95f..0fa9c73 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitAnswerBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitAnswerBo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.bo; +package org.dromara.system.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitExperienceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitExperienceBo.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitExperienceBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitExperienceBo.java index f6a0dd9..0e481c7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SubmitExperienceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SubmitExperienceBo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.bo; +package org.dromara.system.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationAnswerBo.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationAnswerBo.java index f98e0bc..b55b400 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationAnswerBo.java @@ -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 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationConclusionBo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationConclusionBo.java index 4167f02..d52c472 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationConclusionBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationRecordBo.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationRecordBo.java index c348149..083a21e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysEvaluationRecordBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysInterveneRecordBo.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysInterveneRecordBo.java index ab086e4..3fcb05a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysInterveneRecordBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleAnswerBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleAnswerBo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleAnswerBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleAnswerBo.java index 1f0d13d..dac49e9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleAnswerBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleAnswerBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleBo.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleBo.java index dd8069e..4038c13 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorBo.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorBo.java index 6e110c8..4b3f16a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorRangeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorRangeBo.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorRangeBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorRangeBo.java index bcc6628..74cc37c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleFactorRangeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleFactorRangeBo.java @@ -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; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleOrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleOrderBo.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleOrderBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleOrderBo.java index 53374cb..da75f9e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleOrderBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleOrderBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java index dda6a20..4d13291 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePublishBo.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePublishBo.java index 7158334..56b65c4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePublishBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleQuestionBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleQuestionBo.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleQuestionBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleQuestionBo.java index 9d3d57f..edcf0db 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleQuestionBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScaleQuestionBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysWarnRecordBo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysWarnRecordBo.java index 2a865e6..d80aa4f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysWarnRecordBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityEnterVo.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityEnterVo.java index c04484c..594912d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityEnterVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityVo.java index 60a55e5..0f7c6a8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ActivityVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveStatisticVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveStatisticVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveStatisticVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveStatisticVo.java index 359677f..098763e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveStatisticVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveStatisticVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveVo.java index b50c6b6..6fa00ae 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ArchiveVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorExperienceVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorExperienceVo.java index f1aa424..df2aa13 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorExperienceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorExperienceVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorQualificationVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorQualificationVo.java index 19b2376..151c07c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorQualificationVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorVo.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorVo.java index 39d978e..b906641 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CounselorVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/EvaluationVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EvaluationVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/EvaluationVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EvaluationVo.java index 46eed8c..60cd9f8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/EvaluationVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/EvaluationVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/QuestionAnswerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/QuestionAnswerVo.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/QuestionAnswerVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/QuestionAnswerVo.java index 921985b..7af58e2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/QuestionAnswerVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/QuestionAnswerVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDateVo.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDateVo.java index 2225cc1..7290c4f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDateVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDayVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDayVo.java similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDayVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDayVo.java index a275fbd..b9e5667 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDayVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationDayVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderListVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderListVo.java index 0259860..c5540d0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderListVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderVo.java index b84b4df..affad80 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationOrderVo.java @@ -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.ReservationOrder; +import org.dromara.system.domain.ReservationOrder; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationRefundVo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationRefundVo.java index 8f0c556..95ff091 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationRefundVo.java @@ -1,13 +1,13 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; -import io.github.linpeilie.annotations.AutoMapping; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.scale.domain.ReservationRefund; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; 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.system.domain.ReservationRefund; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationTimeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationTimeVo.java similarity index 78% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationTimeVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationTimeVo.java index 8f6f6fc..7d851f9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationTimeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationTimeVo.java @@ -1,21 +1,16 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.scale.domain.ReservationTime; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.system.domain.ReservationTime; import java.io.Serial; import java.io.Serializable; import java.util.Date; - /** * 预约-时间视图对象 m_reservation_time * @@ -31,7 +26,7 @@ public class ReservationTimeVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationVo.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationVo.java index 21107d4..a3a9234 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ReservationVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRateVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRateVo.java similarity index 83% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRateVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRateVo.java index 8fe1ef7..b91ad61 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRateVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRateVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRecordVo.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRecordVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRecordVo.java index 9df10de..f529681 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ScoreRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ScoreRecordVo.java @@ -1,8 +1,8 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.scale.domain.ScoreRecord; +import org.dromara.system.domain.ScoreRecord; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticFactorVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticFactorVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticFactorVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticFactorVo.java index 012194a..da00f3d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticFactorVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticFactorVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticNumVo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticNumVo.java index 72d30e6..0a1658f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticNumVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticPublishVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticPublishVo.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticPublishVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticPublishVo.java index ce9b807..4b58402 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticPublishVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticPublishVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticWarnVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticWarnVo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticWarnVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticWarnVo.java index 8d6cf00..26d8716 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticWarnVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StatisticWarnVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationAnswerVo.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationAnswerVo.java index 312e1c9..abbe244 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationAnswerVo.java @@ -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.SysEvaluationAnswer; +import org.dromara.system.domain.SysEvaluationAnswer; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java index f25970f..6524fbd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java @@ -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.SysEvaluationConclusion; +import org.dromara.system.domain.SysEvaluationConclusion; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationRecordVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationRecordVo.java index b012828..578ff59 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationRecordVo.java @@ -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.SysEvaluationRecord; +import org.dromara.system.domain.SysEvaluationRecord; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysInterveneRecordVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysInterveneRecordVo.java index 0b7b3b6..aa60604 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysInterveneRecordVo.java @@ -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.SysInterveneRecord; +import org.dromara.system.domain.SysInterveneRecord; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleAnswerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleAnswerVo.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleAnswerVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleAnswerVo.java index 8dce839..0ef09eb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleAnswerVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleAnswerVo.java @@ -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.SysScaleAnswer; +import org.dromara.system.domain.SysScaleAnswer; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorRangeVo.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorRangeVo.java index a981d01..70147b8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorRangeVo.java @@ -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.SysScaleFactorRange; +import org.dromara.system.domain.SysScaleFactorRange; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorVo.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorVo.java index ce719fe..5c1e44d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleFactorVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleOrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleOrderVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java index 4a69ac0..3e25af4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleOrderVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleOrderVo.java @@ -1,18 +1,14 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; -import java.math.BigDecimal; -import org.dromara.scale.domain.SysScaleOrder; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.system.domain.SysScaleOrder; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - +import java.math.BigDecimal; /** @@ -30,7 +26,7 @@ public class SysScaleOrderVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java index f0fcee0..7273ade 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePublishVo.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePublishVo.java index 6670179..f66b385 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePublishVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleQuestionVo.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleQuestionVo.java index d7160af..3ada703 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleQuestionVo.java @@ -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.SysScaleQuestion; +import org.dromara.system.domain.SysScaleQuestion; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleVo.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleVo.java index cd3a1a1..89f6712 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScaleVo.java @@ -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.SysScale; +import org.dromara.system.domain.SysScale; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnConfigVo.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnConfigVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnConfigVo.java index 7fe5b47..d6fef13 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnConfigVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnRecordVo.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnRecordVo.java index 93743b1..fe89531 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysWarnRecordVo.java @@ -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.SysWarnRecord; +import org.dromara.system.domain.SysWarnRecord; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/TimeAxisVo.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/TimeAxisVo.java index d0ea408..6526230 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/TimeAxisVo.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.vo; +package org.dromara.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/EvaluationRecordWordData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/EvaluationRecordWordData.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/EvaluationRecordWordData.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/EvaluationRecordWordData.java index 28e9ec7..4fefabb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/EvaluationRecordWordData.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/EvaluationRecordWordData.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import com.deepoove.poi.data.TableRenderData; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/PublishRecordWordData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/PublishRecordWordData.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/PublishRecordWordData.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/PublishRecordWordData.java index 04e8a4f..961114b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/PublishRecordWordData.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/PublishRecordWordData.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import com.deepoove.poi.data.ChartSingleSeriesRenderData; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordClass.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordClass.java similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordClass.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordClass.java index 20ee77e..129419b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordClass.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordClass.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordEvaluationFactor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordEvaluationFactor.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordEvaluationFactor.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordEvaluationFactor.java index 314df4a..7781c54 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordEvaluationFactor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordEvaluationFactor.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordFactor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordFactor.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordFactor.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordFactor.java index e6d2773..690e6cf 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordFactor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordFactor.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordRadar.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordRadar.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordRadar.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordRadar.java index 514bb33..8086036 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordRadar.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordRadar.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import com.deepoove.poi.data.ChartMultiSeriesRenderData; import lombok.Data; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordWarn.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordWarn.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordWarn.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordWarn.java index 6ec5324..f3bea8e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/word/WordWarn.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/word/WordWarn.java @@ -1,4 +1,4 @@ -package org.dromara.scale.domain.word; +package org.dromara.system.domain.word; import com.deepoove.poi.data.ChartMultiSeriesRenderData; import com.deepoove.poi.data.TableRenderData; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityEnterMapper.java similarity index 71% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityEnterMapper.java index 73899bb..868cbb8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityEnterMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.ActivityEnter; -import org.dromara.scale.domain.vo.ActivityEnterVo; +import org.dromara.system.domain.ActivityEnter; +import org.dromara.system.domain.vo.ActivityEnterVo; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityMapper.java similarity index 70% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityMapper.java index 383e264..aa1f73e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ActivityMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.Activity; -import org.dromara.scale.domain.vo.ActivityVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.Activity; +import org.dromara.system.domain.vo.ActivityVo; /** * 活动Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ArchiveMapper.java similarity index 83% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ArchiveMapper.java index 0d6b7c2..65277dd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ArchiveMapper.java @@ -1,12 +1,12 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.scale.domain.vo.ArchiveStatisticVo; -import org.dromara.scale.domain.vo.ArchiveVo; +import org.dromara.system.domain.vo.ArchiveStatisticVo; +import org.dromara.system.domain.vo.ArchiveVo; @Mapper public interface ArchiveMapper { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorExperienceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorExperienceMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorExperienceMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorExperienceMapper.java index f422a6b..65d03c7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorExperienceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorExperienceMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.CounselorExperience; -import org.dromara.scale.domain.vo.CounselorExperienceVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.CounselorExperience; +import org.dromara.system.domain.vo.CounselorExperienceVo; /** * 培训经历Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorMapper.java similarity index 68% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorMapper.java index 688e1b0..5bc6c71 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.Counselor; -import org.dromara.scale.domain.vo.CounselorVo; +import org.dromara.system.domain.Counselor; +import org.dromara.system.domain.vo.CounselorVo; /** * 心理咨询师Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorQualificationMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorQualificationMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorQualificationMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorQualificationMapper.java index 2267559..0aa8956 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/CounselorQualificationMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CounselorQualificationMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.CounselorQualification; -import org.dromara.scale.domain.vo.CounselorQualificationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.CounselorQualification; +import org.dromara.system.domain.vo.CounselorQualificationVo; /** * 资质证书Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationDayMapper.java similarity index 73% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationDayMapper.java index ea10a3b..2479a0f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationDayMapper.java @@ -1,12 +1,12 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.ReservationDay; -import org.dromara.scale.domain.vo.ReservationDateVo; -import org.dromara.scale.domain.vo.ReservationDayVo; -import org.dromara.scale.domain.vo.ReservationOrderListVo; +import org.dromara.system.domain.ReservationDay; +import org.dromara.system.domain.vo.ReservationDateVo; +import org.dromara.system.domain.vo.ReservationDayVo; +import org.dromara.system.domain.vo.ReservationOrderListVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationOrderMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationOrderMapper.java index 42e3c74..b8ddcfd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationOrderMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.vo.ReservationOrderVo; +import org.dromara.system.domain.ReservationOrder; +import org.dromara.system.domain.vo.ReservationOrderVo; /** * 预约订单Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationRefundMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationRefundMapper.java index f8ac6cc..09557cd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationRefundMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.ReservationRefund; -import org.dromara.scale.domain.vo.ReservationRefundVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.ReservationRefund; +import org.dromara.system.domain.vo.ReservationRefundVo; /** * 预约退款Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationTimeMapper.java similarity index 77% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationTimeMapper.java index 5b40868..ebd03d8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ReservationTimeMapper.java @@ -1,12 +1,12 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.ReservationTime; -import org.dromara.scale.domain.vo.ReservationOrderListVo; -import org.dromara.scale.domain.vo.ReservationTimeVo; +import org.dromara.system.domain.ReservationTime; +import org.dromara.system.domain.vo.ReservationOrderListVo; +import org.dromara.system.domain.vo.ReservationTimeVo; /** * 预约-时间Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ScoreRecordMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ScoreRecordMapper.java similarity index 63% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ScoreRecordMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ScoreRecordMapper.java index a89a5a5..dd9218d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ScoreRecordMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ScoreRecordMapper.java @@ -1,10 +1,10 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.ScoreRecord; -import org.dromara.scale.domain.vo.ScoreRateVo; -import org.dromara.scale.domain.vo.ScoreRecordVo; +import org.dromara.system.domain.ScoreRecord; +import org.dromara.system.domain.vo.ScoreRateVo; +import org.dromara.system.domain.vo.ScoreRecordVo; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StatisticMapper.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StatisticMapper.java index a357c73..7bec9ea 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StatisticMapper.java @@ -1,11 +1,11 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -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.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 java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationAnswerMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationAnswerMapper.java index 1ca1d28..617f4df 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationAnswerMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysEvaluationAnswer; -import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysEvaluationAnswer; +import org.dromara.system.domain.vo.SysEvaluationAnswerVo; /** * 量测回答记录Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationConclusionMapper.java similarity index 80% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationConclusionMapper.java index d8baa96..86f12e0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationConclusionMapper.java @@ -1,12 +1,12 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysEvaluationConclusion; -import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; +import org.dromara.system.domain.SysEvaluationConclusion; +import org.dromara.system.domain.vo.SysEvaluationConclusionVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationRecordMapper.java similarity index 83% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationRecordMapper.java index 1f63585..89ff804 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysEvaluationRecordMapper.java @@ -1,4 +1,4 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.vo.StatisticNumVo; -import org.dromara.scale.domain.vo.SysEvaluationRecordVo; -import org.dromara.scale.domain.vo.SysScaleVo; -import org.dromara.scale.domain.word.WordEvaluationFactor; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.vo.StatisticNumVo; +import org.dromara.system.domain.vo.SysEvaluationRecordVo; +import org.dromara.system.domain.vo.SysScaleVo; +import org.dromara.system.domain.word.WordEvaluationFactor; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysInterveneRecordMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysInterveneRecordMapper.java similarity index 65% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysInterveneRecordMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysInterveneRecordMapper.java index 83051ce..d31f5fb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysInterveneRecordMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysInterveneRecordMapper.java @@ -1,10 +1,10 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysInterveneRecord; -import org.dromara.scale.domain.vo.SysInterveneRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.vo.TimeAxisVo; +import org.dromara.system.domain.SysInterveneRecord; +import org.dromara.system.domain.vo.SysInterveneRecordVo; +import org.dromara.system.domain.vo.TimeAxisVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleAnswerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleAnswerMapper.java similarity index 81% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleAnswerMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleAnswerMapper.java index 8ad4d10..ce66ef7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleAnswerMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleAnswerMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysScaleAnswer; -import org.dromara.scale.domain.vo.SysScaleAnswerVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysScaleAnswer; +import org.dromara.system.domain.vo.SysScaleAnswerVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorMapper.java similarity index 71% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorMapper.java index 097e676..369b86d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysScaleFactor; -import org.dromara.scale.domain.vo.SysScaleFactorVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysScaleFactor; +import org.dromara.system.domain.vo.SysScaleFactorVo; /** * 测评因子Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorRangeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorRangeMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorRangeMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorRangeMapper.java index 7fe8f37..c3c402a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleFactorRangeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleFactorRangeMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysScaleFactorRange; -import org.dromara.scale.domain.vo.SysScaleFactorRangeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysScaleFactorRange; +import org.dromara.system.domain.vo.SysScaleFactorRangeVo; /** * 因子分段Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleMapper.java similarity index 77% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleMapper.java index bea5977..6c71ea4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.vo.SysScaleVo; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.vo.SysScaleVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleOrderMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleOrderMapper.java index 4f58a43..27c3377 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleOrderMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.scale.domain.SysScaleOrder; -import org.dromara.scale.domain.vo.SysScaleOrderVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysScaleOrder; +import org.dromara.system.domain.vo.SysScaleOrderVo; /** * 量表订单Mapper接口 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java index 62c72a2..7effb0a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java @@ -1,9 +1,9 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysScalePackage; -import org.dromara.scale.domain.vo.SysScalePackageVo; +import org.dromara.system.domain.SysScalePackage; +import org.dromara.system.domain.vo.SysScalePackageVo; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePublishMapper.java similarity index 82% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePublishMapper.java index 40f88c2..ac0d943 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePublishMapper.java @@ -1,13 +1,13 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysScalePublish; -import org.dromara.scale.domain.vo.EvaluationVo; -import org.dromara.scale.domain.vo.StatisticNumVo; -import org.dromara.scale.domain.vo.SysScalePublishVo; +import org.dromara.system.domain.SysScalePublish; +import org.dromara.system.domain.vo.EvaluationVo; +import org.dromara.system.domain.vo.StatisticNumVo; +import org.dromara.system.domain.vo.SysScalePublishVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleQuestionMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleQuestionMapper.java similarity index 69% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleQuestionMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleQuestionMapper.java index 31dac65..ba7e537 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleQuestionMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScaleQuestionMapper.java @@ -1,10 +1,10 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysScaleQuestion; -import org.dromara.scale.domain.vo.SysScaleFactorVo; -import org.dromara.scale.domain.vo.SysScaleQuestionVo; +import org.dromara.system.domain.SysScaleQuestion; +import org.dromara.system.domain.vo.SysScaleFactorVo; +import org.dromara.system.domain.vo.SysScaleQuestionVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysWarnRecordMapper.java similarity index 76% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysWarnRecordMapper.java index 3f55847..468f68e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysWarnRecordMapper.java @@ -1,4 +1,4 @@ -package org.dromara.scale.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,12 +7,12 @@ import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.scale.domain.SysWarnRecord; -import org.dromara.scale.domain.bo.BaseQueryBo; -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.domain.vo.TimeAxisVo; +import org.dromara.system.domain.SysWarnRecord; +import org.dromara.system.domain.bo.BaseQueryBo; +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.domain.vo.TimeAxisVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityEnterService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityEnterService.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityEnterService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityEnterService.java index eba5a6b..d2de795 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityEnterService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityEnterService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.vo.ActivityEnterVo; -import org.dromara.scale.domain.bo.ActivityEnterBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.ActivityEnterBo; +import org.dromara.system.domain.vo.ActivityEnterVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityService.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityService.java index a79d157..7f5a72f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IActivityService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IActivityService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.vo.ActivityVo; -import org.dromara.scale.domain.bo.ActivityBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.ActivityBo; +import org.dromara.system.domain.vo.ActivityVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IArchiveService.java similarity index 70% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IArchiveService.java index 2c23402..c646715 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IArchiveService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.vo.ArchiveStatisticVo; -import org.dromara.scale.domain.vo.ArchiveVo; +import org.dromara.system.domain.vo.ArchiveStatisticVo; +import org.dromara.system.domain.vo.ArchiveVo; public interface IArchiveService { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorExperienceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorExperienceService.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorExperienceService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorExperienceService.java index 6b6befe..79c75d1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorExperienceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorExperienceService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.vo.CounselorExperienceVo; -import org.dromara.scale.domain.bo.CounselorExperienceBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.CounselorExperienceBo; +import org.dromara.system.domain.vo.CounselorExperienceVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorQualificationService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorQualificationService.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorQualificationService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorQualificationService.java index 6db286f..2a9c5fa 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorQualificationService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorQualificationService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.vo.CounselorQualificationVo; -import org.dromara.scale.domain.bo.CounselorQualificationBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.CounselorQualificationBo; +import org.dromara.system.domain.vo.CounselorQualificationVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorService.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorService.java index f905ff5..0c28610 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICounselorService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.CounselorBo; -import org.dromara.scale.domain.bo.QueryCounselorBo; -import org.dromara.scale.domain.vo.CounselorVo; +import org.dromara.system.domain.bo.CounselorBo; +import org.dromara.system.domain.bo.QueryCounselorBo; +import org.dromara.system.domain.vo.CounselorVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IEvaluationService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEvaluationService.java similarity index 69% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IEvaluationService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEvaluationService.java index dfe34ca..9849188 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IEvaluationService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IEvaluationService.java @@ -1,11 +1,11 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -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.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 java.util.List; import java.util.Map; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IMyService.java similarity index 66% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IMyService.java index 04ff867..0f81d0c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IMyService.java @@ -1,13 +1,13 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.ReservationOrderBo; -import org.dromara.scale.domain.bo.SysScaleBo; -import org.dromara.scale.domain.vo.ReservationOrderVo; -import org.dromara.scale.domain.vo.StatisticNumVo; -import org.dromara.scale.domain.vo.SysEvaluationRecordVo; -import org.dromara.scale.domain.vo.SysScaleVo; +import org.dromara.system.domain.bo.ReservationOrderBo; +import org.dromara.system.domain.bo.SysScaleBo; +import org.dromara.system.domain.vo.ReservationOrderVo; +import org.dromara.system.domain.vo.StatisticNumVo; +import org.dromara.system.domain.vo.SysEvaluationRecordVo; +import org.dromara.system.domain.vo.SysScaleVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationOrderService.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationOrderService.java index d6af4d9..5444c57 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationOrderService.java @@ -1,11 +1,11 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.ReservationOrderBo; -import org.dromara.scale.domain.vo.ReservationOrderVo; +import org.dromara.system.domain.bo.ReservationOrderBo; +import org.dromara.system.domain.vo.ReservationOrderVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationRefundService.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationRefundService.java index 1c1dcfd..4e0d2e3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationRefundService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.ReservationRefundBo; -import org.dromara.scale.domain.vo.ReservationRefundVo; +import org.dromara.system.domain.bo.ReservationRefundBo; +import org.dromara.system.domain.vo.ReservationRefundVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationService.java similarity index 78% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationService.java index 6ec21f6..ae99fca 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IReservationService.java @@ -1,12 +1,12 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.ReservationDayBo; -import org.dromara.scale.domain.bo.SysInterveneRecordBo; -import org.dromara.scale.domain.vo.ReservationDateVo; -import org.dromara.scale.domain.vo.ReservationOrderListVo; -import org.dromara.scale.domain.vo.ReservationDayVo; +import org.dromara.system.domain.bo.ReservationDayBo; +import org.dromara.system.domain.bo.SysInterveneRecordBo; +import org.dromara.system.domain.vo.ReservationDateVo; +import org.dromara.system.domain.vo.ReservationDayVo; +import org.dromara.system.domain.vo.ReservationOrderListVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IScoreRecordService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IScoreRecordService.java similarity index 87% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IScoreRecordService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IScoreRecordService.java index 2b64abf..3c3fdc3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IScoreRecordService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IScoreRecordService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.ScoreRecordBo; -import org.dromara.scale.domain.vo.ScoreRecordVo; +import org.dromara.system.domain.bo.ScoreRecordBo; +import org.dromara.system.domain.vo.ScoreRecordVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStatisticService.java similarity index 77% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStatisticService.java index e551ae6..93bc7dd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStatisticService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -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.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 java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationAnswerService.java similarity index 78% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationAnswerService.java index b085f8d..4eee87f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationAnswerService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; -import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; +import org.dromara.system.domain.bo.SysEvaluationAnswerBo; +import org.dromara.system.domain.vo.SysEvaluationAnswerVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationConclusionService.java similarity index 63% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationConclusionService.java index 19a1cf4..fa8f314 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationConclusionService.java @@ -1,7 +1,7 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; -import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; +import org.dromara.system.domain.bo.SysEvaluationConclusionBo; +import org.dromara.system.domain.vo.SysEvaluationConclusionVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationRecordService.java similarity index 77% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationRecordService.java index b49b0e7..93695a7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysEvaluationRecordService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.BaseQueryBo; -import org.dromara.scale.domain.bo.SysEvaluationRecordBo; -import org.dromara.scale.domain.vo.SysEvaluationRecordVo; +import org.dromara.system.domain.bo.BaseQueryBo; +import org.dromara.system.domain.bo.SysEvaluationRecordBo; +import org.dromara.system.domain.vo.SysEvaluationRecordVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysInterveneRecordService.java similarity index 81% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysInterveneRecordService.java index f0424f1..65aece6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysInterveneRecordService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysInterveneRecordBo; -import org.dromara.scale.domain.vo.SysInterveneRecordVo; -import org.dromara.scale.domain.vo.TimeAxisVo; +import org.dromara.system.domain.bo.SysInterveneRecordBo; +import org.dromara.system.domain.vo.SysInterveneRecordVo; +import org.dromara.system.domain.vo.TimeAxisVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleAnswerService.java similarity index 72% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleAnswerService.java index 6fcbac8..5b52afe 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleAnswerService.java @@ -1,7 +1,7 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.vo.QuestionAnswerVo; -import org.dromara.scale.domain.vo.SysScaleAnswerVo; +import org.dromara.system.domain.vo.QuestionAnswerVo; +import org.dromara.system.domain.vo.SysScaleAnswerVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorRangeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorRangeService.java similarity index 70% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorRangeService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorRangeService.java index 3c01158..c1414a6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorRangeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorRangeService.java @@ -1,7 +1,7 @@ -package org.dromara.scale.service; +package org.dromara.system.service; -import org.dromara.scale.domain.bo.SysScaleFactorRangeBo; -import org.dromara.scale.domain.vo.SysScaleFactorRangeVo; +import org.dromara.system.domain.bo.SysScaleFactorRangeBo; +import org.dromara.system.domain.vo.SysScaleFactorRangeVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorService.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorService.java index 82f14e8..9346aa5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleFactorService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleFactorService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysScaleFactorBo; -import org.dromara.scale.domain.vo.SysScaleFactorVo; +import org.dromara.system.domain.bo.SysScaleFactorBo; +import org.dromara.system.domain.vo.SysScaleFactorVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleOrderService.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleOrderService.java index 48bf73d..5ad3502 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleOrderService.java @@ -1,11 +1,11 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysScaleOrderBo; -import org.dromara.scale.domain.vo.SysScaleOrderVo; +import org.dromara.system.domain.bo.SysScaleOrderBo; +import org.dromara.system.domain.vo.SysScaleOrderVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java index ba71f63..ebba2be 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java @@ -1,9 +1,9 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysScalePackageBo; -import org.dromara.scale.domain.vo.SysScalePackageVo; +import org.dromara.system.domain.bo.SysScalePackageBo; +import org.dromara.system.domain.vo.SysScalePackageVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePublishService.java similarity index 81% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePublishService.java index 98763e6..18cac76 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePublishService.java @@ -1,11 +1,11 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -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.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 java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleQuestionService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleQuestionService.java similarity index 84% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleQuestionService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleQuestionService.java index efc2351..c09c274 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleQuestionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleQuestionService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.bo.SysScaleQuestionBo; -import org.dromara.scale.domain.vo.SysScaleFactorVo; -import org.dromara.scale.domain.vo.SysScaleQuestionVo; +import org.dromara.system.domain.bo.SysScaleQuestionBo; +import org.dromara.system.domain.vo.SysScaleFactorVo; +import org.dromara.system.domain.vo.SysScaleQuestionVo; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleService.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleService.java index 48f0b36..63c90c3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScaleService.java @@ -1,10 +1,10 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.bo.SysScaleBo; -import org.dromara.scale.domain.vo.SysScaleVo; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.bo.SysScaleBo; +import org.dromara.system.domain.vo.SysScaleVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysWarnRecordService.java similarity index 72% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysWarnRecordService.java index dba512f..958cf8e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysWarnRecordService.java @@ -1,13 +1,13 @@ -package org.dromara.scale.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.SysWarnRecord; -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.system.domain.SysWarnRecord; +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 java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityEnterServiceImpl.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityEnterServiceImpl.java index 1e8fe1d..7274cb1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityEnterServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -10,11 +10,11 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.domain.ActivityEnter; -import org.dromara.scale.domain.bo.ActivityEnterBo; -import org.dromara.scale.domain.vo.ActivityEnterVo; -import org.dromara.scale.mapper.ActivityEnterMapper; -import org.dromara.scale.service.IActivityEnterService; +import org.dromara.system.domain.ActivityEnter; +import org.dromara.system.domain.bo.ActivityEnterBo; +import org.dromara.system.domain.vo.ActivityEnterVo; +import org.dromara.system.mapper.ActivityEnterMapper; +import org.dromara.system.service.IActivityEnterService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java index 2e4a52c..e3ab86b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java @@ -1,26 +1,26 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +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.satoken.utils.LoginHelper; -import org.dromara.scale.domain.ActivityEnter; -import org.dromara.scale.mapper.ActivityEnterMapper; +import org.dromara.system.domain.Activity; +import org.dromara.system.domain.ActivityEnter; +import org.dromara.system.domain.bo.ActivityBo; +import org.dromara.system.domain.vo.ActivityVo; +import org.dromara.system.mapper.ActivityEnterMapper; +import org.dromara.system.mapper.ActivityMapper; +import org.dromara.system.service.IActivityService; import org.springframework.stereotype.Service; -import org.dromara.scale.domain.bo.ActivityBo; -import org.dromara.scale.domain.vo.ActivityVo; -import org.dromara.scale.domain.Activity; -import org.dromara.scale.mapper.ActivityMapper; -import org.dromara.scale.service.IActivityService; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 活动Service业务层处理 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ArchiveServiceImpl.java similarity index 84% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ArchiveServiceImpl.java index 6753a36..c89dda0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ArchiveServiceImpl.java @@ -1,13 +1,13 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.vo.ArchiveStatisticVo; -import org.dromara.scale.domain.vo.ArchiveVo; -import org.dromara.scale.mapper.ArchiveMapper; -import org.dromara.scale.service.IArchiveService; +import org.dromara.system.domain.vo.ArchiveStatisticVo; +import org.dromara.system.domain.vo.ArchiveVo; +import org.dromara.system.mapper.ArchiveMapper; +import org.dromara.system.service.IArchiveService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorExperienceServiceImpl.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorExperienceServiceImpl.java index 54e9993..599eac2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorExperienceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,11 +7,11 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.CounselorExperience; -import org.dromara.scale.domain.bo.CounselorExperienceBo; -import org.dromara.scale.domain.vo.CounselorExperienceVo; -import org.dromara.scale.mapper.CounselorExperienceMapper; -import org.dromara.scale.service.ICounselorExperienceService; +import org.dromara.system.domain.CounselorExperience; +import org.dromara.system.domain.bo.CounselorExperienceBo; +import org.dromara.system.domain.vo.CounselorExperienceVo; +import org.dromara.system.mapper.CounselorExperienceMapper; +import org.dromara.system.service.ICounselorExperienceService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorQualificationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorQualificationServiceImpl.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorQualificationServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorQualificationServiceImpl.java index 055e9ef..f2084d1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorQualificationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorQualificationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,11 +7,11 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.CounselorQualification; -import org.dromara.scale.domain.bo.CounselorQualificationBo; -import org.dromara.scale.domain.vo.CounselorQualificationVo; -import org.dromara.scale.mapper.CounselorQualificationMapper; -import org.dromara.scale.service.ICounselorQualificationService; +import org.dromara.system.domain.CounselorQualification; +import org.dromara.system.domain.bo.CounselorQualificationBo; +import org.dromara.system.domain.vo.CounselorQualificationVo; +import org.dromara.system.mapper.CounselorQualificationMapper; +import org.dromara.system.service.ICounselorQualificationService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java similarity index 94% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java index 2fc2d84..e5c1ea3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.util.StrUtil; @@ -15,16 +15,16 @@ 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.satoken.utils.LoginHelper; -import org.dromara.scale.domain.Counselor; -import org.dromara.scale.domain.CounselorExperience; -import org.dromara.scale.domain.bo.CounselorBo; -import org.dromara.scale.domain.bo.QueryCounselorBo; -import org.dromara.scale.domain.vo.CounselorVo; -import org.dromara.scale.domain.vo.ScoreRateVo; -import org.dromara.scale.mapper.CounselorExperienceMapper; -import org.dromara.scale.mapper.CounselorMapper; -import org.dromara.scale.mapper.ScoreRecordMapper; -import org.dromara.scale.service.ICounselorService; +import org.dromara.system.domain.Counselor; +import org.dromara.system.domain.CounselorExperience; +import org.dromara.system.domain.bo.CounselorBo; +import org.dromara.system.domain.bo.QueryCounselorBo; +import org.dromara.system.domain.vo.CounselorVo; +import org.dromara.system.domain.vo.ScoreRateVo; +import org.dromara.system.mapper.CounselorExperienceMapper; +import org.dromara.system.mapper.CounselorMapper; +import org.dromara.system.mapper.ScoreRecordMapper; +import org.dromara.system.service.ICounselorService; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysUserService; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java similarity index 97% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java index bccc5ec..8d2534b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.util.ObjectUtil; @@ -13,16 +13,16 @@ 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.satoken.utils.LoginHelper; -import org.dromara.scale.constant.*; -import org.dromara.scale.domain.*; -import org.dromara.scale.domain.bo.SubmitAnswerBo; -import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; -import org.dromara.scale.domain.vo.*; -import org.dromara.scale.mapper.*; -import org.dromara.scale.service.IEvaluationService; -import org.dromara.scale.service.ISysScaleAnswerService; -import org.dromara.scale.service.ISysScaleFactorService; -import org.dromara.scale.service.ISysWarnRecordService; +import org.dromara.system.constant.*; +import org.dromara.system.domain.*; +import org.dromara.system.domain.bo.SubmitAnswerBo; +import org.dromara.system.domain.bo.SysEvaluationAnswerBo; +import org.dromara.system.domain.vo.*; +import org.dromara.system.mapper.*; +import org.dromara.system.service.IEvaluationService; +import org.dromara.system.service.ISysScaleAnswerService; +import org.dromara.system.service.ISysScaleFactorService; +import org.dromara.system.service.ISysWarnRecordService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/MyServiceImpl.java similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/MyServiceImpl.java index ebfb49d..dbc69ab 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/MyServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,20 +10,20 @@ import org.dromara.common.core.service.OssService; 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.scale.constant.StatusEnum; -import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.bo.ReservationOrderBo; -import org.dromara.scale.domain.bo.SysScaleBo; -import org.dromara.scale.domain.vo.ReservationOrderVo; -import org.dromara.scale.domain.vo.StatisticNumVo; -import org.dromara.scale.domain.vo.SysEvaluationRecordVo; -import org.dromara.scale.domain.vo.SysScaleVo; -import org.dromara.scale.mapper.ReservationOrderMapper; -import org.dromara.scale.mapper.SysEvaluationRecordMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.service.IMyService; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.ReservationOrder; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.bo.ReservationOrderBo; +import org.dromara.system.domain.bo.SysScaleBo; +import org.dromara.system.domain.vo.ReservationOrderVo; +import org.dromara.system.domain.vo.StatisticNumVo; +import org.dromara.system.domain.vo.SysEvaluationRecordVo; +import org.dromara.system.domain.vo.SysScaleVo; +import org.dromara.system.mapper.ReservationOrderMapper; +import org.dromara.system.mapper.SysEvaluationRecordMapper; +import org.dromara.system.mapper.SysScaleMapper; +import org.dromara.system.service.IMyService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java index 97693b6..ff8a273 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -13,16 +13,16 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.constant.StatusEnum; -import org.dromara.scale.domain.Counselor; -import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.ReservationTime; -import org.dromara.scale.domain.bo.ReservationOrderBo; -import org.dromara.scale.domain.vo.ReservationOrderVo; -import org.dromara.scale.mapper.CounselorMapper; -import org.dromara.scale.mapper.ReservationOrderMapper; -import org.dromara.scale.mapper.ReservationTimeMapper; -import org.dromara.scale.service.IReservationOrderService; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.Counselor; +import org.dromara.system.domain.ReservationOrder; +import org.dromara.system.domain.ReservationTime; +import org.dromara.system.domain.bo.ReservationOrderBo; +import org.dromara.system.domain.vo.ReservationOrderVo; +import org.dromara.system.mapper.CounselorMapper; +import org.dromara.system.mapper.ReservationOrderMapper; +import org.dromara.system.mapper.ReservationTimeMapper; +import org.dromara.system.service.IReservationOrderService; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationRefundServiceImpl.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationRefundServiceImpl.java index 8c4de0b..e5c79b0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationRefundServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -15,13 +15,13 @@ 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.satoken.utils.LoginHelper; -import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.ReservationRefund; -import org.dromara.scale.domain.bo.ReservationRefundBo; -import org.dromara.scale.domain.vo.ReservationRefundVo; -import org.dromara.scale.mapper.ReservationOrderMapper; -import org.dromara.scale.mapper.ReservationRefundMapper; -import org.dromara.scale.service.IReservationRefundService; +import org.dromara.system.domain.ReservationOrder; +import org.dromara.system.domain.ReservationRefund; +import org.dromara.system.domain.bo.ReservationRefundBo; +import org.dromara.system.domain.vo.ReservationRefundVo; +import org.dromara.system.mapper.ReservationOrderMapper; +import org.dromara.system.mapper.ReservationRefundMapper; +import org.dromara.system.service.IReservationRefundService; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationServiceImpl.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationServiceImpl.java index 9b0fdb0..9e707db 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,18 +10,18 @@ import org.dromara.common.core.utils.TimeBucket; 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.scale.domain.ReservationDay; -import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.ReservationTime; -import org.dromara.scale.domain.bo.ReservationDayBo; -import org.dromara.scale.domain.bo.SysInterveneRecordBo; -import org.dromara.scale.domain.vo.ReservationOrderListVo; -import org.dromara.scale.domain.vo.ReservationDateVo; -import org.dromara.scale.domain.vo.ReservationDayVo; -import org.dromara.scale.mapper.ReservationDayMapper; -import org.dromara.scale.mapper.ReservationOrderMapper; -import org.dromara.scale.mapper.ReservationTimeMapper; -import org.dromara.scale.service.IReservationService; +import org.dromara.system.domain.ReservationDay; +import org.dromara.system.domain.ReservationOrder; +import org.dromara.system.domain.ReservationTime; +import org.dromara.system.domain.bo.ReservationDayBo; +import org.dromara.system.domain.bo.SysInterveneRecordBo; +import org.dromara.system.domain.vo.ReservationDateVo; +import org.dromara.system.domain.vo.ReservationDayVo; +import org.dromara.system.domain.vo.ReservationOrderListVo; +import org.dromara.system.mapper.ReservationDayMapper; +import org.dromara.system.mapper.ReservationOrderMapper; +import org.dromara.system.mapper.ReservationTimeMapper; +import org.dromara.system.service.IReservationService; import org.springframework.stereotype.Service; import java.util.Date; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ScoreRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ScoreRecordServiceImpl.java similarity index 90% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ScoreRecordServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ScoreRecordServiceImpl.java index abdd0f9..cf46fcd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ScoreRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ScoreRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,11 +7,11 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.ScoreRecord; -import org.dromara.scale.domain.bo.ScoreRecordBo; -import org.dromara.scale.domain.vo.ScoreRecordVo; -import org.dromara.scale.mapper.ScoreRecordMapper; -import org.dromara.scale.service.IScoreRecordService; +import org.dromara.system.domain.ScoreRecord; +import org.dromara.system.domain.bo.ScoreRecordBo; +import org.dromara.system.domain.vo.ScoreRecordVo; +import org.dromara.system.mapper.ScoreRecordMapper; +import org.dromara.system.service.IScoreRecordService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticServiceImpl.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticServiceImpl.java index 6452763..4092c75 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StatisticServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; -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.mapper.StatisticMapper; -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.mapper.StatisticMapper; +import org.dromara.system.service.IStatisticService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationAnswerServiceImpl.java similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationAnswerServiceImpl.java index 9bac0d2..889a301 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationAnswerServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.SysEvaluationAnswer; -import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; -import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; -import org.dromara.scale.mapper.SysEvaluationAnswerMapper; -import org.dromara.scale.service.ISysEvaluationAnswerService; +import org.dromara.system.domain.SysEvaluationAnswer; +import org.dromara.system.domain.bo.SysEvaluationAnswerBo; +import org.dromara.system.domain.vo.SysEvaluationAnswerVo; +import org.dromara.system.mapper.SysEvaluationAnswerMapper; +import org.dromara.system.service.ISysEvaluationAnswerService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationConclusionServiceImpl.java similarity index 80% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationConclusionServiceImpl.java index 19ccf9d..f394d58 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationConclusionServiceImpl.java @@ -1,13 +1,13 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.scale.domain.SysEvaluationConclusion; -import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; -import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; -import org.dromara.scale.mapper.SysEvaluationConclusionMapper; -import org.dromara.scale.service.ISysEvaluationConclusionService; +import org.dromara.system.domain.SysEvaluationConclusion; +import org.dromara.system.domain.bo.SysEvaluationConclusionBo; +import org.dromara.system.domain.vo.SysEvaluationConclusionVo; +import org.dromara.system.mapper.SysEvaluationConclusionMapper; +import org.dromara.system.service.ISysEvaluationConclusionService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationRecordServiceImpl.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationRecordServiceImpl.java index 6fd3a59..b16afd9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysEvaluationRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.http.HtmlUtil; @@ -17,22 +17,22 @@ import org.dromara.common.core.utils.DateUtils; 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.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.SysScale; -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.domain.vo.SysScaleVo; -import org.dromara.scale.domain.word.EvaluationRecordWordData; -import org.dromara.scale.domain.word.WordEvaluationFactor; -import org.dromara.scale.domain.word.WordFactor; -import org.dromara.scale.domain.word.WordRadar; -import org.dromara.scale.mapper.SysEvaluationRecordMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.service.ISysEvaluationRecordService; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.SysScale; +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.domain.vo.SysScaleVo; import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.domain.word.EvaluationRecordWordData; +import org.dromara.system.domain.word.WordEvaluationFactor; +import org.dromara.system.domain.word.WordFactor; +import org.dromara.system.domain.word.WordRadar; +import org.dromara.system.mapper.SysEvaluationRecordMapper; +import org.dromara.system.mapper.SysScaleMapper; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysEvaluationRecordService; import org.springframework.stereotype.Service; import java.io.File; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysInterveneRecordServiceImpl.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysInterveneRecordServiceImpl.java index 2dcb3ef..47ca5ee 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysInterveneRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,16 +7,16 @@ import lombok.RequiredArgsConstructor; 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.scale.domain.SysInterveneRecord; -import org.dromara.scale.domain.SysScalePublish; -import org.dromara.scale.domain.SysWarnRecord; -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.mapper.SysInterveneRecordMapper; -import org.dromara.scale.mapper.SysScalePublishMapper; -import org.dromara.scale.mapper.SysWarnRecordMapper; -import org.dromara.scale.service.ISysInterveneRecordService; +import org.dromara.system.domain.SysInterveneRecord; +import org.dromara.system.domain.SysScalePublish; +import org.dromara.system.domain.SysWarnRecord; +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.mapper.SysInterveneRecordMapper; +import org.dromara.system.mapper.SysScalePublishMapper; +import org.dromara.system.mapper.SysWarnRecordMapper; +import org.dromara.system.service.ISysInterveneRecordService; import org.dromara.system.mapper.SysUserMapper; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleAnswerServiceImpl.java similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleAnswerServiceImpl.java index b7def32..b7f7dfd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleAnswerServiceImpl.java @@ -1,17 +1,17 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; -import org.dromara.scale.domain.SysScaleAnswer; -import org.dromara.scale.domain.SysScaleQuestion; -import org.dromara.scale.domain.vo.QuestionAnswerVo; -import org.dromara.scale.domain.vo.SysScaleAnswerVo; -import org.dromara.scale.domain.vo.SysScaleQuestionVo; -import org.dromara.scale.mapper.SysScaleAnswerMapper; -import org.dromara.scale.mapper.SysScaleQuestionMapper; -import org.dromara.scale.service.ISysScaleAnswerService; +import org.dromara.system.domain.SysScaleAnswer; +import org.dromara.system.domain.SysScaleQuestion; +import org.dromara.system.domain.vo.QuestionAnswerVo; +import org.dromara.system.domain.vo.SysScaleAnswerVo; +import org.dromara.system.domain.vo.SysScaleQuestionVo; +import org.dromara.system.mapper.SysScaleAnswerMapper; +import org.dromara.system.mapper.SysScaleQuestionMapper; +import org.dromara.system.service.ISysScaleAnswerService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorRangeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorRangeServiceImpl.java similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorRangeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorRangeServiceImpl.java index 666ff3d..bc818e6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorRangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorRangeServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; -import org.dromara.scale.domain.SysScaleFactorRange; -import org.dromara.scale.domain.bo.SysScaleFactorRangeBo; -import org.dromara.scale.domain.vo.SysScaleFactorRangeVo; -import org.dromara.scale.mapper.SysScaleFactorRangeMapper; -import org.dromara.scale.service.ISysScaleFactorRangeService; +import org.dromara.system.domain.SysScaleFactorRange; +import org.dromara.system.domain.bo.SysScaleFactorRangeBo; +import org.dromara.system.domain.vo.SysScaleFactorRangeVo; +import org.dromara.system.mapper.SysScaleFactorRangeMapper; +import org.dromara.system.service.ISysScaleFactorRangeService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorServiceImpl.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorServiceImpl.java index c991648..db72bfa 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleFactorServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,17 +12,17 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.constant.ScoreRuleTypeEnum; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.SysScaleFactor; -import org.dromara.scale.domain.SysScaleFactorRange; -import org.dromara.scale.domain.bo.SysScaleFactorBo; -import org.dromara.scale.domain.vo.SysScaleFactorRangeVo; -import org.dromara.scale.domain.vo.SysScaleFactorVo; -import org.dromara.scale.mapper.SysScaleFactorMapper; -import org.dromara.scale.mapper.SysScaleFactorRangeMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.service.ISysScaleFactorService; +import org.dromara.system.constant.ScoreRuleTypeEnum; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.SysScaleFactor; +import org.dromara.system.domain.SysScaleFactorRange; +import org.dromara.system.domain.bo.SysScaleFactorBo; +import org.dromara.system.domain.vo.SysScaleFactorRangeVo; +import org.dromara.system.domain.vo.SysScaleFactorVo; +import org.dromara.system.mapper.SysScaleFactorMapper; +import org.dromara.system.mapper.SysScaleFactorRangeMapper; +import org.dromara.system.mapper.SysScaleMapper; +import org.dromara.system.service.ISysScaleFactorService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java index 39fa6dd..306d140 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -13,16 +13,16 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.constant.StatusEnum; -import org.dromara.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.SysScaleOrder; -import org.dromara.scale.domain.bo.SysScaleOrderBo; -import org.dromara.scale.domain.vo.SysScaleOrderVo; -import org.dromara.scale.mapper.SysEvaluationRecordMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.mapper.SysScaleOrderMapper; -import org.dromara.scale.service.ISysScaleOrderService; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.SysScaleOrder; +import org.dromara.system.domain.bo.SysScaleOrderBo; +import org.dromara.system.domain.vo.SysScaleOrderVo; +import org.dromara.system.mapper.SysEvaluationRecordMapper; +import org.dromara.system.mapper.SysScaleMapper; +import org.dromara.system.mapper.SysScaleOrderMapper; +import org.dromara.system.service.ISysScaleOrderService; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java similarity index 84% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java index 8e474ac..480613c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,13 +11,12 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.domain.SysScalePackage; -import org.dromara.scale.domain.bo.SysScalePackageBo; -import org.dromara.scale.domain.vo.SysScalePackageVo; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.mapper.SysScalePackageMapper; -import org.dromara.scale.service.ISysScalePackageService; +import org.dromara.system.service.ISysScalePackageService; +import org.dromara.system.domain.SysScalePackage; import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.bo.SysScalePackageBo; +import org.dromara.system.domain.vo.SysScalePackageVo; +import org.dromara.system.mapper.SysScalePackageMapper; import org.dromara.system.mapper.SysTenantMapper; import org.springframework.stereotype.Service; @@ -37,7 +36,6 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService { private final SysScalePackageMapper baseMapper; private final SysTenantMapper tenantMapper; - private final SysScaleMapper scaleMapper; /** * 查询量表套餐 @@ -47,14 +45,6 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService { */ @Override public SysScalePackageVo queryById(Long packageId) { -// SysScalePackage scalePackage = baseMapper.selectById(packageId); -// SysScalePackageDetailVo detailVo = MapstructUtils.convert(scalePackage, SysScalePackageDetailVo.class); -// List split = StrUtil.split(scalePackage.getScaleIds(), ","); -// List sysScales = scaleMapper.selectList(new LambdaQueryWrapper() -// .select(SysScale::getScaleId, SysScale::getScaleName) -// .in(SysScale::getScaleId, split)); -// detailVo.setScaleDetail(sysScales); -// return detailVo; return baseMapper.selectVoById(packageId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePublishServiceImpl.java similarity index 96% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePublishServiceImpl.java index 71e1a03..c6a8102 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePublishServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; @@ -21,24 +21,19 @@ 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.redis.utils.QueueUtils; -import org.dromara.scale.constant.StatusEnum; -import org.dromara.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.SysScalePublish; -import org.dromara.scale.domain.bo.BaseQueryBo; -import org.dromara.scale.domain.bo.SysScalePublishBo; -import org.dromara.scale.domain.vo.*; -import org.dromara.scale.domain.word.PublishRecordWordData; -import org.dromara.scale.domain.word.WordClass; -import org.dromara.scale.domain.word.WordWarn; -import org.dromara.scale.mapper.SysEvaluationRecordMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.mapper.SysScalePublishMapper; -import org.dromara.scale.service.ISysScalePublishService; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.SysScalePublish; import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.domain.bo.BaseQueryBo; +import org.dromara.system.domain.bo.SysScalePublishBo; +import org.dromara.system.domain.vo.*; +import org.dromara.system.domain.word.PublishRecordWordData; +import org.dromara.system.domain.word.WordClass; +import org.dromara.system.domain.word.WordWarn; +import org.dromara.system.mapper.*; import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysScalePublishService; import org.springframework.stereotype.Service; import java.io.File; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleQuestionServiceImpl.java similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleQuestionServiceImpl.java index 2dfc4d7..19bdb9e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,15 +11,18 @@ import org.dromara.common.core.utils.MapstructUtils; 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.scale.domain.SysScale; -import org.dromara.scale.domain.SysScaleAnswer; -import org.dromara.scale.domain.SysScaleQuestion; -import org.dromara.scale.domain.bo.SysScaleQuestionBo; -import org.dromara.scale.domain.vo.SysScaleAnswerVo; -import org.dromara.scale.domain.vo.SysScaleFactorVo; -import org.dromara.scale.domain.vo.SysScaleQuestionVo; -import org.dromara.scale.mapper.*; -import org.dromara.scale.service.ISysScaleQuestionService; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.SysScaleAnswer; +import org.dromara.system.domain.SysScaleQuestion; +import org.dromara.system.domain.bo.SysScaleQuestionBo; +import org.dromara.system.domain.vo.SysScaleAnswerVo; +import org.dromara.system.domain.vo.SysScaleFactorVo; +import org.dromara.system.domain.vo.SysScaleQuestionVo; +import org.dromara.system.mapper.SysEvaluationRecordMapper; +import org.dromara.system.mapper.SysScaleAnswerMapper; +import org.dromara.system.mapper.SysScaleMapper; +import org.dromara.system.mapper.SysScaleQuestionMapper; +import org.dromara.system.service.ISysScaleQuestionService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Caching; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleServiceImpl.java similarity index 93% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleServiceImpl.java index 7465db4..ffffa1b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -12,16 +12,16 @@ 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.satoken.utils.LoginHelper; -import org.dromara.scale.constant.StatusEnum; -import org.dromara.scale.domain.ScoreRecord; -import org.dromara.scale.domain.SysEvaluationRecord; -import org.dromara.scale.domain.SysScale; -import org.dromara.scale.domain.bo.SysScaleBo; -import org.dromara.scale.domain.vo.SysScaleVo; -import org.dromara.scale.mapper.ScoreRecordMapper; -import org.dromara.scale.mapper.SysEvaluationRecordMapper; -import org.dromara.scale.mapper.SysScaleMapper; -import org.dromara.scale.service.ISysScaleService; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.ScoreRecord; +import org.dromara.system.domain.SysEvaluationRecord; +import org.dromara.system.domain.SysScale; +import org.dromara.system.domain.bo.SysScaleBo; +import org.dromara.system.domain.vo.SysScaleVo; +import org.dromara.system.mapper.ScoreRecordMapper; +import org.dromara.system.mapper.SysEvaluationRecordMapper; +import org.dromara.system.mapper.SysScaleMapper; +import org.dromara.system.service.ISysScaleService; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 0e95fba..759e281 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -27,10 +28,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 租户Service业务层处理 @@ -43,6 +41,7 @@ public class SysTenantServiceImpl implements ISysTenantService { private final SysTenantMapper baseMapper; private final SysTenantPackageMapper tenantPackageMapper; + private final SysScalePackageMapper scalePackageMapper; private final SysUserMapper userMapper; private final SysDeptMapper deptMapper; private final SysRoleMapper roleMapper; @@ -53,6 +52,13 @@ public class SysTenantServiceImpl implements ISysTenantService { private final SysDictDataMapper dictDataMapper; private final SysConfigMapper configMapper; + private final SysScaleMapper scaleMapper; + private final SysScaleQuestionMapper questionMapper; + private final SysScaleAnswerMapper answerMapper; + private final SysScaleFactorMapper factorMapper; + private final SysScaleFactorRangeMapper rangeMapper; + private final IdentifierGenerator identifierGenerator; + /** * 查询租户 */ @@ -212,15 +218,15 @@ public class SysTenantServiceImpl implements ISysTenantService { /** * 根据租户菜单创建租户角色 * - * @param tenantId 租户编号 - * @param packageId 租户套餐id + * @param tenantId 租户编号 + * @param tenantPackageId 租户套餐id * @return 角色id */ - private Long createTenantRole(String tenantId, Long packageId) { + private Long createTenantRole(String tenantId, Long tenantPackageId) { // 获取租户套餐 - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(tenantPackageId); if (ObjectUtil.isNull(tenantPackage)) { - throw new ServiceException("套餐不存在"); + throw new ServiceException("租户套餐不存在"); } // 获取套餐菜单id List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); @@ -248,6 +254,104 @@ public class SysTenantServiceImpl implements ISysTenantService { return roleId; } + /** + * 根据租户菜单创建租户角色 + * + * @param tenantId 租户编号 + * @param scalePackageId 租户套餐id + * @return 角色id + */ + private void createTenantScale(String tenantId, Long scalePackageId) { + // 获取租户套餐 + SysScalePackage scalePackage = scalePackageMapper.selectById(scalePackageId); + if (ObjectUtil.isNull(scalePackage)) { + throw new ServiceException("量表套餐不存在"); + } + // 获取免费量表id + List scaleIds = StringUtils.splitTo(scalePackage.getScaleIds(), Convert::toLong); + //新增量表 + List allScaleList = scaleMapper.selectList(new LambdaQueryWrapper() + .eq(SysScale::getTenantId, TenantConstants.DEFAULT_TENANT_ID)); + //处理问题和因子 + List allQuestionList = new ArrayList<>(); + List allAnswerList = new ArrayList<>(); + List allFactorList = new ArrayList<>(); + List allRangeList = new ArrayList<>(); + for (SysScale sysScale : allScaleList) { + Long oldScaleId = sysScale.getScaleId(); + Long newScaleId = identifierGenerator.nextId(SysScale.class).longValue(); + sysScale.setScaleId(newScaleId); + sysScale.setTenantId(tenantId); + sysScale.setPublishNums(0); + if (scaleIds.contains(sysScale.getScaleId())) { + sysScale.setFreeFlag(1); + } + Map questionIdMap = new HashMap<>(); + //处理问题列表 + List questionList = questionMapper.selectList(new LambdaQueryWrapper() + .eq(SysScaleQuestion::getTenantId, TenantConstants.DEFAULT_TENANT_ID) + .eq(SysScaleQuestion::getScaleId, oldScaleId)); + for (SysScaleQuestion question : questionList) { + Long oldQuestionId = question.getQuestionId(); + Long newQuestionId = identifierGenerator.nextId(SysScaleQuestion.class).longValue(); + questionIdMap.put(oldQuestionId, newQuestionId); + question.setQuestionId(newQuestionId); + question.setTenantId(tenantId); + question.setScaleId(newScaleId); + //回答 + List answerList = answerMapper.selectList(new LambdaQueryWrapper() + .eq(SysScaleAnswer::getTenantId, TenantConstants.DEFAULT_TENANT_ID) + .eq(SysScaleAnswer::getScaleId, oldScaleId) + .eq(SysScaleAnswer::getAnswerId, oldQuestionId)); + for (SysScaleAnswer answer : answerList) { + Long newAnswerId = identifierGenerator.nextId(SysScaleAnswer.class).longValue(); + answer.setAnswerId(newAnswerId); + answer.setTenantId(tenantId); + answer.setScaleId(newScaleId); + answer.setQuestionId(newQuestionId); + } + allAnswerList.addAll(answerList); + } + allQuestionList.addAll(questionList); + //处理因子列表 + List factorList = factorMapper.selectList(new LambdaQueryWrapper() + .eq(SysScaleFactor::getTenantId, TenantConstants.DEFAULT_TENANT_ID) + .eq(SysScaleFactor::getScaleId, oldScaleId)); + for (SysScaleFactor factor : factorList) { + Long oldFactorId = factor.getFactorId(); + Long newFactorId = identifierGenerator.nextId(SysScaleFactor.class).longValue(); + factor.setFactorId(newFactorId); + factor.setTenantId(tenantId); + factor.setScaleId(newScaleId); + List oldQuestionIds = StringUtils.splitTo(factor.getQuestionIds(), Convert::toLong); + List newQuestionIds = new ArrayList<>(oldQuestionIds.size()); + for (Long questionId : oldQuestionIds) { + newQuestionIds.add(questionIdMap.get(questionId)); + } + factor.setQuestionIds(StringUtils.join(newQuestionIds, ",")); + //因子范围 + List rangeList = rangeMapper.selectList(new LambdaQueryWrapper() + .eq(SysScaleFactorRange::getTenantId, TenantConstants.DEFAULT_TENANT_ID) + .eq(SysScaleFactorRange::getScaleId, oldScaleId) + .eq(SysScaleFactorRange::getFactorId, oldFactorId)); + for (SysScaleFactorRange range : rangeList) { + Long newRangeId = identifierGenerator.nextId(SysScaleFactorRange.class).longValue(); + range.setRangeId(newRangeId); + range.setTenantId(tenantId); + range.setScaleId(newScaleId); + range.setFactorId(newFactorId); + } + allRangeList.addAll(rangeList); + } + allFactorList.addAll(factorList); + } + scaleMapper.insertBatch(allScaleList, 200); + questionMapper.insertBatch(allQuestionList, 200); + answerMapper.insertBatch(allAnswerList, 200); + factorMapper.insertBatch(allFactorList, 200); + rangeMapper.insertBatch(allRangeList, 200); + } + /** * 修改租户 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysWarnRecordServiceImpl.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysWarnRecordServiceImpl.java index c5f2b86..93453b4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysWarnRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.scale.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,14 +8,14 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.scale.domain.SysWarnRecord; -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.mapper.SysWarnRecordMapper; -import org.dromara.scale.service.ISysWarnRecordService; +import org.dromara.system.domain.SysWarnRecord; +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.mapper.SysWarnRecordMapper; +import org.dromara.system.service.ISysWarnRecordService; import org.dromara.system.mapper.SysUserMapper; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/starter/ApplicationStarter.java similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/starter/ApplicationStarter.java index 83ba01b..7093c6a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/starter/ApplicationStarter.java @@ -1,11 +1,11 @@ -package org.dromara.scale.starter; +package org.dromara.system.starter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.redis.utils.QueueUtils; -import org.dromara.scale.constant.StatusEnum; -import org.dromara.scale.domain.SysScalePublish; -import org.dromara.scale.mapper.SysScalePublishMapper; +import org.dromara.system.constant.StatusEnum; +import org.dromara.system.domain.SysScalePublish; +import org.dromara.system.mapper.SysScalePublishMapper; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/utils/AsposeUtil.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/utils/AsposeUtil.java similarity index 95% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/utils/AsposeUtil.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/utils/AsposeUtil.java index 2c0905d..9883046 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/utils/AsposeUtil.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/utils/AsposeUtil.java @@ -1,4 +1,4 @@ -package org.dromara.scale.utils; +package org.dromara.system.utils; import com.aspose.words.Document; import com.aspose.words.SaveFormat; diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityEnterMapper.xml similarity index 81% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityEnterMapper.xml index 950d9c7..efef87b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityEnterMapper.xml @@ -2,7 +2,7 @@ - + update m_activity set enter_nums = enter_nums + 1 where id = #{activityId} diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityMapper.xml similarity index 82% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityMapper.xml index aa2d4b7..c4678ec 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ActivityMapper.xml @@ -2,7 +2,7 @@ - + update m_activity set view_nums = view_nums + 1 diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ArchiveMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml similarity index 89% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ArchiveMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml index 35a0f2f..d4525a1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ArchiveMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml @@ -2,9 +2,9 @@ - + - select u.user_id, u.nick_name, u.dept_id, @@ -24,7 +24,7 @@ - select sp.batch_no, sp.session_name, s.scale_id, diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorExperienceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorExperienceMapper.xml similarity index 68% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorExperienceMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorExperienceMapper.xml index c8d67b6..a3564a9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorExperienceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorExperienceMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorMapper.xml similarity index 71% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorMapper.xml index fd1205c..57a9b97 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorQualificationMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorQualificationMapper.xml similarity index 67% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorQualificationMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorQualificationMapper.xml index 67e1e24..ba59527 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/CounselorQualificationMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CounselorQualificationMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationDayMapper.xml similarity index 85% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationDayMapper.xml index 367aa40..ccf34cb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationDayMapper.xml @@ -2,8 +2,8 @@ - - select rd.id as dayId, DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime, ifnull(t.num, 0) as useNum from m_reservation_day rd left join (select count(*) as num, day_id @@ -15,7 +15,7 @@ and DATE_FORMAT(rd.day_time, '%Y-%m') = #{time} - select rd.id as dayId, DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime, ifnull(t.num, 0) as notUseNum from m_reservation_day rd left join (select count(*) as num, day_id @@ -28,7 +28,7 @@ and DATE_FORMAT(rd.day_time, '%Y-%m-%d') >= #{day} - select u.nick_name as name, rt.id as timeId, ro.id as orderId, diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationOrderMapper.xml similarity index 72% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationOrderMapper.xml index d36b8ea..5e52af4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationOrderMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationRefundMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationRefundMapper.xml new file mode 100644 index 0000000..4a434f8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationRefundMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationTimeMapper.xml similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationTimeMapper.xml index bd4a87c..aff2fc5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ReservationTimeMapper.xml @@ -2,9 +2,9 @@ - + - select u.nick_name as name, rt.id as timeId, ro.id as orderId, @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by rt.start_time - select u.nick_name as name, rt.id as timeId, ro.id as orderId, diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ScoreRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ScoreRecordMapper.xml similarity index 71% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ScoreRecordMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ScoreRecordMapper.xml index 85b84fd..76978d0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ScoreRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ScoreRecordMapper.xml @@ -2,9 +2,9 @@ - + - select count(business_id) as `count`, SUM(one_score) + SUM(two_score) + SUM(three_score) as `total` from m_score_record where business_id = #{id} diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml similarity index 92% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml index c5f6fff..fe632ae 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml @@ -2,8 +2,8 @@ - - select d.dept_name, parent.dept_name as `parentName`, count(if(er.status = 1, 1, null)) as `value`, @@ -16,7 +16,7 @@ group by d.dept_id - select d.dept_name, parent.dept_name as `parentName`, count(if(t.situation = 1, 1, null)) as `noneNum`, @@ -37,7 +37,7 @@ group by d.dept_id - select IFNULL(sf.factor_name, 'absent') as `factorName`, d.dept_name as `deptName`, parent.dept_name as `parentName` @@ -50,7 +50,7 @@ and er.batch_no = #{batchNo} - select count(if(t.situation = 1, 1, null)) as `noneNum`, count(if(t.situation = 2, 1, null)) as `lowNum`, count(if(t.situation = 3, 1, null)) as `middleNum`, @@ -89,7 +89,7 @@ from sys_intervene_record - select scale_name as `name`, publish_nums as `value` from sys_scale @@ -99,7 +99,7 @@ limit #{limitNum} - select parent.dept_name as `name`, count(sp.batch_no) as 'value' from sys_dept parent left join sys_dept d on d.parent_id = parent.dept_id @@ -112,7 +112,7 @@ order by parent.order_num - select parent.dept_name as `name`, count(er.record_id) as 'value' from sys_dept parent left join sys_dept d on d.parent_id = parent.dept_id @@ -125,7 +125,7 @@ order by parent.order_num - select parent.dept_name as `name`, count(if(t.situation = 1, 1, null)) as `noneNum`, count(if(t.situation = 2, 1, null)) as `lowNum`, @@ -148,7 +148,7 @@ order by parent.order_num - SELECT session_name AS `sessionName`, complete_num AS `value`, total_num AS `total`, @@ -156,7 +156,7 @@ FROM sys_scale_publish - select SUBSTRING(ri.date, 6) as `name`, COUNT(wr.warn_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc MONTH), '%Y年%m月') AS date FROM (SELECT @xi := @xi + 1 AS xc @@ -167,7 +167,7 @@ group by ri.date order by `name` - select SUBSTRING(ri.date, 9) as `name`, COUNT(wr.warn_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc DAY), '%Y年%m月%d日') AS date FROM (SELECT @xi := @xi + 1 AS xc @@ -180,7 +180,7 @@ order by `name` - select SUBSTRING(ri.date, 6) as `name`, COUNT(ir.intervene_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc MONTH), '%Y年%m月') AS date FROM (SELECT @xi := @xi + 1 AS xc @@ -192,7 +192,7 @@ order by `name` - select SUBSTRING(ri.date, 9) as `name`, COUNT(ir.intervene_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc DAY), '%Y年%m月%d日') AS date FROM (SELECT @xi := @xi + 1 AS xc @@ -205,7 +205,7 @@ order by `name` - select SUBSTRING(ri.date, 6) as `name`, COUNT(er.record_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc MONTH), '%Y年%m月') AS date FROM (SELECT @xi := @xi + 1 AS xc @@ -219,7 +219,7 @@ order by `name` - select SUBSTRING(ri.date, 9) as `name`, COUNT(er.record_id) as `value` from (SELECT DATE_FORMAT(DATE_SUB(NOW(), INTERVAL xc DAY), '%Y年%m月%d日') AS date FROM (SELECT @xi := @xi + 1 AS xc diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationAnswerMapper.xml similarity index 68% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationAnswerMapper.xml index b6c6fb2..b6e8a7b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationAnswerMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationConclusionMapper.xml similarity index 73% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationConclusionMapper.xml index a364733..8b05c5f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationConclusionMapper.xml @@ -2,9 +2,9 @@ - - select ec.*, sf.factor_name, sfr.eval_desc, sfr.eval_propose, sfr.situation from sys_evaluation_conclusion ec left join sys_scale_factor sf on sf.factor_id = ec.factor_id diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml similarity index 87% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml index 7840313..c37f61c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml @@ -2,8 +2,8 @@ - - select s.scale_id, s.scale_name, s.scale_title, @@ -20,14 +20,14 @@ and find_in_set(er.batch_no, #{batchNos}) - select er.*, s.scale_name from sys_evaluation_record er left join sys_scale s on s.scale_id = er.scale_id ${ew.getCustomSqlSegment} - select sf.factor_name as `factorName`, sf.question_num as `questionNum`, sf.question_score as `totalScore`, @@ -44,7 +44,7 @@ where ec.record_id = #{recordId} - select * from sys_evaluation_record where batch_no = #{batchNo} @@ -76,7 +76,7 @@ where batch_no = #{batchNo} - select d.dept_name as `name`, COUNT(wr.warn_id) as `value` from sys_warn_record wr left join sys_dept d on d.dept_id = wr.dept_id @@ -84,7 +84,7 @@ GROUP BY d.dept_id - select sf.factor_name as `name`, count(ec.id) as `value` from sys_scale_factor sf left join sys_evaluation_record er on er.scale_id = sf.scale_id and er.batch_no = #{batchNo} diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysInterveneRecordMapper.xml similarity index 84% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysInterveneRecordMapper.xml index 682865b..c3782c9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysInterveneRecordMapper.xml @@ -2,8 +2,8 @@ - - select ir.intervene_id as `id`, CONCAT(DATE_FORMAT(ir.create_time, '%Y-%m-%d'), ' ', u.nick_name, '的干预') as `name`, ir.create_time as `time`, diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleAnswerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleAnswerMapper.xml similarity index 91% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleAnswerMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleAnswerMapper.xml index 1e0bec6..0339a88 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleAnswerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleAnswerMapper.xml @@ -2,7 +2,7 @@ - + insert into sys_scale_answer(answer_id, question_id, scale_id, answer_option, score, score_type, type, sort) values diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleFactorMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleFactorMapper.xml similarity index 86% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleFactorMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleFactorMapper.xml index 63b8afb..6eef689 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleFactorMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleFactorMapper.xml @@ -2,7 +2,7 @@ - + + + + + - select d.dept_id, d.dept_name, u.user_id, @@ -62,7 +62,7 @@ order by d.dept_id - select sp.*, u.nick_name as `createName` from sys_scale_publish sp @@ -84,7 +84,7 @@ and find_in_set(#{userId}, user_ids) - select count(if(t.sex = '0', 1, null)) as `value`, count(if(t.sex = '1', 1, null)) as `spareValue` from (select u.sex diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleQuestionMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleQuestionMapper.xml similarity index 81% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleQuestionMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleQuestionMapper.xml index 6cf7bce..2b57ed4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleQuestionMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScaleQuestionMapper.xml @@ -2,15 +2,15 @@ - + - + - + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysWarnRecordMapper.xml similarity index 88% rename from ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysWarnRecordMapper.xml index a0721a3..8eb511a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysWarnRecordMapper.xml @@ -2,8 +2,8 @@ - - select wr.*, sp.session_name, u.nick_name, u.intervene_status, count(ir.intervene_id) as `interveneNum` from sys_warn_record wr left join sys_scale_publish sp on sp.batch_no = wr.batch_no @@ -34,7 +34,7 @@ order by wr.warn_time desc - select er.*, s.scale_name from sys_warn_record wr @@ -57,7 +57,7 @@ where status = 1 - select wr.warn_id as `id`, CONCAT(DATE_FORMAT(wr.warn_time, '%Y-%m-%d'), ' ', sp.session_name, '的预警') as `name`, wr.warn_time as `time`, @@ -68,7 +68,7 @@ where wr.user_id = #{userId} - select * from sys_warn_config