diff --git a/bms-back/.github/FUNDING.yml b/bms-back/.github/FUNDING.yml index fbcab775..8c492033 100644 --- a/bms-back/.github/FUNDING.yml +++ b/bms-back/.github/FUNDING.yml @@ -1 +1 @@ -custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html +# BMS 暂未配置外部赞助链接。 diff --git a/bms-back/README.md b/bms-back/README.md index 4deb5083..e3f16cce 100644 --- a/bms-back/README.md +++ b/bms-back/README.md @@ -3,11 +3,7 @@

BMS管理系统

基于SpringBoot+Vue前后端分离的Java快速开发框架

-

- - - -

+

BMS 后端服务

@@ -32,13 +28,9 @@ 17. 在线构建器:拖动表单元素生成相应的HTML代码。 18. 连接池监视:监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈。 -## 在线体验 +## 运行说明 -- admin/admin123 -- 陆陆续续收到一些打赏,为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - -演示地址:http://vue.ruoyi.vip -文档地址:http://doc.ruoyi.vip +后端服务的访问地址和部署参数以实际环境配置为准。 ## 演示图 diff --git a/bms-back/bin/run.bat b/bms-back/bin/run.bat index 41efbd0f..55d0d0de 100644 --- a/bms-back/bin/run.bat +++ b/bms-back/bin/run.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [ÐÅϢ] ʹÓÃJarÃüÁîÔËÐÐWeb¹¤³̡£ +echo [��Ϣ] ʹ��Jar��������Web���̡� echo. cd %~dp0 -cd ../ruoyi-admin/target +cd ../bms-admin/target set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -jar %JAVA_OPTS% ruoyi-admin.jar +java -jar %JAVA_OPTS% bms-admin.jar cd bin pause \ No newline at end of file diff --git a/bms-back/ruoyi-admin/pom.xml b/bms-back/bms-admin/pom.xml similarity index 90% rename from bms-back/ruoyi-admin/pom.xml rename to bms-back/bms-admin/pom.xml index ec2fa10b..c927f32e 100644 --- a/bms-back/ruoyi-admin/pom.xml +++ b/bms-back/bms-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 jar - ruoyi-admin + bms-admin web服务入口 @@ -46,14 +46,14 @@ - com.ruoyi - ruoyi-framework + com.bms + bms-framework - com.ruoyi - ruoyi-quartz + com.bms + bms-quartz @@ -65,8 +65,8 @@ - com.ruoyi - ruoyi-generator + com.bms + bms-generator @@ -129,7 +129,7 @@ - ${project.artifactId}-${profiles.active} + ${project.artifactId} diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/bms-back/bms-admin/src/main/java/com/bms/BmsApplication.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to bms-back/bms-admin/src/main/java/com/bms/BmsApplication.java index 45541947..12cc0015 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/bms-back/bms-admin/src/main/java/com/bms/BmsApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.bms; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,17 +9,17 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动程序 * - * @author ruoyi + * @author bms */ @EnableAsync @EnableScheduling @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication +public class BmsApplication { public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); + SpringApplication.run(BmsApplication.class, args); System.out.println("(♥◠‿◠)ノ゙ 启动成功 ლ(´ڡ`ლ)゙ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/bms-back/bms-admin/src/main/java/com/bms/BmsServletInitializer.java similarity index 64% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to bms-back/bms-admin/src/main/java/com/bms/BmsServletInitializer.java index 6de67dc7..1ba09c56 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/bms-back/bms-admin/src/main/java/com/bms/BmsServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.bms; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author bms */ -public class RuoYiServletInitializer extends SpringBootServletInitializer +public class BmsServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(BmsApplication.class); } } diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PriceSyncEsLogAdvice.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/PriceSyncEsLogAdvice.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PriceSyncEsLogAdvice.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/api/PriceSyncEsLogAdvice.java index 21af01ba..b29eaaf5 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PriceSyncEsLogAdvice.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/PriceSyncEsLogAdvice.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.api; +package com.bms.web.controller.api; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; @@ -8,12 +8,12 @@ import org.springframework.validation.BindException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.search.EsBizLogSupport; -import com.ruoyi.price.search.IBillSearchStore; -import com.ruoyi.web.controller.price.BillingController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.price.search.EsBizLogSupport; +import com.bms.price.search.IBillSearchStore; +import com.bms.web.controller.price.BillingController; /** * Persist quote/bill API failures to Elasticsearch (validation, JSON parse, business, unexpected). diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsOrderBillStatusController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsOrderBillStatusController.java similarity index 81% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsOrderBillStatusController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsOrderBillStatusController.java index e2ad6854..f8a9ab64 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsOrderBillStatusController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsOrderBillStatusController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.api; +package com.bms.web.controller.api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -6,14 +6,14 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.TmsApiProperties; -import com.ruoyi.price.domain.vo.TmsOrderBillStatusResult; -import com.ruoyi.price.service.IPrcOrderBillService; +import com.bms.common.annotation.Anonymous; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.framework.config.properties.TmsApiProperties; +import com.bms.price.domain.vo.TmsOrderBillStatusResult; +import com.bms.price.service.IPrcOrderBillService; /** * TMS 订单客户状态查询接口。 diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsPriceController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsPriceController.java similarity index 85% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsPriceController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsPriceController.java index f2c21df2..c15ead06 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsPriceController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsPriceController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.api; +package com.bms.web.controller.api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -10,23 +10,23 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.TmsApiProperties; -import com.ruoyi.price.domain.vo.BillingTaskSubmitRequest; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.domain.PrcBillingTask; -import com.ruoyi.price.search.EsBizLogSupport; -import com.ruoyi.price.search.EsLogType; -import com.ruoyi.price.search.IBillSearchStore; -import com.ruoyi.price.service.IPrcBillingTaskService; -import com.ruoyi.price.service.IPrcOrderBillService; -import com.ruoyi.price.service.ITmsPriceQuoteService; +import com.bms.common.annotation.Anonymous; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.framework.config.properties.TmsApiProperties; +import com.bms.price.domain.vo.BillingTaskSubmitRequest; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.domain.PrcBillingTask; +import com.bms.price.search.EsBizLogSupport; +import com.bms.price.search.EsLogType; +import com.bms.price.search.IBillSearchStore; +import com.bms.price.service.IPrcBillingTaskService; +import com.bms.price.service.IPrcOrderBillService; +import com.bms.price.service.ITmsPriceQuoteService; /** * TMS open API: freight quote. @@ -34,7 +34,7 @@ import com.ruoyi.price.service.ITmsPriceQuoteService; * POST /api/tms/price/quote * Header X-Api-Code must equal bms.tms.api-code * - * @author ruoyi + * @author bms */ @Anonymous @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBankAccountController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java similarity index 80% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBankAccountController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java index 19bada9c..568545a2 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBankAccountController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.ar; +package com.bms.web.controller.ar; import java.util.List; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.ar.domain.ArBankAccount; -import com.ruoyi.ar.mapper.ArBankAccountMapper; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.bms.ar.domain.ArBankAccount; +import com.bms.ar.mapper.ArBankAccountMapper; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; /** * 公司收款银行账户(下拉选项,供登记收款等场景选择)。 diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java similarity index 92% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBillController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java index b1186477..39b240f6 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.ar; +package com.bms.web.controller.ar; import java.util.List; import java.util.Date; @@ -21,26 +21,26 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.ar.domain.ArBill; -import com.ruoyi.ar.domain.ArBankAccount; -import com.ruoyi.ar.domain.ArBillDetailFee; -import com.ruoyi.ar.domain.ArBillExport; -import com.ruoyi.ar.domain.ArBillGenerateTask; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.domain.vo.ArBillActionRequest; -import com.ruoyi.ar.domain.vo.ArBillGenerateQuery; -import com.ruoyi.ar.domain.vo.ArBillGenerateRequest; -import com.ruoyi.ar.domain.vo.ArBillQuery; -import com.ruoyi.ar.service.IArBillService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.price.domain.PrcOrderBill; +import com.bms.ar.domain.ArBill; +import com.bms.ar.domain.ArBankAccount; +import com.bms.ar.domain.ArBillDetailFee; +import com.bms.ar.domain.ArBillExport; +import com.bms.ar.domain.ArBillGenerateTask; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.domain.vo.ArBillActionRequest; +import com.bms.ar.domain.vo.ArBillGenerateQuery; +import com.bms.ar.domain.vo.ArBillGenerateRequest; +import com.bms.ar.domain.vo.ArBillQuery; +import com.bms.ar.service.IArBillService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.exception.ServiceException; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.uuid.IdUtils; +import com.bms.price.domain.PrcOrderBill; /** * 应收账单 HTTP 接口层。 diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CaptchaController.java similarity index 83% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CaptchaController.java index d6dcf06a..9fd4268d 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.bms.web.controller.common; import java.awt.image.BufferedImage; import java.io.IOException; @@ -11,19 +11,19 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.service.ISysConfigService; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.CacheConstants; +import com.bms.common.constant.Constants; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.utils.sign.Base64; +import com.bms.common.utils.uuid.IdUtils; +import com.bms.system.service.ISysConfigService; /** * 验证码操作处理 * - * @author ruoyi + * @author bms */ @RestController public class CaptchaController @@ -61,7 +61,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = BmsConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CommonController.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CommonController.java index a2333d5f..f81ce58e 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/common/CommonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.bms.web.controller.common; import java.util.ArrayList; import java.util.List; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; +import com.bms.common.config.BmsConfig; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.file.FileUploadUtils; +import com.bms.common.utils.file.FileUtils; +import com.bms.framework.config.ServerConfig; /** * 通用请求处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/common") @@ -52,7 +52,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = BmsConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -77,7 +77,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = BmsConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -103,7 +103,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = BmsConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -145,7 +145,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = BmsConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + FileUtils.stripPrefix(resource); // 下载名称 diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java index f528d85b..472d54a3 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.customer.customerinfo; +package com.bms.web.controller.customer.customerinfo; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerContact; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.domain.BmsCustomerCompany; +import com.bms.customer.customerinfo.domain.BmsCustomerContact; import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -16,19 +16,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.service.IBmsCustomerService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.enums.BusinessType; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.service.IBmsCustomerService; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.common.core.page.TableDataInfo; /** * 客户管理Controller * - * @author ruoyi + * @author bms * @date 2026-09-08 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java similarity index 84% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java index 477bbb21..3b5b7d66 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerPriceSetController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.customer.customerinfo; +package com.bms.web.controller.customer.customerinfo; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet; -import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption; -import com.ruoyi.customer.customerinfo.service.IBmsCustomerPriceSetService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.enums.BusinessType; +import com.bms.customer.customerinfo.domain.BmsCustomerPriceSet; +import com.bms.customer.customerinfo.domain.BmsPriceSetOption; +import com.bms.customer.customerinfo.service.IBmsCustomerPriceSetService; /** * 客户套餐绑定Controller(客户管理-客户编辑-绑定套餐) * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java similarity index 87% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerBillController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java index 843d41f5..7e6d7271 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.customer.customermoney; +package com.bms.web.controller.customer.customermoney; import java.util.Collections; import java.util.List; @@ -11,18 +11,18 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.ar.domain.ArBalanceWriteoff; -import com.ruoyi.ar.service.IArBalanceWriteoffService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; +import com.bms.ar.domain.ArBalanceWriteoff; +import com.bms.ar.service.IArBalanceWriteoffService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; /** * 客户余额核销应收账单 Controller(账单查看统一走应收管理-应收账单页面) * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerMoneyController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerMoneyController.java index 3f8d17bc..b2ff639e 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerMoneyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.customer.customermoney; +package com.bms.web.controller.customer.customermoney; import java.util.Collections; import java.util.List; @@ -14,29 +14,29 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.domain.CustomerCreditApply; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.domain.CustomerReceipt; -import com.ruoyi.customer.customermoney.service.ICreditQuotaService; -import com.ruoyi.customer.customermoney.service.ICustomerMoneyService; -import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; -import com.ruoyi.customer.customermoney.vo.CustomerBalanceFlowExportVO; -import com.ruoyi.customer.customermoney.vo.CustomerCreditFlowExportVO; -import com.ruoyi.customer.customermoney.vo.CustomerReceiptExportVO; -import com.ruoyi.common.utils.SecurityUtils; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.customer.customermoney.api.ICustomerAccountApi; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.domain.CustomerCreditApply; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.domain.CustomerReceipt; +import com.bms.customer.customermoney.service.ICreditQuotaService; +import com.bms.customer.customermoney.service.ICustomerMoneyService; +import com.bms.customer.customermoney.vo.CustomerAccountStatusVO; +import com.bms.customer.customermoney.vo.CustomerBalanceFlowExportVO; +import com.bms.customer.customermoney.vo.CustomerCreditFlowExportVO; +import com.bms.customer.customermoney.vo.CustomerReceiptExportVO; +import com.bms.common.utils.SecurityUtils; /** * 客户余额/收款/流水 Controller * - * @author ruoyi + * @author bms * @date 2026-09-11 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/supplierinfo/BmsSupplierController.java similarity index 86% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/supplierinfo/BmsSupplierController.java index e61bf8a9..109e7577 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/supplierinfo/BmsSupplierController.java @@ -1,13 +1,13 @@ -package com.ruoyi.web.controller.customer.supplierinfo; +package com.bms.web.controller.customer.supplierinfo; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplier; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; -import com.ruoyi.customer.supplierinfo.service.IBmsSupplierService; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.domain.BmsCustomerCompany; +import com.bms.customer.supplierinfo.domain.BmsSupplier; +import com.bms.customer.supplierinfo.domain.BmsSupplierAttachment; +import com.bms.customer.supplierinfo.domain.BmsSupplierCompany; +import com.bms.customer.supplierinfo.service.IBmsSupplierService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -19,17 +19,17 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.enums.BusinessType; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.utils.poi.ExcelUtil; /** * 供应商管理Controller * - * @author ruoyi + * @author bms * @date 2026-09-09 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsExchangeRateController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsExchangeRateController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsExchangeRateController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsExchangeRateController.java index e69be952..0f932764 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsExchangeRateController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsExchangeRateController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.data; +package com.bms.web.controller.data; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -17,20 +17,20 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.BmsExchangeRate; -import com.ruoyi.system.domain.BmsExchangeRateConvertResult; -import com.ruoyi.system.service.IBmsExchangeRateService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.domain.BmsExchangeRate; +import com.bms.system.domain.BmsExchangeRateConvertResult; +import com.bms.system.service.IBmsExchangeRateService; /** * 汇率管理 信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/data/exchangerate") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionController.java index b1d0a0f7..4119fb39 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.data; +package com.bms.web.controller.data; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.BmsRegion; -import com.ruoyi.system.service.IBmsRegionService; -import com.ruoyi.system.service.IBmsRegionSyncService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.domain.BmsRegion; +import com.bms.system.service.IBmsRegionService; +import com.bms.system.service.IBmsRegionSyncService; /** * 区域管理 信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/data/region") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionSyncLogController.java similarity index 80% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionSyncLogController.java index 9f40976d..3f5e7b21 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/data/BmsRegionSyncLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.data; +package com.bms.web.controller.data; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,18 +8,18 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.BmsRegionSyncLog; -import com.ruoyi.system.mapper.BmsRegionSyncLogMapper; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.system.domain.BmsRegionSyncLog; +import com.bms.system.mapper.BmsRegionSyncLogMapper; /** * 区域同步日志 信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/data/region/log") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/BillingTaskMonitorController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/BillingTaskMonitorController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/BillingTaskMonitorController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/BillingTaskMonitorController.java index a8366639..c875f667 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/BillingTaskMonitorController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/BillingTaskMonitorController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import java.util.ArrayList; import java.util.HashMap; @@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.PrcBillingTask; -import com.ruoyi.price.enums.BillTaskSuccessStatus; -import com.ruoyi.price.service.IPrcBillingTaskService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.PrcBillingTask; +import com.bms.price.enums.BillTaskSuccessStatus; +import com.bms.price.service.IPrcBillingTaskService; /** * Monitor: failed / waiting prc_billing_task list and manual resync. diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/CacheController.java similarity index 95% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/CacheController.java index d17bd66e..edc3499c 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/CacheController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -17,15 +17,15 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysCache; +import com.bms.common.constant.CacheConstants; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.SysCache; /** * 缓存监控 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/cache") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/EsLogController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/EsLogController.java similarity index 80% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/EsLogController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/EsLogController.java index c8b90aa6..bc194cd0 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/EsLogController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/EsLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -7,14 +7,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.price.search.BillSearchPage; -import com.ruoyi.price.search.IBillSearchStore; +import com.bms.common.constant.HttpStatus; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.PageDomain; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.core.page.TableSupport; +import com.bms.price.search.BillSearchPage; +import com.bms.price.search.IBillSearchStore; /** * Generic Elasticsearch business-log viewer. diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/ServerController.java similarity index 79% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/ServerController.java index cc805ad8..9db464a6 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/ServerController.java @@ -1,16 +1,16 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; +import com.bms.common.core.domain.AjaxResult; +import com.bms.framework.web.domain.Server; /** * 服务器监控 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/server") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysLogininforController.java similarity index 83% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysLogininforController.java index f6fac713..64d1f853 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -10,20 +10,20 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysPasswordService; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.framework.web.service.SysPasswordService; +import com.bms.system.domain.SysLogininfor; +import com.bms.system.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/logininfor") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysOperlogController.java similarity index 82% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysOperlogController.java index f056d651..67fe3c7c 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.domain.SysOperLog; +import com.bms.system.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/operlog") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysUserOnlineController.java similarity index 81% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysUserOnlineController.java index a442863c..9dfe7be8 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bms.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -11,22 +11,22 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bms.common.annotation.Log; +import com.bms.common.constant.CacheConstants; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.SysUserOnline; +import com.bms.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/online") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java index 1a234967..30da11e0 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -13,25 +13,25 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.domain.PrcQuote; -import com.ruoyi.price.domain.vo.AddIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.UpdateIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.service.IPrcOrderBillService; -import com.ruoyi.price.service.ITmsPriceQuoteService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.domain.PrcQuote; +import com.bms.price.domain.vo.AddIncomeBillFeeRequest; +import com.bms.price.domain.vo.UpdateIncomeBillFeeRequest; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.service.IPrcOrderBillService; +import com.bms.price.service.ITmsPriceQuoteService; /** * Billing center: order quote trial (authenticated). * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/price/billing") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/PriceSetController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java similarity index 94% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/PriceSetController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java index 80ec7737..04294fc6 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/PriceSetController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.Date; @@ -17,23 +17,23 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.price.domain.PrcCustomerPriceSet; -import com.ruoyi.price.domain.PrcPriceSet; -import com.ruoyi.price.domain.PrcPriceSetDetail; -import com.ruoyi.price.domain.PrcPriceSetSaveTask; -import com.ruoyi.price.domain.PrcPriceSetVersion; -import com.ruoyi.price.service.IPrcPriceSetService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.MessageUtils; +import com.bms.price.domain.PrcCustomerPriceSet; +import com.bms.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetSaveTask; +import com.bms.price.domain.PrcPriceSetVersion; +import com.bms.price.service.IPrcPriceSetService; /** * 价格套餐管理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/price/set") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ProductController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ProductController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ProductController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ProductController.java index 06b16bb3..13430b95 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ProductController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ProductController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.Date; import java.util.List; @@ -15,19 +15,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.BmsProduct; -import com.ruoyi.price.domain.BmsProductCountry; -import com.ruoyi.price.service.IBmsProductService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.BmsProduct; +import com.bms.price.domain.BmsProductCountry; +import com.bms.price.service.IBmsProductService; /** * 产品列表(含 Excel 导入) * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/price/product") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/SurchargeController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/SurchargeController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/SurchargeController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/SurchargeController.java index fe5cff47..05c71a97 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/SurchargeController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/SurchargeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,20 +12,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.PrcSurcharge; -import com.ruoyi.price.domain.PrcSurchargeRel; -import com.ruoyi.price.service.IPrcSurchargeRelService; -import com.ruoyi.price.service.IPrcSurchargeService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.PrcSurcharge; +import com.bms.price.domain.PrcSurchargeRel; +import com.bms.price.service.IPrcSurchargeRelService; +import com.bms.price.service.IPrcSurchargeService; /** * 附加费配置 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/price/surcharge") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/WeightController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/WeightController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/WeightController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/WeightController.java index 4bd0d68e..7e8018a4 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/WeightController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/WeightController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.PrcWeightSectionDetail; -import com.ruoyi.price.domain.PrcWeightSectionTemplate; -import com.ruoyi.price.service.IPrcWeightService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.PrcWeightSectionDetail; +import com.bms.price.domain.PrcWeightSectionTemplate; +import com.bms.price.service.IPrcWeightService; /** * 重量段管理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/price/weight") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ZoneController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ZoneController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ZoneController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ZoneController.java index 2e7e978a..28fecd89 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ZoneController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ZoneController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.price; +package com.bms.web.controller.price; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -13,15 +13,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.domain.PrcZoneDetail; -import com.ruoyi.price.domain.PrcZoneRegion; -import com.ruoyi.price.service.IPrcZoneService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.price.domain.PrcZone; +import com.bms.price.domain.PrcZoneDetail; +import com.bms.price.domain.PrcZoneRegion; +import com.bms.price.service.IPrcZoneService; /** * Zone management: bms_region -> zone -> postcode detail diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleCreditQuotaController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/RoleCreditQuotaController.java similarity index 78% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleCreditQuotaController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/RoleCreditQuotaController.java index 92657bdb..a0939139 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RoleCreditQuotaController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/RoleCreditQuotaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.customer.customermoney.domain.CustomerCreditGrant; -import com.ruoyi.customer.customermoney.service.ICreditQuotaService; -import com.ruoyi.customer.customermoney.vo.RoleCreditQuotaVo; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.customer.customermoney.domain.CustomerCreditGrant; +import com.bms.customer.customermoney.service.ICreditQuotaService; +import com.bms.customer.customermoney.vo.RoleCreditQuotaVo; /** * 角色可分配额度总额(角色额度池)管理 * - * @author ruoyi + * @author bms * @date 2026-09-20 */ @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysConfigController.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysConfigController.java index 91a854fc..f2c023f5 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.domain.SysConfig; +import com.bms.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/config") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDeptController.java similarity index 91% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDeptController.java index 343503c1..dfe12e34 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import java.util.Map; @@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.bms.common.annotation.Log; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysDept; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.StringUtils; +import com.bms.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/dept") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictDataController.java similarity index 87% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictDataController.java index 87a13a36..0bd03ff4 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.ArrayList; import java.util.List; @@ -15,21 +15,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysDictData; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.service.ISysDictDataService; +import com.bms.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/dict/data") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictTypeController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictTypeController.java index 3ff314c0..cc591556 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysDictType; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/dict/type") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysIndexController.java similarity index 75% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysIndexController.java index f2ce93c7..d0526648 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysIndexController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; @@ -6,24 +6,24 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.config.BmsConfig; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.system.service.ISysUserService; /** * 首页 * - * @author ruoyi + * @author bms */ @RestController public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private BmsConfig bmsConfig; @Autowired private ISysUserService userService; @@ -34,7 +34,7 @@ public class SysIndexController @RequestMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", bmsConfig.getName(), bmsConfig.getVersion()); } /** diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysLoginController.java similarity index 82% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysLoginController.java index 7719c89f..71edb527 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.Date; import java.util.List; @@ -8,26 +8,26 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysMenuService; +import com.bms.common.constant.Constants; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysMenu; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginBody; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.text.Convert; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.web.service.SysLoginService; +import com.bms.framework.web.service.SysPermissionService; +import com.bms.framework.web.service.TokenService; +import com.bms.system.service.ISysConfigService; +import com.bms.system.service.ISysMenuService; /** * 登录验证 * - * @author ruoyi + * @author bms */ @RestController public class SysLoginController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysMenuController.java similarity index 92% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysMenuController.java index 9d9fab62..d27a4fa5 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import java.util.Map; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; +import com.bms.common.annotation.Log; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysMenu; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.StringUtils; +import com.bms.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/menu") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysNoticeController.java similarity index 89% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysNoticeController.java index 84a3c730..29a514aa 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeReadService; -import com.ruoyi.system.service.ISysNoticeService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.core.text.Convert; +import com.bms.common.enums.BusinessType; +import com.bms.system.domain.SysNotice; +import com.bms.system.service.ISysNoticeReadService; +import com.bms.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/notice") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysPostController.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysPostController.java index 5b604cf1..5108f1e2 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.domain.SysPost; +import com.bms.system.service.ISysPostService; /** * 岗位信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/post") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysProfileController.java similarity index 82% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysProfileController.java index 1e417775..ce5a752e 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; @@ -10,26 +10,26 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.annotation.Log; +import com.bms.common.config.BmsConfig; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.file.FileUploadUtils; +import com.bms.common.utils.file.FileUtils; +import com.bms.common.utils.file.MimeTypeUtils; +import com.bms.framework.web.service.TokenService; +import com.bms.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/user/profile") @@ -128,13 +128,13 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); + String avatar = FileUploadUtils.upload(BmsConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); if (userService.updateUserAvatar(loginUser.getUserId(), avatar)) { String oldAvatar = loginUser.getUser().getAvatar(); if (StringUtils.isNotEmpty(oldAvatar)) { - FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); + FileUtils.deleteFile(BmsConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); } AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", avatar); diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRegisterController.java similarity index 70% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRegisterController.java index fe192492..c1031a73 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRegisterController.java @@ -1,20 +1,20 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.SysRegisterService; -import com.ruoyi.system.service.ISysConfigService; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.model.RegisterBody; +import com.bms.common.utils.StringUtils; +import com.bms.framework.web.service.SysRegisterService; +import com.bms.system.service.ISysConfigService; /** * 注册验证 * - * @author ruoyi + * @author bms */ @RestController public class SysRegisterController extends BaseController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRoleController.java similarity index 90% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRoleController.java index a5643a0f..b06236d5 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,26 +13,26 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.framework.web.service.SysPermissionService; +import com.bms.framework.web.service.TokenService; +import com.bms.system.domain.SysUserRole; +import com.bms.system.service.ISysDeptService; +import com.bms.system.service.ISysRoleService; +import com.bms.system.service.ISysUserService; /** * 角色信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/role") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysUserController.java similarity index 92% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysUserController.java index 5dfbefed..608ab2fc 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bms.web.controller.system; import java.util.LinkedHashMap; import java.util.List; @@ -18,26 +18,26 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.system.service.ISysDeptService; +import com.bms.system.service.ISysPostService; +import com.bms.system.service.ISysRoleService; +import com.bms.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/system/user") diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TestController.java similarity index 95% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TestController.java index 586e1b84..49ea8ecb 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.bms.web.controller.tool; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.R; +import com.bms.common.utils.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; /** * swagger 用户测试方法 * - * @author ruoyi + * @author bms */ @Tag(name = "用户信息管理") @RestController diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TmsPriceBillDemo.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TmsPriceBillDemo.java similarity index 99% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TmsPriceBillDemo.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TmsPriceBillDemo.java index 20f39456..b51432f9 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TmsPriceBillDemo.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/tool/TmsPriceBillDemo.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.bms.web.controller.tool; import java.io.BufferedReader; import java.io.InputStream; diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/bms-back/bms-admin/src/main/java/com/bms/web/core/config/SwaggerConfig.java similarity index 82% rename from bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to bms-back/bms-admin/src/main/java/com/bms/web/core/config/SwaggerConfig.java index 9ab7c24d..05b9f325 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/core/config/SwaggerConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.web.core.config; +package com.bms.web.core.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; +import com.bms.common.config.BmsConfig; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -14,14 +14,14 @@ import io.swagger.v3.oas.models.security.SecurityScheme; /** * Swagger2的接口配置 * - * @author ruoyi + * @author bms */ @Configuration public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private BmsConfig bmsConfig; /** * 自定义的 OpenAPI 对象 @@ -53,12 +53,12 @@ public class SwaggerConfig { return new Info() // 设置标题 - .title("标题:若依管理系统_接口文档") + .title("标题:BMS 管理系统_接口文档") // 描述 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 - .contact(new Contact().name(ruoyiConfig.getName())) + .contact(new Contact().name(bmsConfig.getName())) // 版本 - .version("版本号:" + ruoyiConfig.getVersion()); + .version("版本号:" + bmsConfig.getVersion()); } } diff --git a/bms-back/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/bms-back/bms-admin/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from bms-back/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties rename to bms-back/bms-admin/src/main/resources/META-INF/spring-devtools.properties diff --git a/bms-back/ruoyi-admin/src/main/resources/application-local.yml b/bms-back/bms-admin/src/main/resources/application-local.yml similarity index 98% rename from bms-back/ruoyi-admin/src/main/resources/application-local.yml rename to bms-back/bms-admin/src/main/resources/application-local.yml index 425a3cbb..d9e07474 100644 --- a/bms-back/ruoyi-admin/src/main/resources/application-local.yml +++ b/bms-back/bms-admin/src/main/resources/application-local.yml @@ -66,7 +66,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: bms login-password: 123456 filter: stat: diff --git a/bms-back/ruoyi-admin/src/main/resources/application-prod.yml b/bms-back/bms-admin/src/main/resources/application-prod.yml similarity index 98% rename from bms-back/ruoyi-admin/src/main/resources/application-prod.yml rename to bms-back/bms-admin/src/main/resources/application-prod.yml index ab6699f6..e74a0a0a 100644 --- a/bms-back/ruoyi-admin/src/main/resources/application-prod.yml +++ b/bms-back/bms-admin/src/main/resources/application-prod.yml @@ -4,15 +4,8 @@ # 生产环境文件存储根目录 # 上传、导入、头像及账单下载文件都会基于此目录保存 -ruoyi: - profile: /www/server/bms/data - -logging: - level: - com.ruoyi: info - org.springframework: warn - bms: + profile: /www/server/bms/data elasticsearch: enabled: true uris: https://127.0.0.1:9200 @@ -20,6 +13,11 @@ bms: password: d4aoZYB2yQHXmWZiH6Gw index: bms_biz_log +logging: + level: + com.bms: info + org.springframework: warn + # 数据源配置 spring: devtools: @@ -78,7 +76,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: bms login-password: 123456 filter: stat: diff --git a/bms-back/ruoyi-admin/src/main/resources/application.yml b/bms-back/bms-admin/src/main/resources/application.yml similarity index 91% rename from bms-back/ruoyi-admin/src/main/resources/application.yml rename to bms-back/bms-admin/src/main/resources/application.yml index b6e23b11..ab4abf2b 100644 --- a/bms-back/ruoyi-admin/src/main/resources/application.yml +++ b/bms-back/bms-admin/src/main/resources/application.yml @@ -1,17 +1,36 @@ # 项目相关配置 -ruoyi: +bms: # 名称 - name: RuoYi + name: BMS # 版本 version: 3.9.2 # 版权年份 copyrightYear: 2026 - # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + # 文件路径 示例( Windows配置D:/bms/uploadPath,Linux配置 /home/bms/uploadPath) + profile: D:/bms/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 captchaType: math + # TMS open API + tms: + # Agreed API identification code for TMS callers + api-code: BMS.TMS.ZYaOvlQzpcfau8TUaCFfO3Hp8ieHIqGw + billing: + # MQ mode: redis (default list queue) | local (Spring event) + mq-mode: redis + mq-queue-key: bms:billing:task + consumer-enabled: true + # Pop/process interval after previous tick finishes + consumer-delay-ms: 200 + # Max messages popped per tick; processed by consumer-threads pool + consumer-batch-size: 32 + consumer-threads: 8 + oracle: + # SLAVE datasource Oracle main-order table (schema.table allowed) + order-table: WEISHI_USER.TAB_ORDER + # Fallback product when Oracle row has no PRODUCT_CODE + default-product-code: "" # 开发环境配置 server: @@ -34,7 +53,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.bms: debug org.springframework: warn # 用户配置 @@ -108,7 +127,7 @@ token: # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.bms.**.domain # 配置mapper的扫描,找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 @@ -132,14 +151,14 @@ springdoc: - group: 'default' display-name: '测试模块' paths-to-match: '/**' - packages-to-scan: com.ruoyi.web.controller.tool + packages-to-scan: com.bms.web.controller.tool # 防盗链配置 referer: # 防盗链开关 enabled: false # 允许的域名列表 - allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip + allowed-domains: localhost,127.0.0.1 # 防止XSS攻击 xss: @@ -150,23 +169,3 @@ xss: # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* -# BMS TMS open API -bms: - tms: - # Agreed API identification code for TMS callers - api-code: BMS.TMS.ZYaOvlQzpcfau8TUaCFfO3Hp8ieHIqGw - billing: - # MQ mode: redis (default list queue) | local (Spring event) - mq-mode: redis - mq-queue-key: bms:billing:task - consumer-enabled: true - # Pop/process interval after previous tick finishes - consumer-delay-ms: 200 - # Max messages popped per tick; processed by consumer-threads pool - consumer-batch-size: 32 - consumer-threads: 8 - oracle: - # SLAVE datasource Oracle main-order table (schema.table allowed) - order-table: WEISHI_USER.TAB_ORDER - # Fallback product when Oracle row has no PRODUCT_CODE - default-product-code: "" diff --git a/bms-back/ruoyi-admin/src/main/resources/banner.txt b/bms-back/bms-admin/src/main/resources/banner.txt similarity index 97% rename from bms-back/ruoyi-admin/src/main/resources/banner.txt rename to bms-back/bms-admin/src/main/resources/banner.txt index 0931cb84..8f77bab3 100644 --- a/bms-back/ruoyi-admin/src/main/resources/banner.txt +++ b/bms-back/bms-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${bms.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// // _ooOoo_ // diff --git a/bms-back/ruoyi-admin/src/main/resources/countries.json b/bms-back/bms-admin/src/main/resources/countries.json similarity index 100% rename from bms-back/ruoyi-admin/src/main/resources/countries.json rename to bms-back/bms-admin/src/main/resources/countries.json diff --git a/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties b/bms-back/bms-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties rename to bms-back/bms-admin/src/main/resources/i18n/messages.properties diff --git a/bms-back/ruoyi-admin/src/main/resources/logback.xml b/bms-back/bms-admin/src/main/resources/logback.xml similarity index 98% rename from bms-back/ruoyi-admin/src/main/resources/logback.xml rename to bms-back/bms-admin/src/main/resources/logback.xml index 557bc52b..6aa53695 100644 --- a/bms-back/ruoyi-admin/src/main/resources/logback.xml +++ b/bms-back/bms-admin/src/main/resources/logback.xml @@ -72,7 +72,7 @@ - + diff --git a/bms-back/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/bms-back/bms-admin/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from bms-back/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml rename to bms-back/bms-admin/src/main/resources/mybatis/mybatis-config.xml diff --git a/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java b/bms-back/bms-admin/src/test/java/com/bms/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java similarity index 98% rename from bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java rename to bms-back/bms-admin/src/test/java/com/bms/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java index 9d158194..5f180488 100644 --- a/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java @@ -1,4 +1,4 @@ -//package com.ruoyi.customer.customermoney.api; +//package com.bms.customer.customermoney.api; // //import java.math.BigDecimal; //import java.math.RoundingMode; @@ -21,9 +21,9 @@ //import org.springframework.security.core.Authentication; //import org.springframework.security.core.context.SecurityContextHolder; // -//import com.ruoyi.common.core.domain.entity.SysUser; -//import com.ruoyi.common.core.domain.model.LoginUser; -//import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; +//import com.bms.common.core.domain.entity.SysUser; +//import com.bms.common.core.domain.model.LoginUser; +//import com.bms.customer.customermoney.domain.CustomerCreditFlow; // //import static org.junit.jupiter.api.Assertions.assertEquals; //import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,7 +41,7 @@ // *

注意:这是针对真实开发库的集成测试,{@code setUp} 会把指定测试客户的 CNY 账户重置为受控额度, // * {@code tearDown} 恢复原值并物理删除测试产生的额度流水。请将 {@code CUSTOMER_ID} 换成专用测试客户ID。

// * -// * @author ruoyi +// * @author bms // * @date 2026-09-17 // */ //@SpringBootTest diff --git a/bms-back/ruoyi-common/pom.xml b/bms-back/bms-common/pom.xml similarity index 96% rename from bms-back/ruoyi-common/pom.xml rename to bms-back/bms-common/pom.xml index d67fa455..cab6d475 100644 --- a/bms-back/ruoyi-common/pom.xml +++ b/bms-back/bms-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 - ruoyi-common + bms-common common通用工具 diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Anonymous.java similarity index 87% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/Anonymous.java index 1d6d4f44..96aa415a 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Anonymous.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 匿名访问不鉴权注解 * - * @author ruoyi + * @author bms */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/DataScope.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/DataScope.java index 36163aec..80904e48 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author bms */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/DataSource.java similarity index 87% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/DataSource.java index 79cd191f..3abca439 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,14 +6,14 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; +import com.bms.common.enums.DataSourceType; /** * 自定义多数据源切换注解 * * 优先级:先方法,后类,如果方法覆盖了类上的数据源类型,以方法的为准,否则以类上的为准 * - * @author ruoyi + * @author bms */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Excel.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/Excel.java index 57c08b18..b697d90d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,12 +7,12 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; +import com.bms.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author bms */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Excels.java similarity index 85% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/Excels.java index 1f1cc81b..48d33e52 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author bms */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Log.java similarity index 87% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/Log.java index 1eb8e49c..6a87caa7 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Log.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.bms.common.enums.BusinessType; +import com.bms.common.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author bms * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/RateLimiter.java similarity index 82% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/RateLimiter.java index 0f024c7d..9dab67d5 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/RateLimiter.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.enums.LimitType; +import com.bms.common.constant.CacheConstants; +import com.bms.common.enums.LimitType; /** * 限流注解 * - * @author ruoyi + * @author bms */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/RepeatSubmit.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/RepeatSubmit.java index b7697481..806f2707 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义注解防止表单重复提交 * - * @author ruoyi + * @author bms * */ @Inherited diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Sensitive.java similarity index 76% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java rename to bms-back/bms-common/src/main/java/com/bms/common/annotation/Sensitive.java index b33c961c..316c24c9 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/annotation/Sensitive.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bms.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -6,13 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import tools.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.config.serializer.SensitiveJsonSerializer; -import com.ruoyi.common.enums.DesensitizedType; +import com.bms.common.config.serializer.SensitiveJsonSerializer; +import com.bms.common.enums.DesensitizedType; /** * 数据脱敏注解 * - * @author ruoyi + * @author bms */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.FIELD, ElementType.METHOD }) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/bms-back/bms-common/src/main/java/com/bms/common/config/BmsConfig.java similarity index 88% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to bms-back/bms-common/src/main/java/com/bms/common/config/BmsConfig.java index 29281cf1..c4ab2194 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/config/BmsConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.bms.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; /** * 读取项目相关配置 * - * @author ruoyi + * @author bms */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "bms") +public class BmsConfig { /** 项目名称 */ private String name; @@ -67,7 +67,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + BmsConfig.profile = profile; } public static boolean isAddressEnabled() @@ -77,7 +77,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + BmsConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -85,7 +85,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + BmsConfig.captchaType = captchaType; } /** diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java b/bms-back/bms-common/src/main/java/com/bms/common/config/serializer/SensitiveJsonSerializer.java similarity index 88% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java rename to bms-back/bms-common/src/main/java/com/bms/common/config/serializer/SensitiveJsonSerializer.java index df676dab..7332efe2 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/config/serializer/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config.serializer; +package com.bms.common.config.serializer; import java.util.Objects; import tools.jackson.core.JacksonException; @@ -8,15 +8,15 @@ import tools.jackson.databind.DatabindException; import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.ser.std.StdSerializer; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DesensitizedType; -import com.ruoyi.common.utils.SecurityUtils; +import com.bms.common.annotation.Sensitive; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.enums.DesensitizedType; +import com.bms.common.utils.SecurityUtils; /** * 数据脱敏序列化过滤 * - * @author ruoyi + * @author bms */ public class SensitiveJsonSerializer extends StdSerializer { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/StrictDateDeserializer.java b/bms-back/bms-common/src/main/java/com/bms/common/config/serializer/StrictDateDeserializer.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/StrictDateDeserializer.java rename to bms-back/bms-common/src/main/java/com/bms/common/config/serializer/StrictDateDeserializer.java index 7694d977..1fd44ba9 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/StrictDateDeserializer.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/config/serializer/StrictDateDeserializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config.serializer; +package com.bms.common.config.serializer; import java.io.IOException; import java.time.LocalDate; diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/CacheConstants.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/CacheConstants.java index 0080343a..ee8c6896 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; /** * 缓存的key 常量 * - * @author ruoyi + * @author bms */ public class CacheConstants { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/Constants.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/Constants.java index 51d7f566..90e39353 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; import java.util.Locale; import io.jsonwebtoken.Claims; @@ -6,7 +6,7 @@ import io.jsonwebtoken.Claims; /** * 通用常量信息 * - * @author ruoyi + * @author bms */ public class Constants { @@ -158,18 +158,18 @@ public class Constants /** * 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全) */ - public static final String[] JSON_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "com.bms" }; /** * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加) */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.quartz.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.bms.quartz.task" }; /** * 定时任务违规的字符 */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" }; + "org.springframework", "org.apache", "com.bms.common.utils.file", "com.bms.common.config", "com.bms.generator" }; /** * 部门相关常量 diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/GenConstants.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/GenConstants.java index ea1e1176..77a568c1 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author bms */ public class GenConstants { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/HttpStatus.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/HttpStatus.java index a983c77e..87c0bbc5 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; /** * 返回状态码 * - * @author ruoyi + * @author bms */ public class HttpStatus { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/ScheduleConstants.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/ScheduleConstants.java index 62ad8154..b53b893d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author bms */ public class ScheduleConstants { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/bms-back/bms-common/src/main/java/com/bms/common/constant/UserConstants.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to bms-back/bms-common/src/main/java/com/bms/common/constant/UserConstants.java index 8dc7faac..c7acfb71 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.bms.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author bms */ public class UserConstants { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/bms-back/bms-common/src/main/java/com/bms/common/core/controller/BaseController.java similarity index 87% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/controller/BaseController.java index a685e061..3b85f343 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.controller; +package com.bms.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -9,22 +9,22 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.bms.common.constant.HttpStatus; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.page.PageDomain; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.core.page.TableSupport; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.PageUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.sql.SqlUtil; /** * web层通用数据处理 * - * @author ruoyi + * @author bms */ public class BaseController { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/AjaxResult.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/AjaxResult.java index a7abfe49..0ecad688 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/AjaxResult.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.core.domain; +package com.bms.common.core.domain; import java.util.HashMap; import java.util.Objects; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.HttpStatus; +import com.bms.common.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author bms */ public class AjaxResult extends HashMap { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/BaseEntity.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/BaseEntity.java index 15bf66b1..21391da3 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.bms.common.core.domain; import java.io.Serializable; import java.util.Date; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** * Entity基类 * - * @author ruoyi + * @author bms */ public class BaseEntity implements Serializable { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/R.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/R.java index ef15802b..67795675 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/R.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.bms.common.core.domain; import java.io.Serializable; -import com.ruoyi.common.constant.HttpStatus; +import com.bms.common.constant.HttpStatus; /** * 响应信息主体 * - * @author ruoyi + * @author bms */ public class R implements Serializable { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeEntity.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeEntity.java index a180a18c..ae0ae320 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.bms.common.core.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author bms */ public class TreeEntity extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeSelect.java similarity index 87% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeSelect.java index ae25df24..c967206b 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/TreeSelect.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain; +package com.bms.common.core.domain; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.entity.SysMenu; +import com.bms.common.utils.StringUtils; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author bms */ public class TreeSelect implements Serializable { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDept.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDept.java index 37236dbb..1914ab62 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author bms */ public class SysDept extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictData.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictData.java index 6b035a6e..62a4036d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictData.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author bms */ public class SysDictData extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictType.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictType.java index ac5d2906..773a3f88 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysDictType.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author bms */ public class SysDictType extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysMenu.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysMenu.java index d4ab7629..950937dd 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author bms */ public class SysMenu extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysRole.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysRole.java index 2f8ed146..eab3c32c 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import java.util.Set; import jakarta.validation.constraints.NotBlank; @@ -6,14 +6,14 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author bms */ public class SysRole extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysUser.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysUser.java index 51f4ff4d..ebfbe100 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.bms.common.core.domain.entity; import java.util.Date; import java.util.List; @@ -7,18 +7,18 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.xss.Xss; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.annotation.Excel.Type; +import com.bms.common.annotation.Excels; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.xss.Xss; /** * 用户对象 sys_user * - * @author ruoyi + * @author bms */ public class SysUser extends BaseEntity { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginBody.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginBody.java index b5bc8c8e..43174f6e 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.model; +package com.bms.common.core.domain.model; /** * 用户登录对象 * - * @author ruoyi + * @author bms */ public class LoginBody { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java index e41ad568..c895cfea 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/LoginUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.bms.common.core.domain.model; import java.util.Collection; import java.util.Collections; @@ -9,12 +9,12 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.entity.SysUser; /** * 登录用户身份权限 * - * @author ruoyi + * @author bms */ public class LoginUser implements UserDetails { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/RegisterBody.java similarity index 57% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/RegisterBody.java index 868a1fc5..ba6e2c04 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/domain/model/RegisterBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.model; +package com.bms.common.core.domain.model; /** * 用户注册对象 * - * @author ruoyi + * @author bms */ public class RegisterBody extends LoginBody { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/bms-back/bms-common/src/main/java/com/bms/common/core/page/PageDomain.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/page/PageDomain.java index 8966cb4c..31c228c1 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/page/PageDomain.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.page; +package com.bms.common.core.page; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author bms */ public class PageDomain { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/bms-back/bms-common/src/main/java/com/bms/common/core/page/TableDataInfo.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/page/TableDataInfo.java index 2fff93e7..f8a91542 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.bms.common.core.page; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author bms */ public class TableDataInfo implements Serializable { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/bms-back/bms-common/src/main/java/com/bms/common/core/page/TableSupport.java similarity index 89% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/page/TableSupport.java index a120c300..6ddadb68 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/page/TableSupport.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.page; +package com.bms.common.core.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.ServletUtils; +import com.bms.common.core.text.Convert; +import com.bms.common.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author bms */ public class TableSupport { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/bms-back/bms-common/src/main/java/com/bms/common/core/redis/RedisCache.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/redis/RedisCache.java index b2133afc..8ec29594 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.redis; +package com.bms.common.core.redis; import java.time.Duration; import java.util.Collection; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author bms **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/bms-back/bms-common/src/main/java/com/bms/common/core/text/CharsetKit.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/text/CharsetKit.java index 84124aac..06506525 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/text/CharsetKit.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.text; +package com.bms.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author bms */ public class CharsetKit { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/bms-back/bms-common/src/main/java/com/bms/common/core/text/Convert.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/text/Convert.java index a87828a4..6cc9f527 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.bms.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -7,12 +7,12 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 类型转换器 * - * @author ruoyi + * @author bms */ public class Convert { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/bms-back/bms-common/src/main/java/com/bms/common/core/text/StrFormatter.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to bms-back/bms-common/src/main/java/com/bms/common/core/text/StrFormatter.java index c78ac776..16195c87 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.text; +package com.bms.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author bms */ public class StrFormatter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessStatus.java similarity index 75% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessStatus.java index 10b7306f..4eb88d56 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 操作状态 * - * @author ruoyi + * @author bms * */ public enum BusinessStatus diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessType.java similarity index 91% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessType.java index 2e17c4a5..8e268cf9 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author bms */ public enum BusinessType { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/DataSourceType.java similarity index 74% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/DataSourceType.java index 0d945be5..27ae19de 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/DataSourceType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 数据源 * - * @author ruoyi + * @author bms */ public enum DataSourceType { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/DesensitizedType.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/DesensitizedType.java index 07f02eeb..15fcbb21 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/DesensitizedType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; import java.util.function.Function; -import com.ruoyi.common.utils.DesensitizedUtil; +import com.bms.common.utils.DesensitizedUtil; /** * 脱敏类型 * - * @author ruoyi + * @author bms */ public enum DesensitizedType { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/HttpMethod.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/HttpMethod.java index 73570491..a5f5c674 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import org.jspecify.annotations.Nullable; /** * 请求方式 * - * @author ruoyi + * @author bms */ public enum HttpMethod { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/LimitType.java similarity index 78% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/LimitType.java index c609fd8a..ed262b98 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/LimitType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 限流类型 * - * @author ruoyi + * @author bms */ public enum LimitType diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/OperatorType.java similarity index 80% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/OperatorType.java index bdd143c1..5080b209 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author bms */ public enum OperatorType { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/bms-back/bms-common/src/main/java/com/bms/common/enums/UserStatus.java similarity index 89% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to bms-back/bms-common/src/main/java/com/bms/common/enums/UserStatus.java index d7ff44a9..f7f108a4 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.bms.common.enums; /** * 用户状态 * - * @author ruoyi + * @author bms */ public enum UserStatus { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/DemoModeException.java similarity index 78% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/DemoModeException.java index f6ad2ab4..da019edd 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.bms.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author bms */ public class DemoModeException extends RuntimeException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/GlobalException.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/GlobalException.java index 81a71b5d..80eca516 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.bms.common.exception; /** * 全局异常 * - * @author ruoyi + * @author bms */ public class GlobalException extends RuntimeException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/ServiceException.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/ServiceException.java index fcc7ab6e..0560d6fc 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.bms.common.exception; /** * 业务异常 * - * @author ruoyi + * @author bms */ public final class ServiceException extends RuntimeException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/UtilException.java similarity index 89% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/UtilException.java index 980fa465..4aea15f6 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.bms.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author bms */ public class UtilException extends RuntimeException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/base/BaseException.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/base/BaseException.java index b55d72e1..e3881803 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/base/BaseException.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.exception.base; +package com.bms.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; /** * 基础异常 * - * @author ruoyi + * @author bms */ public class BaseException extends RuntimeException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileException.java similarity index 69% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileException.java index 871f09b5..2212897a 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.bms.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.bms.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author bms */ public class FileException extends BaseException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9b..d4eea57a 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.bms.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author bms */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileSizeLimitExceededException.java index ec6ab054..702a3ed6 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.bms.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author bms */ public class FileSizeLimitExceededException extends FileException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileUploadException.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileUploadException.java index f45e7ef4..1e81054b 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.bms.common.exception.file; import java.io.PrintStream; import java.io.PrintWriter; @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 文件上传异常类 * - * @author ruoyi + * @author bms */ public class FileUploadException extends Exception { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/InvalidExtensionException.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/file/InvalidExtensionException.java index bb8a53f3..48c7ab54 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/file/InvalidExtensionException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.bms.common.exception.file; import java.util.Arrays; /** * 文件上传无效扩展名异常类 * - * @author ruoyi + * @author bms */ public class InvalidExtensionException extends FileUploadException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/job/TaskException.java similarity index 91% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/job/TaskException.java index a567b408..c46f2cbc 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.job; +package com.bms.common.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author bms */ public class TaskException extends Exception { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/BlackListException.java similarity index 79% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/BlackListException.java index 2bf50386..8495907d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/BlackListException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 黑名单IP异常类 * - * @author ruoyi + * @author bms */ public class BlackListException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaException.java similarity index 80% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaException.java index 389dbc75..ba2d162e 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author bms */ public class CaptchaException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaExpireException.java similarity index 81% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaExpireException.java index 85f94861..e717bf52 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author bms */ public class CaptchaExpireException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserException.java similarity index 69% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserException.java index c292d70e..1c0c5381 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.bms.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author bms */ public class UserException extends BaseException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserNotExistsException.java similarity index 80% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserNotExistsException.java index eff81812..a2c40100 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserNotExistsException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 用户不存在异常类 * - * @author ruoyi + * @author bms */ public class UserNotExistsException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordNotMatchException.java similarity index 83% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordNotMatchException.java index a7f3e5ff..cf786aba 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author bms */ public class UserPasswordNotMatchException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 86% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordRetryLimitExceedException.java index c887cf11..b1811973 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.bms.common.exception.user; /** * 用户错误最大次数异常类 * - * @author ruoyi + * @author bms */ public class UserPasswordRetryLimitExceedException extends UserException { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/PropertyPreExcludeFilter.java similarity index 89% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/PropertyPreExcludeFilter.java index e1e431b1..3a4d3165 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/PropertyPreExcludeFilter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 排除JSON敏感属性 * - * @author ruoyi + * @author bms */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RefererFilter.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/RefererFilter.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RefererFilter.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/RefererFilter.java index ac9ed163..ed4bc72b 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RefererFilter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/RefererFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import java.io.IOException; import java.util.Arrays; @@ -15,7 +15,7 @@ import jakarta.servlet.http.HttpServletResponse; /** * 防盗链过滤器 * - * @author ruoyi + * @author bms */ public class RefererFilter implements Filter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatableFilter.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatableFilter.java index efeded9d..d536a63f 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatableFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import java.io.IOException; import jakarta.servlet.Filter; @@ -9,12 +9,12 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * Repeatable 过滤器 * - * @author ruoyi + * @author bms */ public class RepeatableFilter implements Filter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatedlyRequestWrapper.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatedlyRequestWrapper.java index 5c6ee083..ba16835e 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -9,13 +9,13 @@ import jakarta.servlet.ServletInputStream; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.common.constant.Constants; +import com.bms.common.utils.http.HttpHelper; +import com.bms.common.constant.Constants; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author bms */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/XssFilter.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/XssFilter.java index 7438fc2c..08b0d6aa 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -11,13 +11,13 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.enums.HttpMethod; +import com.bms.common.utils.StringUtils; +import com.bms.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author bms */ public class XssFilter implements Filter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/bms-back/bms-common/src/main/java/com/bms/common/filter/XssHttpServletRequestWrapper.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to bms-back/bms-common/src/main/java/com/bms/common/filter/XssHttpServletRequestWrapper.java index bf7837be..ae0188b1 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.bms.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,13 +9,13 @@ import jakarta.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.html.EscapeUtil; /** * XSS过滤处理 * - * @author ruoyi + * @author bms */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/Arith.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/Arith.java index 9f95c0f3..4f7ce973 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 精确的浮点数运算 * - * @author ruoyi + * @author bms */ public class Arith { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/DateUtils.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/DateUtils.java index c1d4b55d..8d9ab0e0 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 * - * @author ruoyi + * @author bms */ @SuppressWarnings("deprecation") public class DateUtils extends org.apache.commons.lang3.time.DateUtils diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/DesensitizedUtil.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/DesensitizedUtil.java index f8a4c022..34111f0d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/DesensitizedUtil.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; /** * 脱敏工具类 * - * @author ruoyi + * @author bms */ public class DesensitizedUtil { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/DictUtils.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/DictUtils.java index 9d36bb79..c91267ed 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/DictUtils.java @@ -1,19 +1,19 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.bms.common.constant.CacheConstants; +import com.bms.common.core.domain.entity.SysDictData; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.utils.spring.SpringUtils; /** * 字典工具类 * - * @author ruoyi + * @author bms */ public class DictUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/ExceptionUtil.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/ExceptionUtil.java index 214e4a0d..6e327f59 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author bms */ public class ExceptionUtil { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/LogUtils.java similarity index 82% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/LogUtils.java index 0de30c6b..442949c2 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/LogUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; /** * 处理并记录日志文件 * - * @author ruoyi + * @author bms */ public class LogUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/MessageUtils.java similarity index 86% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/MessageUtils.java index 7dac75a3..37afafff 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/MessageUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.bms.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author ruoyi + * @author bms */ public class MessageUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/PageUtils.java similarity index 79% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/PageUtils.java index 70e9b08f..fc3ca7ee 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/PageUtils.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.bms.common.core.page.PageDomain; +import com.bms.common.core.page.TableSupport; +import com.bms.common.utils.sql.SqlUtil; /** * 分页工具类 * - * @author ruoyi + * @author bms */ public class PageUtils extends PageHelper { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/SecurityUtils.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/SecurityUtils.java index 8cd0a2f9..48af250f 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.util.Collection; import java.util.List; @@ -7,16 +7,16 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.util.PatternMatchUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; +import com.bms.common.constant.Constants; +import com.bms.common.constant.HttpStatus; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.exception.ServiceException; /** * 安全服务工具类 * - * @author ruoyi + * @author bms */ public class SecurityUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/ServletUtils.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/ServletUtils.java index 5635db7c..e8ad297f 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -14,13 +14,13 @@ import jakarta.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.Convert; +import com.bms.common.constant.Constants; +import com.bms.common.core.text.Convert; /** * 客户端工具类 * - * @author ruoyi + * @author bms */ public class ServletUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/StringUtils.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/StringUtils.java index f2770a69..d9a86f5d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -8,13 +8,13 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.Strings; import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.bms.common.constant.Constants; +import com.bms.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author bms */ @SuppressWarnings("deprecation") public class StringUtils extends org.apache.commons.lang3.StringUtils diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/Threads.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/Threads.java index 71fe6d52..1d2a4671 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bms.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** * 线程相关工具类. * - * @author ruoyi + * @author bms */ public class Threads { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanUtils.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanUtils.java index 4463662d..f7a40b75 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.bms.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author bms */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanValidators.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanValidators.java index 898aca5d..d07ea922 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.bms.common.utils.bean; import java.util.Set; import jakarta.validation.ConstraintViolation; @@ -8,7 +8,7 @@ import jakarta.validation.Validator; /** * bean对象属性验证 * - * @author ruoyi + * @author bms */ public class BeanValidators { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileTypeUtils.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileTypeUtils.java index 68130b9c..7733e3cf 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bms.common.utils.file; import java.io.File; import org.apache.commons.lang3.StringUtils; @@ -6,14 +6,14 @@ import org.apache.commons.lang3.StringUtils; /** * 文件类型工具类 * - * @author ruoyi + * @author bms */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: bms.txt, 返回: txt * * @param file 文件名 * @return 后缀(不含".") @@ -30,7 +30,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: bms.txt, 返回: txt * * @param fileName 文件名 * @return 后缀(不含".") diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUploadUtils.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUploadUtils.java index cc1b6f4b..e9d545ac 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bms.common.utils.file; import java.io.File; import java.io.IOException; @@ -6,20 +6,20 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.common.utils.uuid.Seq; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.Constants; +import com.bms.common.exception.file.FileNameLengthLimitExceededException; +import com.bms.common.exception.file.FileSizeLimitExceededException; +import com.bms.common.exception.file.InvalidExtensionException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.uuid.IdUtils; +import com.bms.common.utils.uuid.Seq; /** * 文件上传工具类 * - * @author ruoyi + * @author bms */ public class FileUploadUtils { @@ -36,7 +36,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = BmsConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -170,7 +170,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = BmsConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUtils.java similarity index 95% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUtils.java index 9f16a3d7..5445b5b4 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bms.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -14,16 +14,16 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.Constants; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.uuid.IdUtils; /** * 文件处理工具类 * - * @author ruoyi + * @author bms */ public class FileUtils { @@ -74,7 +74,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, BmsConfig.getImportPath()); } /** @@ -268,7 +268,7 @@ public class FileUtils } /** - * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * 获取文件名称 /profile/upload/2022/04/16/bms.png -- bms.png * * @param fileName 路径名称 * @return 没有文件路径的名称 @@ -286,7 +286,7 @@ public class FileUtils } /** - * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * 获取不带后缀文件名称 /profile/upload/2022/04/16/bms.png -- bms * * @param fileName 路径名称 * @return 没有文件路径和后缀的名称 diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/ImageUtils.java similarity index 90% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/file/ImageUtils.java index 432dfda6..d98c7717 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bms.common.utils.file; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -9,14 +9,14 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.Constants; +import com.bms.common.utils.StringUtils; /** * 图片处理工具类 * - * @author ruoyi + * @author bms */ public class ImageUtils { @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = BmsConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/MimeTypeUtils.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/file/MimeTypeUtils.java index 756ba5cd..26def1d2 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.file; +package com.bms.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author bms */ public class MimeTypeUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/html/EscapeUtil.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/html/EscapeUtil.java index f52e83e5..14d0033b 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.html; +package com.bms.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author bms */ public class EscapeUtil { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/html/HTMLFilter.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/html/HTMLFilter.java index ebff3fd6..680b4b22 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.html; +package com.bms.common.utils.html; import java.util.ArrayList; import java.util.Collections; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器,用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author bms */ public final class HTMLFilter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpHelper.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpHelper.java index 401f25aa..6d219a5b 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.bms.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; /** * 通用http工具封装 * - * @author ruoyi + * @author bms */ public class HttpHelper { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpUtils.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpUtils.java index 534d21cc..98bf91cc 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.bms.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -19,14 +19,14 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.Constants; +import com.bms.common.utils.StringUtils; import org.springframework.http.MediaType; /** * 通用http发送方法 * - * @author ruoyi + * @author bms */ public class HttpUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/UserAgentUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/UserAgentUtils.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/UserAgentUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/http/UserAgentUtils.java index a133be20..db784e7d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/UserAgentUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/http/UserAgentUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.utils.http; +package com.bms.common.utils.http; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; import nl.basjes.parse.useragent.UserAgent; import nl.basjes.parse.useragent.UserAgentAnalyzer; /** * UserAgent解析工具类 * - * @author ruoyi + * @author bms */ public class UserAgentUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/ip/AddressUtils.java similarity index 83% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/ip/AddressUtils.java index 9158cf64..212bd593 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/ip/AddressUtils.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.utils.ip; +package com.bms.common.utils.ip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.Constants; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.http.HttpUtils; /** * 获取地址类 * - * @author ruoyi + * @author bms */ public class AddressUtils { @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (BmsConfig.isAddressEnabled()) { try { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/ip/IpUtils.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/ip/IpUtils.java index a3764163..04bdd9e3 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/ip/IpUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.utils.ip; +package com.bms.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import jakarta.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; /** * 获取IP方法 * - * @author ruoyi + * @author bms */ public class IpUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelHandlerAdapter.java similarity index 90% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelHandlerAdapter.java index ccab2881..138f85e0 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.bms.common.utils.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Workbook; @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel数据格式处理适配器 * - * @author ruoyi + * @author bms */ public interface ExcelHandlerAdapter { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelSheet.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelSheet.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelSheet.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelSheet.java index 20ca22c1..09823521 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelSheet.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelSheet.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.bms.common.utils.poi; import java.util.ArrayList; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * return ExcelUtil.exportMultiSheet(sheets); * * - * @author ruoyi + * @author bms */ public class ExcelSheet { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelUtil.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelUtil.java index 5c3b67cd..eb903630 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.bms.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -70,26 +70,26 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.ImageUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.annotation.Excel.Type; +import com.bms.common.annotation.Excels; +import com.bms.common.config.BmsConfig; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.text.Convert; +import com.bms.common.exception.UtilException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.DictUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.file.FileTypeUtils; +import com.bms.common.utils.file.FileUtils; +import com.bms.common.utils.file.ImageUtils; +import com.bms.common.utils.reflect.ReflectUtils; /** * Excel相关处理 * - * @author ruoyi + * @author bms */ public class ExcelUtil { @@ -1621,7 +1621,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = BmsConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/reflect/ReflectUtils.java similarity index 98% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/reflect/ReflectUtils.java index 628b4c2b..bc8a47f3 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.bms.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -11,14 +11,14 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.core.text.Convert; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author bms */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Base64.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Base64.java index ca1cd924..05f8d1e8 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.sign; +package com.bms.common.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author bms */ public final class Base64 { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Md5Utils.java similarity index 96% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Md5Utils.java index c1c58dbc..f1fafa6d 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.bms.common.utils.sign; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; /** * Md5加密方法 * - * @author ruoyi + * @author bms */ public class Md5Utils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/spring/SpringUtils.java similarity index 97% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/spring/SpringUtils.java index 4e3f6039..f36ccfad 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.bms.common.utils.spring; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.AopContext; @@ -9,12 +9,12 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author bms */ @Component public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/sql/SqlUtil.java similarity index 92% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/sql/SqlUtil.java index 48dba8be..c2328641 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.sql; +package com.bms.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.exception.UtilException; +import com.bms.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author bms */ public class SqlUtil { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/IdUtils.java similarity index 94% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/IdUtils.java index 2c844271..38fe98eb 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/IdUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.uuid; +package com.bms.common.utils.uuid; /** * ID生成器工具类 * - * @author ruoyi + * @author bms */ public class IdUtils { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/Seq.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/Seq.java index bf996111..2b19d5e9 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/Seq.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.uuid; +package com.bms.common.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; /** - * @author ruoyi 序列生成类 + * @author bms 序列生成类 */ public class Seq { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/UUID.java similarity index 99% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/UUID.java index a5585d6b..5194c9d6 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/utils/uuid/UUID.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils.uuid; +package com.bms.common.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; +import com.bms.common.exception.UtilException; /** * 提供通用唯一识别码(universally unique identifier)(UUID)实现 * - * @author ruoyi + * @author bms */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/bms-back/bms-common/src/main/java/com/bms/common/xss/Xss.java similarity index 93% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to bms-back/bms-common/src/main/java/com/bms/common/xss/Xss.java index cb4b408e..5fdd52d3 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.bms.common.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author ruoyi + * @author bms */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/bms-back/bms-common/src/main/java/com/bms/common/xss/XssValidator.java similarity index 91% rename from bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to bms-back/bms-common/src/main/java/com/bms/common/xss/XssValidator.java index 7c8e4c04..9b668ba7 100644 --- a/bms-back/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/bms-back/bms-common/src/main/java/com/bms/common/xss/XssValidator.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.xss; +package com.bms.common.xss; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import java.util.regex.Matcher; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * 自定义xss校验注解实现 * - * @author ruoyi + * @author bms */ public class XssValidator implements ConstraintValidator { diff --git a/bms-back/ruoyi-framework/pom.xml b/bms-back/bms-framework/pom.xml similarity index 88% rename from bms-back/ruoyi-framework/pom.xml rename to bms-back/bms-framework/pom.xml index 328c03c3..d5233462 100644 --- a/bms-back/ruoyi-framework/pom.xml +++ b/bms-back/bms-framework/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 - ruoyi-framework + bms-framework framework框架核心 @@ -55,8 +55,8 @@ - com.ruoyi - ruoyi-system + com.bms + bms-system diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataScopeAspect.java similarity index 91% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataScopeAspect.java index 53cf56cc..de7c9ea4 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bms.framework.aspectj; import java.util.ArrayList; import java.util.List; @@ -6,22 +6,22 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.context.PermissionContextHolder; +import com.bms.common.annotation.DataScope; +import com.bms.common.constant.Constants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.text.Convert; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.security.context.PermissionContextHolder; /** * 数据过滤处理 * - * @author ruoyi + * @author bms */ @Aspect @Component diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataSourceAspect.java similarity index 83% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataSourceAspect.java index 8c2c9f43..3420f7e5 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bms.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,14 +11,14 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.bms.common.annotation.DataSource; +import com.bms.common.utils.StringUtils; +import com.bms.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 * - * @author ruoyi + * @author bms */ @Aspect @Order(1) @@ -27,8 +27,8 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.bms.common.annotation.DataSource)" + + "|| @within(com.bms.common.annotation.DataSource)") public void dsPointCut() { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/LogAspect.java similarity index 92% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/LogAspect.java index c6204fd9..f49c2f09 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bms.framework.aspectj; import java.util.Collection; import java.util.Map; @@ -17,26 +17,26 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.domain.SysOperLog; +import com.bms.common.annotation.Log; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.text.Convert; +import com.bms.common.enums.BusinessStatus; +import com.bms.common.enums.HttpMethod; +import com.bms.common.filter.PropertyPreExcludeFilter; +import com.bms.common.utils.ExceptionUtil; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.ip.IpUtils; +import com.bms.framework.manager.AsyncManager; +import com.bms.framework.manager.factory.AsyncFactory; +import com.bms.system.domain.SysOperLog; /** * 操作日志记录处理 * - * @author ruoyi + * @author bms */ @Aspect @Component diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/RateLimiterAspect.java similarity index 90% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/RateLimiterAspect.java index b720bc18..46bb7b70 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/aspectj/RateLimiterAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bms.framework.aspectj; import java.lang.reflect.Method; import java.util.Collections; @@ -13,16 +13,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; +import com.bms.common.annotation.RateLimiter; +import com.bms.common.enums.LimitType; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.ip.IpUtils; /** * 限流处理 * - * @author ruoyi + * @author bms */ @Aspect @Component diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ApplicationConfig.java similarity index 82% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/ApplicationConfig.java index 26451c69..b36f4ebe 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Configuration; @@ -7,13 +7,13 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * 程序注解配置 * - * @author ruoyi + * @author bms */ @Configuration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.bms.**.mapper") public class ApplicationConfig { } diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/CaptchaConfig.java similarity index 96% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/CaptchaConfig.java index 43e78aeb..e447212c 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author bms */ @Configuration public class CaptchaConfig @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.bms.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/DruidConfig.java similarity index 94% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/DruidConfig.java index d99a931e..d4ef60a4 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.io.IOException; import java.util.HashMap; @@ -14,10 +14,10 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot4.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot4.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.bms.common.enums.DataSourceType; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.framework.config.properties.DruidProperties; +import com.bms.framework.datasource.DynamicDataSource; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -27,7 +27,7 @@ import jakarta.servlet.ServletResponse; /** * druid 配置多数据源 * - * @author ruoyi + * @author bms */ @Configuration public class DruidConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/FastJson2JsonRedisSerializer.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/FastJson2JsonRedisSerializer.java index 4adbb7fd..64e50795 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; @@ -7,12 +7,12 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; -import com.ruoyi.common.constant.Constants; +import com.bms.common.constant.Constants; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author bms */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/FilterConfig.java similarity index 90% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/FilterConfig.java index e4189b3a..30af13c2 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.util.HashMap; import java.util.Map; @@ -8,16 +8,16 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.filter.RefererFilter; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.Constants; +import com.bms.common.filter.RefererFilter; +import com.bms.common.filter.RepeatableFilter; +import com.bms.common.filter.XssFilter; +import com.bms.common.utils.StringUtils; /** * Filter配置 * - * @author ruoyi + * @author bms */ @Configuration public class FilterConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/I18nConfig.java similarity index 92% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/I18nConfig.java index 163fd01c..f611d61c 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,12 +7,12 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; -import com.ruoyi.common.constant.Constants; +import com.bms.common.constant.Constants; /** * 资源文件配置加载 * - * @author ruoyi + * @author bms */ @Configuration public class I18nConfig implements WebMvcConfigurer diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/KaptchaTextCreator.java similarity index 97% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/KaptchaTextCreator.java index 7f8e1d50..2e1fe638 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author bms */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/MyBatisConfig.java similarity index 98% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/MyBatisConfig.java index 057c9419..dc96709d 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/MyBatisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.io.IOException; import java.util.ArrayList; @@ -22,12 +22,12 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * Mybatis支持*匹配扫描包 * - * @author ruoyi + * @author bms */ @Configuration public class MyBatisConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/RedisConfig.java similarity index 97% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/RedisConfig.java index 3453237e..90e0479c 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -12,7 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author ruoyi + * @author bms */ @SuppressWarnings("deprecation") @Configuration diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ResourcesConfig.java similarity index 88% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/ResourcesConfig.java index 0f48b11c..faa80e98 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; @@ -11,14 +11,14 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.bms.common.config.BmsConfig; +import com.bms.common.constant.Constants; +import com.bms.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 * - * @author ruoyi + * @author bms */ @Configuration public class ResourcesConfig implements WebMvcConfigurer @@ -31,7 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + BmsConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/RestTemplateConfig.java similarity index 92% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/RestTemplateConfig.java index ea1972c1..9b64d512 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import java.time.Duration; import org.springframework.context.annotation.Bean; @@ -9,7 +9,7 @@ import org.springframework.web.client.RestTemplate; /** * RestTemplate配置 * - * @author ruoyi + * @author bms */ @Configuration public class RestTemplateConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/SecurityConfig.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/SecurityConfig.java index 091d37ab..8a149548 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -14,15 +14,15 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.config.properties.PermitAllUrlProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.bms.framework.config.properties.PermitAllUrlProperties; +import com.bms.framework.security.filter.JwtAuthenticationTokenFilter; +import com.bms.framework.security.handle.AuthenticationEntryPointImpl; +import com.bms.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 * - * @author ruoyi + * @author bms */ @EnableMethodSecurity(prePostEnabled = true, securedEnabled = true) @Configuration diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ServerConfig.java similarity index 88% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/ServerConfig.java index cd8fb091..738b5356 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ServerConfig.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.bms.common.utils.ServletUtils; /** * 服务相关配置 * - * @author ruoyi + * @author bms */ @Component public class ServerConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ThreadPoolConfig.java similarity index 95% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/ThreadPoolConfig.java index 09ce6bd5..cace85fc 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.bms.framework.config; -import com.ruoyi.common.utils.Threads; +import com.bms.common.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 线程池配置 * - * @author ruoyi + * @author bms **/ @Configuration public class ThreadPoolConfig diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/DruidProperties.java similarity index 98% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/DruidProperties.java index c8a5c8a7..a947e796 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.bms.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 * - * @author ruoyi + * @author bms */ @Configuration public class DruidProperties diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/PermitAllUrlProperties.java similarity index 96% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/PermitAllUrlProperties.java index a7d0de2e..3e02afdc 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/PermitAllUrlProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.bms.framework.config.properties; import java.util.ArrayList; import java.util.List; @@ -16,12 +16,12 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import com.ruoyi.common.annotation.Anonymous; +import com.bms.common.annotation.Anonymous; /** * 设置Anonymous注解允许匿名访问的url * - * @author ruoyi + * @author bms */ @Configuration public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/TmsApiProperties.java b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/TmsApiProperties.java similarity index 90% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/TmsApiProperties.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/TmsApiProperties.java index e87b516f..577ca059 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/TmsApiProperties.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/config/properties/TmsApiProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.bms.framework.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * TMS open API properties. * - * @author ruoyi + * @author bms */ @Component @ConfigurationProperties(prefix = "bms.tms") diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSource.java similarity index 91% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSource.java index e70b8cfa..33e905cf 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.bms.framework.datasource; import java.util.Map; import javax.sql.DataSource; @@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; /** * 动态数据源 * - * @author ruoyi + * @author bms */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSourceContextHolder.java similarity index 94% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSourceContextHolder.java index 9770af6d..6c29c1a5 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.bms.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; /** * 数据源切换处理 * - * @author ruoyi + * @author bms */ public class DynamicDataSourceContextHolder { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/RepeatSubmitInterceptor.java similarity index 89% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/RepeatSubmitInterceptor.java index 4e8d20f3..fe2f7cdb 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.bms.framework.interceptor; import java.lang.reflect.Method; import jakarta.servlet.http.HttpServletRequest; @@ -7,14 +7,14 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; +import com.bms.common.annotation.RepeatSubmit; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.utils.ServletUtils; /** * 防止重复提交拦截器 * - * @author ruoyi + * @author bms */ @Component public abstract class RepeatSubmitInterceptor implements HandlerInterceptor diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 89% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/impl/SameUrlDataInterceptor.java index c93df50a..9717765b 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.impl; +package com.bms.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; @@ -8,19 +8,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.bms.common.annotation.RepeatSubmit; +import com.bms.common.constant.CacheConstants; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.filter.RepeatedlyRequestWrapper; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.http.HttpHelper; +import com.bms.framework.interceptor.RepeatSubmitInterceptor; /** * 判断请求url和数据是否和上一次相同, * 如果和上次相同,则是重复提交表单。 有效时间为10秒内。 * - * @author ruoyi + * @author bms */ @Component public class SameUrlDataInterceptor extends RepeatSubmitInterceptor diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/AsyncManager.java similarity index 87% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/manager/AsyncManager.java index 7387a02c..5ca8c5c5 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/AsyncManager.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.manager; +package com.bms.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.bms.common.utils.Threads; +import com.bms.common.utils.spring.SpringUtils; /** * 异步任务管理器 * - * @author ruoyi + * @author bms */ public class AsyncManager { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/ShutdownManager.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/manager/ShutdownManager.java index 095b8657..091cec39 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.bms.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import jakarta.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 * - * @author ruoyi + * @author bms */ @Component public class ShutdownManager diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/factory/AsyncFactory.java similarity index 82% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/manager/factory/AsyncFactory.java index b20ad92b..1aaa4ea0 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/manager/factory/AsyncFactory.java @@ -1,25 +1,25 @@ -package com.ruoyi.framework.manager.factory; +package com.bms.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.UserAgentUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; +import com.bms.common.constant.Constants; +import com.bms.common.utils.LogUtils; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.http.UserAgentUtils; +import com.bms.common.utils.ip.AddressUtils; +import com.bms.common.utils.ip.IpUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.system.domain.SysLogininfor; +import com.bms.system.domain.SysOperLog; +import com.bms.system.service.ISysLogininforService; +import com.bms.system.service.ISysOperLogService; /** * 异步工厂(产生任务用) * - * @author ruoyi + * @author bms */ public class AsyncFactory { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java b/bms-back/bms-framework/src/main/java/com/bms/framework/security/context/AuthenticationContextHolder.java similarity index 89% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/security/context/AuthenticationContextHolder.java index 6c776ce3..31bfa6d1 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/security/context/AuthenticationContextHolder.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.security.context; +package com.bms.framework.security.context; import org.springframework.security.core.Authentication; /** * 身份验证信息 * - * @author ruoyi + * @author bms */ public class AuthenticationContextHolder { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/bms-back/bms-framework/src/main/java/com/bms/framework/security/context/PermissionContextHolder.java similarity index 87% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/security/context/PermissionContextHolder.java index 5472f3d2..61a55172 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/security/context/PermissionContextHolder.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.security.context; +package com.bms.framework.security.context; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import com.ruoyi.common.core.text.Convert; +import com.bms.common.core.text.Convert; /** * 权限信息 * - * @author ruoyi + * @author bms */ public class PermissionContextHolder { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/bms-back/bms-framework/src/main/java/com/bms/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 86% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/security/filter/JwtAuthenticationTokenFilter.java index 9d2f494d..0f3f3f61 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.bms.framework.security.filter; import java.io.IOException; import jakarta.servlet.FilterChain; @@ -11,15 +11,15 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.web.service.TokenService; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author bms */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 81% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/AuthenticationEntryPointImpl.java index e1789f89..d17d6d27 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.bms.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,15 +8,15 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.HttpStatus; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author bms */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 75% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/LogoutSuccessHandlerImpl.java index 595bd3fb..e2832190 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.bms.framework.security.handle; import java.io.IOException; import jakarta.servlet.ServletException; @@ -9,20 +9,20 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; +import com.bms.common.constant.Constants; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.manager.AsyncManager; +import com.bms.framework.manager.factory.AsyncFactory; +import com.bms.framework.web.service.TokenService; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author bms */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/Server.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/Server.java index 63b03da7..c83538b3 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.bms.framework.web.domain; import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.bms.common.utils.Arith; +import com.bms.common.utils.ip.IpUtils; +import com.bms.framework.web.domain.server.Cpu; +import com.bms.framework.web.domain.server.Jvm; +import com.bms.framework.web.domain.server.Mem; +import com.bms.framework.web.domain.server.Sys; +import com.bms.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; @@ -24,7 +24,7 @@ import oshi.util.Util; /** * 服务器相关信息 * - * @author ruoyi + * @author bms */ public class Server { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Cpu.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Cpu.java index a13a66cf..1190067f 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Cpu.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.bms.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.bms.common.utils.Arith; /** * CPU相关信息 * - * @author ruoyi + * @author bms */ public class Cpu { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Jvm.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Jvm.java index 1fdc6ac8..c4518d03 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Jvm.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.domain.server; +package com.bms.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.bms.common.utils.Arith; +import com.bms.common.utils.DateUtils; /** * JVM相关信息 * - * @author ruoyi + * @author bms */ public class Jvm { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Mem.java similarity index 89% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Mem.java index 13eec521..ce242ea8 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Mem.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.bms.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.bms.common.utils.Arith; /** * 內存相关信息 * - * @author ruoyi + * @author bms */ public class Mem { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Sys.java similarity index 94% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Sys.java index 45d64d9c..e7dba38e 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/Sys.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.bms.framework.web.domain.server; /** * 系统相关信息 * - * @author ruoyi + * @author bms */ public class Sys { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/SysFile.java similarity index 96% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/SysFile.java index 1320cde6..312de721 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/domain/server/SysFile.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.bms.framework.web.domain.server; /** * 系统文件相关信息 * - * @author ruoyi + * @author bms */ public class SysFile { diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/exception/GlobalExceptionHandler.java similarity index 94% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/exception/GlobalExceptionHandler.java index 1a0ecb80..5184b9dc 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.bms.framework.web.exception; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -12,16 +12,16 @@ import org.springframework.web.bind.MissingPathVariableException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.HttpStatus; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.exception.DemoModeException; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; /** * 全局异常处理器 * - * @author ruoyi + * @author bms */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/PermissionService.java similarity index 90% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/PermissionService.java index fa0dfef9..03f6fa80 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/PermissionService.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import java.util.Set; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.context.PermissionContextHolder; +import com.bms.common.constant.Constants; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.security.context.PermissionContextHolder; /** - * RuoYi首创 自定义权限实现,ss取自SpringSecurity首字母 + * Bms首创 自定义权限实现,ss取自SpringSecurity首字母 * - * @author ruoyi + * @author bms */ @Service("ss") public class PermissionService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysLoginService.java similarity index 83% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysLoginService.java index 8a77ead5..f9dc6202 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,31 +7,31 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.user.BlackListException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserNotExistsException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.constant.CacheConstants; +import com.bms.common.constant.Constants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.exception.ServiceException; +import com.bms.common.exception.user.BlackListException; +import com.bms.common.exception.user.CaptchaException; +import com.bms.common.exception.user.CaptchaExpireException; +import com.bms.common.exception.user.UserNotExistsException; +import com.bms.common.exception.user.UserPasswordNotMatchException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.ip.IpUtils; +import com.bms.framework.manager.AsyncManager; +import com.bms.framework.manager.factory.AsyncFactory; +import com.bms.framework.security.context.AuthenticationContextHolder; +import com.bms.system.service.ISysConfigService; +import com.bms.system.service.ISysUserService; /** * 登录校验方法 * - * @author ruoyi + * @author bms */ @Component public class SysLoginService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPasswordService.java similarity index 82% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPasswordService.java index 6728c7bb..5e560750 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPasswordService.java @@ -1,22 +1,22 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; +import com.bms.common.constant.CacheConstants; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.exception.user.UserPasswordNotMatchException; +import com.bms.common.exception.user.UserPasswordRetryLimitExceedException; +import com.bms.common.utils.SecurityUtils; +import com.bms.framework.security.context.AuthenticationContextHolder; /** * 登录密码方法 * - * @author ruoyi + * @author bms */ @Component public class SysPasswordService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPermissionService.java similarity index 84% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPermissionService.java index 17960f64..3cedd95d 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysPermissionService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import java.util.HashSet; import java.util.List; @@ -6,18 +6,18 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.bms.common.constant.Constants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.utils.StringUtils; +import com.bms.system.service.ISysMenuService; +import com.bms.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author bms */ @Component public class SysPermissionService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysRegisterService.java similarity index 77% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysRegisterService.java index 8305bcb1..f037191d 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/SysRegisterService.java @@ -1,28 +1,28 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.constant.CacheConstants; +import com.bms.common.constant.Constants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.RegisterBody; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.exception.user.CaptchaException; +import com.bms.common.exception.user.CaptchaExpireException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.framework.manager.AsyncManager; +import com.bms.framework.manager.factory.AsyncFactory; +import com.bms.system.service.ISysConfigService; +import com.bms.system.service.ISysUserService; /** * 注册校验方法 * - * @author ruoyi + * @author bms */ @Component public class SysRegisterService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/TokenService.java similarity index 93% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/TokenService.java index ed7e574d..0c3cbc39 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import java.util.Collection; import java.util.HashMap; @@ -9,16 +9,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.UserAgentUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.bms.common.constant.CacheConstants; +import com.bms.common.constant.Constants; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.utils.ServletUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.http.UserAgentUtils; +import com.bms.common.utils.ip.AddressUtils; +import com.bms.common.utils.ip.IpUtils; +import com.bms.common.utils.uuid.IdUtils; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -27,7 +27,7 @@ import jakarta.servlet.http.HttpServletRequest; /** * token验证处理 * - * @author ruoyi + * @author bms */ @Component public class TokenService diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/UserDetailsServiceImpl.java similarity index 83% rename from bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to bms-back/bms-framework/src/main/java/com/bms/framework/web/service/UserDetailsServiceImpl.java index 5dcdf90e..c27e0e36 100644 --- a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/bms-back/bms-framework/src/main/java/com/bms/framework/web/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.bms.framework.web.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,18 +7,18 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.enums.UserStatus; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.system.service.ISysUserService; /** * 用户验证处理 * - * @author ruoyi + * @author bms */ @Service public class UserDetailsServiceImpl implements UserDetailsService diff --git a/bms-back/ruoyi-generator/pom.xml b/bms-back/bms-generator/pom.xml similarity index 81% rename from bms-back/ruoyi-generator/pom.xml rename to bms-back/bms-generator/pom.xml index 6f3345a5..c8fdedd1 100644 --- a/bms-back/ruoyi-generator/pom.xml +++ b/bms-back/bms-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 - ruoyi-generator + bms-generator generator代码生成 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common + com.bms + bms-common diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/bms-back/bms-generator/src/main/java/com/bms/generator/config/GenConfig.java similarity index 97% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/config/GenConfig.java index c01857ca..4d3fe264 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.bms.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author bms */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/bms-back/bms-generator/src/main/java/com/bms/generator/controller/GenController.java similarity index 92% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/controller/GenController.java index aa763f81..428128a7 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.controller; +package com.bms.generator.controller; import java.io.IOException; import java.util.ArrayList; @@ -23,24 +23,24 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.core.text.Convert; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.sql.SqlUtil; +import com.bms.generator.config.GenConfig; +import com.bms.generator.domain.GenTable; +import com.bms.generator.domain.GenTableColumn; +import com.bms.generator.service.IGenTableColumnService; +import com.bms.generator.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/tool/gen") @@ -256,7 +256,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"bms.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTable.java similarity index 97% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTable.java index bae2bb5f..6772477d 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTable.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.domain; +package com.bms.generator.domain; import java.util.List; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.constant.GenConstants; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.utils.StringUtils; /** * 业务表 gen_table * - * @author ruoyi + * @author bms */ public class GenTable extends BaseEntity { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTableColumn.java similarity index 98% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTableColumn.java index 3dc6d624..54ebc202 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/domain/GenTableColumn.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.domain; +package com.bms.generator.domain; import jakarta.validation.constraints.NotBlank; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.utils.StringUtils; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author bms */ public class GenTableColumn extends BaseEntity { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableColumnMapper.java similarity index 92% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableColumnMapper.java index 951e1667..9068b542 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableColumnMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.bms.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.bms.generator.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author bms */ public interface GenTableColumnMapper { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableMapper.java similarity index 94% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableMapper.java index 937656dc..d0b6b146 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/mapper/GenTableMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.bms.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTable; +import com.bms.generator.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author bms */ public interface GenTableMapper { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableColumnServiceImpl.java similarity index 87% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableColumnServiceImpl.java index 0679689d..a5cf3d8c 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableColumnServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.service; +package com.bms.generator.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.bms.common.core.text.Convert; +import com.bms.generator.domain.GenTableColumn; +import com.bms.generator.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableServiceImpl.java similarity index 96% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableServiceImpl.java index e8514877..8c853294 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.bms.generator.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -25,23 +25,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.bms.common.constant.Constants; +import com.bms.common.constant.GenConstants; +import com.bms.common.core.text.CharsetKit; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.generator.domain.GenTable; +import com.bms.generator.domain.GenTableColumn; +import com.bms.generator.mapper.GenTableColumnMapper; +import com.bms.generator.mapper.GenTableMapper; +import com.bms.generator.util.GenUtils; +import com.bms.generator.util.VelocityInitializer; +import com.bms.generator.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableColumnService.java similarity index 89% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableColumnService.java index 3037f707..837cfe10 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableColumnService.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.service; +package com.bms.generator.service; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.bms.generator.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author bms */ public interface IGenTableColumnService { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableService.java similarity index 96% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableService.java index 52d28c47..4c273fdb 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/service/IGenTableService.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.service; +package com.bms.generator.service; import java.util.List; import java.util.Map; -import com.ruoyi.generator.domain.GenTable; +import com.bms.generator.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author bms */ public interface IGenTableService { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/bms-back/bms-generator/src/main/java/com/bms/generator/util/GenUtils.java similarity index 95% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/util/GenUtils.java index e7ebc201..d0aec5e4 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/util/GenUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.util; +package com.bms.generator.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.bms.common.constant.GenConstants; +import com.bms.common.utils.StringUtils; +import com.bms.generator.config.GenConfig; +import com.bms.generator.domain.GenTable; +import com.bms.generator.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author bms */ public class GenUtils { @@ -215,7 +215,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|BMS)", ""); } /** diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityInitializer.java similarity index 89% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityInitializer.java index 9f694038..c196fe9b 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityInitializer.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.util; +package com.bms.generator.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.bms.common.constant.Constants; /** * VelocityEngine工厂 * - * @author ruoyi + * @author bms */ public class VelocityInitializer { diff --git a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityUtils.java similarity index 98% rename from bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityUtils.java index cf6d4b68..1608f139 100644 --- a/bms-back/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/bms-back/bms-generator/src/main/java/com/bms/generator/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.util; +package com.bms.generator.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,16 +7,16 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.bms.common.constant.GenConstants; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; +import com.bms.generator.domain.GenTable; +import com.bms.generator.domain.GenTableColumn; /** * 模板处理工具类 * - * @author ruoyi + * @author bms */ public class VelocityUtils { diff --git a/bms-back/ruoyi-generator/src/main/resources/generator.yml b/bms-back/bms-generator/src/main/resources/generator.yml similarity index 88% rename from bms-back/ruoyi-generator/src/main/resources/generator.yml rename to bms-back/bms-generator/src/main/resources/generator.yml index d1cbf48d..19912f21 100644 --- a/bms-back/ruoyi-generator/src/main/resources/generator.yml +++ b/bms-back/bms-generator/src/main/resources/generator.yml @@ -1,9 +1,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: bms # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.bms.system # 自动去除表前缀,默认是false autoRemovePre: false # 表前缀(生成类名不会包含表前缀,多个用逗号分隔) diff --git a/bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/bms-back/bms-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 99% rename from bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to bms-back/bms-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 32e01fff..5d550d66 100644 --- a/bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/bms-back/bms-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/bms-back/bms-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to bms-back/bms-generator/src/main/resources/mapper/generator/GenTableMapper.xml index c27b71b6..70e77654 100644 --- a/bms-back/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/bms-back/bms-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/controller.java.vm similarity index 93% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/controller.java.vm index b8457a38..bc7d6243 100644 --- a/bms-back/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/bms-back/bms-generator/src/main/resources/vm/java/controller.java.vm @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.bms.common.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; +import com.bms.common.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/domain.java.vm similarity index 95% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/domain.java.vm index b236ef00..a575c6bf 100644 --- a/bms-back/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/bms-back/bms-generator/src/main/resources/vm/java/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; +import com.bms.common.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.bms.common.core.domain.TreeEntity; #end /** diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/service.java.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 98% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/serviceImpl.java.vm index 14746e1a..64b73a17 100644 --- a/bms-back/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/bms-back/bms-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; +import com.bms.common.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/bms-back/bms-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 95% rename from bms-back/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to bms-back/bms-generator/src/main/resources/vm/java/sub-domain.java.vm index a3f53eba..f6daa28f 100644 --- a/bms-back/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/bms-back/bms-generator/src/main/resources/vm/java/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/bms-back/bms-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to bms-back/bms-generator/src/main/resources/vm/js/api.js.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/bms-back/bms-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to bms-back/bms-generator/src/main/resources/vm/sql/sql.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/bms-back/bms-generator/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to bms-back/bms-generator/src/main/resources/vm/ts/api.ts.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/ts/index.ts.vm b/bms-back/bms-generator/src/main/resources/vm/ts/index.ts.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/ts/index.ts.vm rename to bms-back/bms-generator/src/main/resources/vm/ts/index.ts.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/ts/type.ts.vm b/bms-back/bms-generator/src/main/resources/vm/ts/type.ts.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/ts/type.ts.vm rename to bms-back/bms-generator/src/main/resources/vm/ts/type.ts.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/view.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3/view.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3/view.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3/view.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/index-tree.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3ts/index-tree.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/index-tree.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3ts/index-tree.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/index.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3ts/index.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/index.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3ts/index.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/view.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/v3ts/view.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/v3ts/view.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/v3ts/view.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/vue/view.vue.vm b/bms-back/bms-generator/src/main/resources/vm/vue/view.vue.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/vue/view.vue.vm rename to bms-back/bms-generator/src/main/resources/vm/vue/view.vue.vm diff --git a/bms-back/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/bms-back/bms-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from bms-back/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to bms-back/bms-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/bms-back/ruoyi-quartz/pom.xml b/bms-back/bms-quartz/pom.xml similarity index 78% rename from bms-back/ruoyi-quartz/pom.xml rename to bms-back/bms-quartz/pom.xml index 69c3c799..ed0be08a 100644 --- a/bms-back/ruoyi-quartz/pom.xml +++ b/bms-back/bms-quartz/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 - ruoyi-quartz + bms-quartz quartz定时任务 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common + com.bms + bms-common diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/config/ScheduleConfig.java similarity index 92% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/config/ScheduleConfig.java index d4e065a1..a7155370 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.quartz.config; +//package com.bms.quartz.config; // //import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Configuration; @@ -9,7 +9,7 @@ ///** // * 定时任务配置(单机部署建议删除此类和qrtz数据库表,默认走内存会最高效) // * -// * @author ruoyi +// * @author bms // */ //@Configuration //public class ScheduleConfig @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "BmsScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("BmsScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobController.java similarity index 91% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobController.java index b9f7c20c..eed4645d 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.bms.quartz.controller; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -13,24 +13,24 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; +import com.bms.common.annotation.Log; +import com.bms.common.constant.Constants; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.exception.job.TaskException; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.quartz.domain.SysJob; +import com.bms.quartz.service.ISysJobService; +import com.bms.quartz.util.CronUtils; +import com.bms.quartz.util.ScheduleUtils; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/job") diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobLogController.java similarity index 85% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobLogController.java index 233361b3..5dde45e3 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.bms.quartz.controller; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bms.common.annotation.Log; +import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; +import com.bms.common.core.page.TableDataInfo; +import com.bms.common.enums.BusinessType; +import com.bms.common.utils.poi.ExcelUtil; +import com.bms.quartz.domain.SysJobLog; +import com.bms.quartz.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author bms */ @RestController @RequestMapping("/monitor/jobLog") diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJob.java similarity index 92% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJob.java index cea12dc3..342f96e0 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.domain; +package com.bms.quartz.domain; import java.util.Date; import jakarta.validation.constraints.NotBlank; @@ -6,17 +6,17 @@ import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.quartz.util.CronUtils; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.constant.ScheduleConstants; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.utils.StringUtils; +import com.bms.quartz.util.CronUtils; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author bms */ public class SysJob extends BaseEntity { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJobLog.java similarity index 95% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJobLog.java index 6b160f92..b22dc4e6 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/domain/SysJobLog.java @@ -1,16 +1,16 @@ -package com.ruoyi.quartz.domain; +package com.bms.quartz.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author bms */ public class SysJobLog extends BaseEntity { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobLogMapper.java similarity index 93% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobLogMapper.java index 727d9169..59547332 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.bms.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.bms.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author bms */ public interface SysJobLogMapper { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobMapper.java similarity index 93% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobMapper.java index 20f45dbb..23501c86 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/mapper/SysJobMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.bms.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.quartz.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author bms */ public interface SysJobMapper { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobLogService.java similarity index 92% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobLogService.java index 8546792a..2b42648a 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.service; +package com.bms.quartz.service; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.bms.quartz.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author bms */ public interface ISysJobLogService { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobService.java similarity index 93% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobService.java index 437ade82..7a71f3f2 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/ISysJobService.java @@ -1,14 +1,14 @@ -package com.ruoyi.quartz.service; +package com.bms.quartz.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.common.exception.job.TaskException; +import com.bms.quartz.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author bms */ public interface ISysJobService { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobLogServiceImpl.java similarity index 89% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobLogServiceImpl.java index 812eed77..cd4138e7 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.quartz.service.impl; +package com.bms.quartz.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bms.quartz.domain.SysJobLog; +import com.bms.quartz.mapper.SysJobLogMapper; +import com.bms.quartz.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author bms */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobServiceImpl.java similarity index 94% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobServiceImpl.java index 78ebef80..972de265 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.service.impl; +package com.bms.quartz.service.impl; import java.util.List; import jakarta.annotation.PostConstruct; @@ -9,18 +9,18 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; +import com.bms.common.constant.ScheduleConstants; +import com.bms.common.exception.job.TaskException; +import com.bms.quartz.domain.SysJob; +import com.bms.quartz.mapper.SysJobMapper; +import com.bms.quartz.service.ISysJobService; +import com.bms.quartz.util.CronUtils; +import com.bms.quartz.util.ScheduleUtils; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author bms */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/task/RyTask.java similarity index 86% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/task/RyTask.java index 853243ba..c56a8145 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/task/RyTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.task; +package com.bms.quartz.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author bms */ @Component("ryTask") public class RyTask diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/AbstractQuartzJob.java similarity index 85% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/AbstractQuartzJob.java index a16744dc..d39d3e34 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/AbstractQuartzJob.java @@ -1,24 +1,24 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import java.util.Date; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bms.common.constant.Constants; +import com.bms.common.constant.ScheduleConstants; +import com.bms.common.utils.ExceptionUtil; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.bean.BeanUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.quartz.domain.SysJob; +import com.bms.quartz.domain.SysJobLog; +import com.bms.quartz.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author bms */ public abstract class AbstractQuartzJob implements Job { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/CronUtils.java similarity index 96% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/CronUtils.java index dd538397..33636e7d 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import java.text.ParseException; import java.util.Date; @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author bms * */ public class CronUtils diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/JobInvokeUtil.java similarity index 96% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/JobInvokeUtil.java index dea8cde0..17df6104 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/JobInvokeUtil.java @@ -1,17 +1,17 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.quartz.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author bms */ public class JobInvokeUtil { diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 82% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzDisallowConcurrentExecution.java index 5e135580..bae21382 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,13 +1,13 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.quartz.domain.SysJob; /** * 定时任务处理(禁止并发执行) * - * @author ruoyi + * @author bms * */ @DisallowConcurrentExecution diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzJobExecution.java similarity index 78% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzJobExecution.java index e9753261..ae3c48a1 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/QuartzJobExecution.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.quartz.domain.SysJob; /** * 定时任务处理(允许并发执行) * - * @author ruoyi + * @author bms * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/ScheduleUtils.java similarity index 92% rename from bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to bms-back/bms-quartz/src/main/java/com/bms/quartz/util/ScheduleUtils.java index 5a83f508..8bc262bd 100644 --- a/bms-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/bms-back/bms-quartz/src/main/java/com/bms/quartz/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.bms.quartz.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,18 +10,18 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; +import com.bms.common.constant.Constants; +import com.bms.common.constant.ScheduleConstants; +import com.bms.common.exception.job.TaskException; +import com.bms.common.exception.job.TaskException.Code; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.quartz.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author bms * */ public class ScheduleUtils diff --git a/bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 98% rename from bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index bc6f8647..e30d2135 100644 --- a/bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 98% rename from bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 38418529..2ad69dad 100644 --- a/bms-back/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/bms-back/bms-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/pom.xml b/bms-back/bms-system/pom.xml similarity index 80% rename from bms-back/ruoyi-system/pom.xml rename to bms-back/bms-system/pom.xml index 485bc844..616b9b53 100644 --- a/bms-back/ruoyi-system/pom.xml +++ b/bms-back/bms-system/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + bms + com.bms 3.9.2 4.0.0 - ruoyi-system + bms-system system系统模块 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.bms + bms-common diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/config/ArBillExportTaskConfig.java b/bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/config/ArBillExportTaskConfig.java rename to bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java index a330b51e..704bd650 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/config/ArBillExportTaskConfig.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.config; +package com.bms.ar.config; import java.util.concurrent.ThreadPoolExecutor; import org.springframework.context.annotation.Bean; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBalanceWriteoff.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBalanceWriteoff.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java index 34aa9954..576c4625 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBalanceWriteoff.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java @@ -1,9 +1,9 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; *

用客户账户余额核销应收账单,和客户账户余额流水联动, * 共享 ar_bill.written_off_amount / unwritten_amount 缓存。

* - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBankAccount.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBankAccount.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java index b369ae3a..0fd69fe4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBankAccount.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBill.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBill.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java index 0edda125..2ecc0c1f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.math.BigDecimal; import java.util.Date; @@ -6,7 +6,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetail.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetail.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java index 2c8b2d03..16b85456 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetailFee.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetailFee.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java index d8521da0..8c47158d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetailFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillExport.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillExport.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java index 0908ec36..fbb7650c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillExport.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillGenerateTask.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillGenerateTask.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java index 2187cfc0..ca5107f2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillGenerateTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillLog.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillLog.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java index ba217d9b..e939e82f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillLog.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArExportTemplate.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArExportTemplate.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java index 35c89842..237bcdd0 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArExportTemplate.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain; +package com.bms.ar.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillActionRequest.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java similarity index 83% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillActionRequest.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java index f5d005ea..35f5fe6d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillActionRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain.vo; +package com.bms.ar.domain.vo; import lombok.Data; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateQuery.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateQuery.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java index fecba752..02cd5f85 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain.vo; +package com.bms.ar.domain.vo; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateRequest.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateRequest.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java index 595728c3..a70e893a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillGenerateRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.domain.vo; +package com.bms.ar.domain.vo; import java.util.Date; import java.util.List; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import com.ruoyi.common.config.serializer.StrictDateDeserializer; -import com.ruoyi.ar.enums.ArBillSelectionMode; +import com.bms.common.config.serializer.StrictDateDeserializer; +import com.bms.ar.enums.ArBillSelectionMode; import lombok.Data; /** 从订单计费结果生成正式账单的参数。 */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillQuery.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillQuery.java rename to bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java index dee0b83e..1952c824 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/vo/ArBillQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java @@ -1,8 +1,8 @@ -package com.ruoyi.ar.domain.vo; +package com.bms.ar.domain.vo; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; -import com.ruoyi.ar.domain.ArBill; +import com.bms.ar.domain.ArBill; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBalanceWriteoffStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBalanceWriteoffStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java index 1f1c696e..d0bfc9ab 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBalanceWriteoffStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** * 应收账单余额核销单状态。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerateTaskStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerateTaskStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java index bc216ef2..2088908f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerateTaskStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收账单异步生成任务状态。 */ public final class ArBillGenerateTaskStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerationStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerationStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java index a32c7506..e8513d17 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillGenerationStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收账单生成状态,与账单业务状态分离。 */ public final class ArBillGenerationStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillSelectionMode.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillSelectionMode.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java index 427ad3e5..2bd1799c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillSelectionMode.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** * 应收账单生成时的订单选择模式。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java index 430222b3..08b59d3b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArBillStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收账单状态。数据库保存值使用 code,避免业务代码散落状态字符串。 */ public enum ArBillStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArExportStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArExportStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java index c0643ec6..f25f5973 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArExportStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** * 应收账单导出任务状态。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArIncomeBillFeeStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArIncomeBillFeeStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java index 45a09e37..65710904 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArIncomeBillFeeStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收费用明细是否已经生成正式应收账单。 */ public enum ArIncomeBillFeeStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogObjectType.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogObjectType.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java index 5ab98272..a4e899d5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogObjectType.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收日志关联对象类型。 */ public enum ArLogObjectType diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationSource.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationSource.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java index e2359fd4..e5ae2830 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationSource.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收日志操作来源。 */ public enum ArLogOperationSource diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationType.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationType.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java index ceeff672..cd84e3d1 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogOperationType.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收日志操作类型。 */ public enum ArLogOperationType diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogResult.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogResult.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java index 22031a84..7d61a1b3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArLogResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 应收操作日志结果。 */ public enum ArLogResult diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArOrderBillStatus.java b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArOrderBillStatus.java rename to bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java index 88552aa5..3d881d95 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/enums/ArOrderBillStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.enums; +package com.bms.ar.enums; /** 计费订单的应收账单状态。 */ public enum ArOrderBillStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillExportTaskEvent.java b/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillExportTaskEvent.java rename to bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java index b623203d..d9c17dc9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillExportTaskEvent.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.event; +package com.bms.ar.event; /** * 应收账单导出任务已提交事件。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillGenerateTaskEvent.java b/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillGenerateTaskEvent.java rename to bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java index 0ca6f70c..0f72a8f5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/event/ArBillGenerateTaskEvent.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.event; +package com.bms.ar.event; /** * 应收账单异步生成任务已提交事件。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBalanceWriteoffMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBalanceWriteoffMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java index d8707003..d21664cb 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBalanceWriteoffMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBalanceWriteoff; +import com.bms.ar.domain.ArBalanceWriteoff; /** * 应收账单余额核销 Mapper * - * @author ruoyi + * @author bms * @date 2026-09-16 */ public interface ArBalanceWriteoffMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBankAccountMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBankAccountMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java index e0805f0f..9fc77e6c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBankAccountMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBankAccount; +import com.bms.ar.domain.ArBankAccount; public interface ArBankAccountMapper { ArBankAccount selectDefaultByCurrency(@Param("currency") String currency); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailFeeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java index f9c36cb5..7b0a0909 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBillDetailFee; +import com.bms.ar.domain.ArBillDetailFee; public interface ArBillDetailFeeMapper { List selectByDetailId(Long detailId); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java index 1c5874a3..2830888e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBillDetail; +import com.bms.ar.domain.ArBillDetail; public interface ArBillDetailMapper { List selectByBillId(Long arBillId); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillExportMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillExportMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java index 38703ee5..959725b7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillExportMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBillExport; +import com.bms.ar.domain.ArBillExport; public interface ArBillExportMapper { List selectByBillId(Long arBillId); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillGenerateTaskMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillGenerateTaskMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java index 15b2192b..5e0d9af4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillGenerateTaskMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBillGenerateTask; +import com.bms.ar.domain.ArBillGenerateTask; /** * 应收账单异步生成任务 Mapper。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillLogMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillLogMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java index 6f6279de..d98f5087 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillLogMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBillLog; +import com.bms.ar.domain.ArBillLog; public interface ArBillLogMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java index 85816da3..be476768 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.math.BigDecimal; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArBill; -import com.ruoyi.ar.domain.vo.ArBillQuery; +import com.bms.ar.domain.ArBill; +import com.bms.ar.domain.vo.ArBillQuery; public interface ArBillMapper { List selectArBillList(ArBillQuery query); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArExportTemplateMapper.java b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java similarity index 83% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArExportTemplateMapper.java rename to bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java index 3321ba5c..55d79fb9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/mapper/ArExportTemplateMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.ar.mapper; +package com.bms.ar.mapper; import java.util.Date; import org.apache.ibatis.annotations.Param; -import com.ruoyi.ar.domain.ArExportTemplate; +import com.bms.ar.domain.ArExportTemplate; public interface ArExportTemplateMapper { /** diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java index 32c5babf..471d70f1 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java @@ -1,15 +1,15 @@ -package com.ruoyi.ar.service; +package com.bms.ar.service; import java.util.List; -import com.ruoyi.ar.domain.ArBalanceWriteoff; -import com.ruoyi.ar.domain.ArBill; +import com.bms.ar.domain.ArBalanceWriteoff; +import com.bms.ar.domain.ArBill; /** * 应收账单余额核销 Service接口 * *

核销仅更新账单已核销/未核销金额及状态(2026-09-23 口径变更后不再变动 ctr_customer_account 余额与额度)。

* - * @author ruoyi + * @author bms * @date 2026-09-16 */ public interface IArBalanceWriteoffService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillLogService.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java similarity index 69% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillLogService.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java index d1ed4ba8..ee73c35e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillLogService.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java @@ -1,10 +1,10 @@ -package com.ruoyi.ar.service; +package com.bms.ar.service; import java.util.List; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.enums.ArLogObjectType; -import com.ruoyi.ar.enums.ArLogOperationType; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.enums.ArLogObjectType; +import com.bms.ar.enums.ArLogOperationType; public interface IArBillLogService { List selectLogList(ArBillLog query); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillService.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java similarity index 79% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillService.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java index 9edd9d64..cfcecb94 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBillService.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java @@ -1,20 +1,20 @@ -package com.ruoyi.ar.service; +package com.bms.ar.service; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.ruoyi.ar.domain.ArBill; -import com.ruoyi.ar.domain.ArBankAccount; -import com.ruoyi.ar.domain.ArBillDetail; -import com.ruoyi.ar.domain.ArBillDetailFee; -import com.ruoyi.ar.domain.ArBillExport; -import com.ruoyi.ar.domain.ArBillGenerateTask; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.domain.vo.ArBillGenerateRequest; -import com.ruoyi.ar.domain.vo.ArBillGenerateQuery; -import com.ruoyi.ar.domain.vo.ArBillActionRequest; -import com.ruoyi.ar.domain.vo.ArBillQuery; -import com.ruoyi.price.domain.PrcOrderBill; +import com.bms.ar.domain.ArBill; +import com.bms.ar.domain.ArBankAccount; +import com.bms.ar.domain.ArBillDetail; +import com.bms.ar.domain.ArBillDetailFee; +import com.bms.ar.domain.ArBillExport; +import com.bms.ar.domain.ArBillGenerateTask; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.domain.vo.ArBillGenerateRequest; +import com.bms.ar.domain.vo.ArBillGenerateQuery; +import com.bms.ar.domain.vo.ArBillActionRequest; +import com.bms.ar.domain.vo.ArBillQuery; +import com.bms.price.domain.PrcOrderBill; /** * 应收账单业务接口。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBalanceWriteoffServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBalanceWriteoffServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java index 6eb0e952..29f35d73 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBalanceWriteoffServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.service.impl; +package com.bms.ar.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -12,27 +12,27 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.ruoyi.ar.domain.ArBalanceWriteoff; -import com.ruoyi.ar.domain.ArBill; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.enums.ArBalanceWriteoffStatus; -import com.ruoyi.ar.enums.ArBillStatus; -import com.ruoyi.ar.enums.ArLogObjectType; -import com.ruoyi.ar.enums.ArLogOperationSource; -import com.ruoyi.ar.enums.ArLogOperationType; -import com.ruoyi.ar.enums.ArLogResult; -import com.ruoyi.ar.mapper.ArBalanceWriteoffMapper; -import com.ruoyi.ar.mapper.ArBillMapper; -import com.ruoyi.ar.service.IArBalanceWriteoffService; -import com.ruoyi.ar.service.IArBillLogService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.bms.ar.domain.ArBalanceWriteoff; +import com.bms.ar.domain.ArBill; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.enums.ArBalanceWriteoffStatus; +import com.bms.ar.enums.ArBillStatus; +import com.bms.ar.enums.ArLogObjectType; +import com.bms.ar.enums.ArLogOperationSource; +import com.bms.ar.enums.ArLogOperationType; +import com.bms.ar.enums.ArLogResult; +import com.bms.ar.mapper.ArBalanceWriteoffMapper; +import com.bms.ar.mapper.ArBillMapper; +import com.bms.ar.service.IArBalanceWriteoffService; +import com.bms.ar.service.IArBillLogService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.uuid.IdUtils; /** * 应收账单余额核销 Service实现 * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillLogServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java similarity index 81% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillLogServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java index b368cec7..90f887d3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillLogServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.service.impl; +package com.bms.ar.service.impl; import java.util.List; @@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.enums.ArLogObjectType; -import com.ruoyi.ar.enums.ArLogOperationSource; -import com.ruoyi.ar.enums.ArLogOperationType; -import com.ruoyi.ar.enums.ArLogResult; -import com.ruoyi.ar.mapper.ArBillLogMapper; -import com.ruoyi.ar.service.IArBillLogService; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.enums.ArLogObjectType; +import com.bms.ar.enums.ArLogOperationSource; +import com.bms.ar.enums.ArLogOperationType; +import com.bms.ar.enums.ArLogResult; +import com.bms.ar.mapper.ArBillLogMapper; +import com.bms.ar.service.IArBillLogService; +import com.bms.common.utils.uuid.IdUtils; @Service public class ArBillLogServiceImpl implements IArBillLogService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java index 7b5598db..1e30f324 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.service.impl; +package com.bms.ar.service.impl; import java.io.File; import java.io.IOException; @@ -38,52 +38,52 @@ import org.springframework.transaction.support.TransactionTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; -import com.ruoyi.ar.domain.ArBill; -import com.ruoyi.ar.domain.ArBankAccount; -import com.ruoyi.ar.domain.ArBillDetail; -import com.ruoyi.ar.domain.ArBillDetailFee; -import com.ruoyi.ar.domain.ArBillExport; -import com.ruoyi.ar.domain.ArBillGenerateTask; -import com.ruoyi.ar.domain.ArBillLog; -import com.ruoyi.ar.domain.ArExportTemplate; -import com.ruoyi.ar.event.ArBillExportTaskEvent; -import com.ruoyi.ar.event.ArBillGenerateTaskEvent; -import com.ruoyi.ar.enums.ArBillGenerateTaskStatus; -import com.ruoyi.ar.enums.ArBillGenerationStatus; -import com.ruoyi.ar.enums.ArBillSelectionMode; -import com.ruoyi.ar.enums.ArBillStatus; -import com.ruoyi.ar.enums.ArExportStatus; -import com.ruoyi.ar.enums.ArIncomeBillFeeStatus; -import com.ruoyi.ar.enums.ArLogObjectType; -import com.ruoyi.ar.enums.ArLogOperationSource; -import com.ruoyi.ar.enums.ArLogOperationType; -import com.ruoyi.ar.enums.ArLogResult; -import com.ruoyi.ar.enums.ArOrderBillStatus; -import com.ruoyi.ar.mapper.ArBillDetailFeeMapper; -import com.ruoyi.ar.mapper.ArBillDetailMapper; -import com.ruoyi.ar.mapper.ArBillExportMapper; -import com.ruoyi.ar.mapper.ArBillLogMapper; -import com.ruoyi.ar.mapper.ArBillMapper; -import com.ruoyi.ar.mapper.ArBillGenerateTaskMapper; -import com.ruoyi.ar.mapper.ArBankAccountMapper; -import com.ruoyi.ar.mapper.ArExportTemplateMapper; -import com.ruoyi.ar.service.IArBillLogService; -import com.ruoyi.ar.service.IArBillService; -import com.ruoyi.ar.domain.vo.ArBillActionRequest; -import com.ruoyi.ar.domain.vo.ArBillGenerateQuery; -import com.ruoyi.ar.domain.vo.ArBillGenerateRequest; -import com.ruoyi.ar.domain.vo.ArBillQuery; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.price.domain.PrcIncomeBillFee; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.mapper.PrcIncomeBillFeeMapper; -import com.ruoyi.price.mapper.PrcOrderBillMapper; +import com.bms.ar.domain.ArBill; +import com.bms.ar.domain.ArBankAccount; +import com.bms.ar.domain.ArBillDetail; +import com.bms.ar.domain.ArBillDetailFee; +import com.bms.ar.domain.ArBillExport; +import com.bms.ar.domain.ArBillGenerateTask; +import com.bms.ar.domain.ArBillLog; +import com.bms.ar.domain.ArExportTemplate; +import com.bms.ar.event.ArBillExportTaskEvent; +import com.bms.ar.event.ArBillGenerateTaskEvent; +import com.bms.ar.enums.ArBillGenerateTaskStatus; +import com.bms.ar.enums.ArBillGenerationStatus; +import com.bms.ar.enums.ArBillSelectionMode; +import com.bms.ar.enums.ArBillStatus; +import com.bms.ar.enums.ArExportStatus; +import com.bms.ar.enums.ArIncomeBillFeeStatus; +import com.bms.ar.enums.ArLogObjectType; +import com.bms.ar.enums.ArLogOperationSource; +import com.bms.ar.enums.ArLogOperationType; +import com.bms.ar.enums.ArLogResult; +import com.bms.ar.enums.ArOrderBillStatus; +import com.bms.ar.mapper.ArBillDetailFeeMapper; +import com.bms.ar.mapper.ArBillDetailMapper; +import com.bms.ar.mapper.ArBillExportMapper; +import com.bms.ar.mapper.ArBillLogMapper; +import com.bms.ar.mapper.ArBillMapper; +import com.bms.ar.mapper.ArBillGenerateTaskMapper; +import com.bms.ar.mapper.ArBankAccountMapper; +import com.bms.ar.mapper.ArExportTemplateMapper; +import com.bms.ar.service.IArBillLogService; +import com.bms.ar.service.IArBillService; +import com.bms.ar.domain.vo.ArBillActionRequest; +import com.bms.ar.domain.vo.ArBillGenerateQuery; +import com.bms.ar.domain.vo.ArBillGenerateRequest; +import com.bms.ar.domain.vo.ArBillQuery; +import com.bms.common.config.BmsConfig; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.file.FileUtils; +import com.bms.common.utils.file.FileUploadUtils; +import com.bms.common.utils.uuid.IdUtils; +import com.bms.price.domain.PrcIncomeBillFee; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.mapper.PrcIncomeBillFeeMapper; +import com.bms.price.mapper.PrcOrderBillMapper; /** * 应收账单核心业务实现。 @@ -922,7 +922,7 @@ public class ArBillServiceImpl implements IArBillService { throw new ServiceException("草稿或作废账单不可导出"); } String relative = "ar/" + DateUtils.datePath() + "/" + IdUtils.fastSimpleUUID() + ".xlsx"; - String downloadDir = RuoYiConfig.getProfile() + File.separator + "download"; + String downloadDir = BmsConfig.getProfile() + File.separator + "download"; File file = FileUploadUtils.getAbsoluteFile(downloadDir, relative); Path target = file.toPath(); Path temp = Files.createTempFile(target.getParent(), ".ar-bill-export-", ".xlsx.tmp"); @@ -979,7 +979,7 @@ public class ArBillServiceImpl implements IArBillService { } response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); FileUtils.setAttachmentResponseHeader(response, export.getFileName()); - FileUtils.writeBytes(RuoYiConfig.getProfile() + FileUtils.stripPrefix(resource), response.getOutputStream()); + FileUtils.writeBytes(BmsConfig.getProfile() + FileUtils.stripPrefix(resource), response.getOutputStream()); } @Override @@ -1150,7 +1150,7 @@ public class ArBillServiceImpl implements IArBillService { if (!FileUtils.checkAllowDownload(storageKey)) { throw new IOException("应收账单模板路径非法"); } - Path profileRoot = new File(RuoYiConfig.getProfile()).toPath().toAbsolutePath().normalize(); + Path profileRoot = new File(BmsConfig.getProfile()).toPath().toAbsolutePath().normalize(); Path templatePath = profileRoot.resolve(storageKey).normalize(); if (!templatePath.startsWith(profileRoot) || !Files.exists(templatePath)) { throw new IOException("应收账单导出模板不存在: " + storageKey); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillExportTaskRunner.java b/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillExportTaskRunner.java rename to bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java index cda87a9d..afab7a5f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillExportTaskRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.task; +package com.bms.ar.task; import java.util.Date; @@ -12,8 +12,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; -import com.ruoyi.ar.event.ArBillExportTaskEvent; -import com.ruoyi.ar.service.IArBillService; +import com.bms.ar.event.ArBillExportTaskEvent; +import com.bms.ar.service.IArBillService; /** * 应收账单导出异步任务执行器。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillGenerateTaskRunner.java b/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillGenerateTaskRunner.java rename to bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java index 404e7084..bdbacf28 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/task/ArBillGenerateTaskRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java @@ -1,4 +1,4 @@ -package com.ruoyi.ar.task; +package com.bms.ar.task; import java.util.Date; @@ -12,9 +12,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; -import com.ruoyi.ar.domain.ArBillGenerateTask; -import com.ruoyi.ar.event.ArBillGenerateTaskEvent; -import com.ruoyi.ar.service.IArBillService; +import com.bms.ar.domain.ArBillGenerateTask; +import com.bms.ar.event.ArBillGenerateTaskEvent; +import com.bms.ar.service.IArBillService; /** * 应收账单异步生成任务调度器。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java index 45424c0c..1ef6206b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import java.math.BigDecimal; import java.util.List; @@ -6,13 +6,13 @@ import java.util.List; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 客户主对象 ctr_customer * - * @author ruoyi + * @author bms * @date 2026-09-08 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerAttachment.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerAttachment.java index 9190fa62..ebc39488 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerAttachment.java @@ -1,17 +1,17 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import lombok.Data; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 客户附件对象 ctr_customer_attachment * - * @author ruoyi + * @author bms * @date 2026-09-08 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerCompany.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerCompany.java index 36708394..b5136fac 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerCompany.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import java.math.BigDecimal; import java.util.Date; @@ -7,13 +7,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 客户公司主体对象 ctr_customer_company * - * @author ruoyi + * @author bms * @date 2026-09-09 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerContact.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerContact.java index 9ae931ff..410cd5d0 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerContact.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 客户联系人对象 ctr_customer_contact * - * @author ruoyi + * @author bms * @date 2026-09-09 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerPriceSet.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerPriceSet.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerPriceSet.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerPriceSet.java index 9465d080..a53c567f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerPriceSet.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomerPriceSet.java @@ -1,8 +1,8 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; * 客户套餐绑定对象 prc_customer_price_set * 客户管理-客户编辑-绑定套餐 使用;关联 prc_price_set 的字段仅用于页面展示 * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsPriceSetOption.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsPriceSetOption.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsPriceSetOption.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsPriceSetOption.java index 18bbbfdc..e62bba42 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsPriceSetOption.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsPriceSetOption.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customerinfo.domain; +package com.bms.customer.customerinfo.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -8,7 +8,7 @@ import lombok.Data; * 价格套餐(prc_price_set)简要对象 * 仅用于客户编辑-绑定套餐的套餐下拉选择,不参与套餐维护 * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java index c015ff53..1aaf712c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customerinfo.mapper; +package com.bms.customer.customerinfo.mapper; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerContact; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.domain.BmsCustomerCompany; +import com.bms.customer.customerinfo.domain.BmsCustomerContact; import io.lettuce.core.dynamic.annotation.Param; /** * 客户主Mapper接口 * - * @author ruoyi + * @author bms * @date 2026-09-08 */ public interface BmsCustomerMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java index 5ceb215c..459ca166 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerPriceSetMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.customer.customerinfo.mapper; +package com.bms.customer.customerinfo.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet; -import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption; +import com.bms.customer.customerinfo.domain.BmsCustomerPriceSet; +import com.bms.customer.customerinfo.domain.BmsPriceSetOption; /** * 客户套餐绑定 数据层(客户管理侧独立实现,操作 prc_customer_price_set) * - * @author ruoyi + * @author bms * @date 2026-09-16 */ public interface BmsCustomerPriceSetMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/CustomerSyncMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/CustomerSyncMapper.java similarity index 81% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/CustomerSyncMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/CustomerSyncMapper.java index d7fcad89..0ce4e6d5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/CustomerSyncMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/CustomerSyncMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.customer.customerinfo.mapper; +package com.bms.customer.customerinfo.mapper; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomer; /** * 客户主表 ctr_customer 同步写库(MASTER 数据源) * - * @author ruoyi + * @author bms */ public interface CustomerSyncMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/OracleCustomerSyncMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/OracleCustomerSyncMapper.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/OracleCustomerSyncMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/OracleCustomerSyncMapper.java index 3c7ed52b..3aaf8697 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/mapper/OracleCustomerSyncMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/OracleCustomerSyncMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customerinfo.mapper; +package com.bms.customer.customerinfo.mapper; import java.util.List; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; /** * 老系统 Oracle TAB_CUSTOMER 只读查询(SLAVE 数据源,账号只读) * - * @author ruoyi + * @author bms */ public interface OracleCustomerSyncMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerPriceSetService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerPriceSetService.java similarity index 77% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerPriceSetService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerPriceSetService.java index 1438217f..ce9bc218 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerPriceSetService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerPriceSetService.java @@ -1,13 +1,13 @@ -package com.ruoyi.customer.customerinfo.service; +package com.bms.customer.customerinfo.service; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet; -import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption; +import com.bms.customer.customerinfo.domain.BmsCustomerPriceSet; +import com.bms.customer.customerinfo.domain.BmsPriceSetOption; /** * 客户套餐绑定 服务层(客户管理侧) * - * @author ruoyi + * @author bms * @date 2026-09-16 */ public interface IBmsCustomerPriceSetService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java index 5b36caab..0c0fc716 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/IBmsCustomerService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.customerinfo.service; +package com.bms.customer.customerinfo.service; import java.util.List; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerContact; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.domain.BmsCustomerCompany; +import com.bms.customer.customerinfo.domain.BmsCustomerContact; /** * 客户主Service接口 * - * @author ruoyi + * @author bms * @date 2026-09-08 */ public interface IBmsCustomerService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java index 1d0347e9..43b7438c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.customer.customerinfo.service.impl; +package com.bms.customer.customerinfo.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet; -import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerPriceSetMapper; -import com.ruoyi.customer.customerinfo.service.IBmsCustomerPriceSetService; -import com.ruoyi.customer.customerinfo.service.IBmsCustomerService; +import com.bms.common.exception.ServiceException; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomerPriceSet; +import com.bms.customer.customerinfo.domain.BmsPriceSetOption; +import com.bms.customer.customerinfo.mapper.BmsCustomerPriceSetMapper; +import com.bms.customer.customerinfo.service.IBmsCustomerPriceSetService; +import com.bms.customer.customerinfo.service.IBmsCustomerService; /** * 客户套餐绑定 服务实现(客户管理侧,独立于价格套餐维护模块) * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java index bfe15d17..89e0c780 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java @@ -1,26 +1,26 @@ -package com.ruoyi.customer.customerinfo.service.impl; +package com.bms.customer.customerinfo.service.impl; import java.util.List; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerContact; +import com.bms.common.annotation.DataScope; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.domain.BmsCustomerCompany; +import com.bms.customer.customerinfo.domain.BmsCustomerContact; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.service.IBmsCustomerService; -import com.ruoyi.customer.customermoney.service.ICustomerMoneyService; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.service.IBmsCustomerService; +import com.bms.customer.customermoney.service.ICustomerMoneyService; /** * 客户主Service业务层处理 * - * @author ruoyi + * @author bms * @date 2026-09-08 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncService.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncService.java index 643d3f2b..206daa6b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncService.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customerinfo.sync; +package com.bms.customer.customerinfo.sync; import java.math.BigDecimal; import java.math.RoundingMode; @@ -13,9 +13,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.mapper.CustomerSyncMapper; +import com.bms.common.utils.StringUtils; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.mapper.CustomerSyncMapper; /** * 老系统 Oracle TAB_CUSTOMER -> ctr_customer 每日同步。 @@ -23,7 +23,7 @@ import com.ruoyi.customer.customerinfo.mapper.CustomerSyncMapper; * 字段映射、字典转换与 D:\\生产客户数据\\scripts\\import_customers.py 完全一致: * 按 customer_code 判定新增/更新;源为空的字段不写(走默认值/保留原值)。 * - * @author ruoyi + * @author bms */ @Service public class CustomerSyncService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncWriter.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncWriter.java similarity index 85% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncWriter.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncWriter.java index 4f3db170..dde665ab 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/CustomerSyncWriter.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/CustomerSyncWriter.java @@ -1,17 +1,17 @@ -package com.ruoyi.customer.customerinfo.sync; +package com.bms.customer.customerinfo.sync; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.mapper.CustomerSyncMapper; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.mapper.CustomerSyncMapper; /** * 同步写库器(MASTER 数据源,整批一个事务)。 * 独立 Bean:保证 @Transactional 经代理生效,且与 SLAVE 读连接隔离。 * - * @author ruoyi + * @author bms */ @Service public class CustomerSyncWriter diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/OracleCustomerReader.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/OracleCustomerReader.java similarity index 79% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/OracleCustomerReader.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/OracleCustomerReader.java index 57334b5f..619214fa 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/sync/OracleCustomerReader.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/sync/OracleCustomerReader.java @@ -1,20 +1,20 @@ -package com.ruoyi.customer.customerinfo.sync; +package com.bms.customer.customerinfo.sync; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.customer.customerinfo.mapper.OracleCustomerSyncMapper; +import com.bms.common.annotation.DataSource; +import com.bms.common.enums.DataSourceType; +import com.bms.customer.customerinfo.mapper.OracleCustomerSyncMapper; /** * Oracle TAB_CUSTOMER 读取器。 * 走 SLAVE(Oracle 只读账号)数据源;必须独立 Bean, * 否则 @DataSource 切面在同类自调用时不生效。 * - * @author ruoyi + * @author bms */ @Service public class OracleCustomerReader diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/task/CustomerSyncTask.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/task/CustomerSyncTask.java similarity index 81% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/task/CustomerSyncTask.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/task/CustomerSyncTask.java index 34c6a56b..02b2a626 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/task/CustomerSyncTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/task/CustomerSyncTask.java @@ -1,13 +1,13 @@ -package com.ruoyi.customer.customerinfo.task; +package com.bms.customer.customerinfo.task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.customer.customerinfo.sync.CustomerSyncService; +import com.bms.customer.customerinfo.sync.CustomerSyncService; /** * 老系统客户资料定时同步任务(sys_job 调用目标:customerSyncTask.syncFromOracle) * - * @author ruoyi + * @author bms */ @Component("customerSyncTask") public class CustomerSyncTask diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/BalanceChangeCommand.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/BalanceChangeCommand.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/BalanceChangeCommand.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/BalanceChangeCommand.java index 021c0ba5..e34f56a8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/BalanceChangeCommand.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/BalanceChangeCommand.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.api; +package com.bms.customer.customermoney.api; import java.math.BigDecimal; import lombok.Data; @@ -12,7 +12,7 @@ import lombok.Data; *
  • 收款审核入账/反核销回补/退款 -> {@link ICustomerAccountApi#refundBalance}(余额增加)
  • * * - * @author ruoyi + * @author bms * @date 2026-09-17 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CreditUsageCommand.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CreditUsageCommand.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CreditUsageCommand.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CreditUsageCommand.java index bfeff44b..0f13a1cc 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CreditUsageCommand.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CreditUsageCommand.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.api; +package com.bms.customer.customermoney.api; import java.math.BigDecimal; import lombok.Data; @@ -13,7 +13,7 @@ import lombok.Data; * * 客户标识 customerId / customerCode 二选一,传一个即可。 * - * @author ruoyi + * @author bms * @date 2026-09-17 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CustomerFundBizType.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CustomerFundBizType.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CustomerFundBizType.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CustomerFundBizType.java index d1d23de3..b949a310 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/CustomerFundBizType.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/CustomerFundBizType.java @@ -1,10 +1,10 @@ -package com.ruoyi.customer.customermoney.api; +package com.bms.customer.customermoney.api; /** * 客户资金变动业务来源类型(写入余额流水 biz_type / 额度流水 biz_type)。 * 各业务模块调用 {@link ICustomerAccountApi} 时传本类常量,便于按来源单据反查流水。 * - * @author ruoyi + * @author bms * @date 2026-09-17 */ public final class CustomerFundBizType diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/ICustomerAccountApi.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/ICustomerAccountApi.java index 4ac3411f..a5c2fbf7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/ICustomerAccountApi.java @@ -1,9 +1,9 @@ -package com.ruoyi.customer.customermoney.api; +package com.bms.customer.customermoney.api; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.vo.CustomerAccountStatusVO; /** * 客户资金公共服务:客户余额扣减/回补、授信额度占用/释放的统一入口。 @@ -20,7 +20,7 @@ import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; *
  • 收款入账/退款/反核销回补:{@link #refundBalance} 加余额(可同步重新占用)
  • * * - * @author ruoyi + * @author bms * @date 2026-09-17 */ public interface ICustomerAccountApi diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/impl/CustomerAccountApiImpl.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/impl/CustomerAccountApiImpl.java index cfdc7fe4..cce84f24 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/api/impl/CustomerAccountApiImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.api.impl; +package com.bms.customer.customermoney.api.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -18,26 +18,26 @@ import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import org.springframework.util.StringUtils; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper; -import com.ruoyi.customer.customermoney.api.BalanceChangeCommand; -import com.ruoyi.customer.customermoney.api.CreditUsageCommand; -import com.ruoyi.customer.customermoney.api.CustomerFundBizType; -import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.mapper.CustomerMoneyMapper; -import com.ruoyi.system.domain.BmsExchangeRate; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; +import com.bms.customer.customermoney.api.BalanceChangeCommand; +import com.bms.customer.customermoney.api.CreditUsageCommand; +import com.bms.customer.customermoney.api.CustomerFundBizType; +import com.bms.customer.customermoney.api.ICustomerAccountApi; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.vo.CustomerAccountStatusVO; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.mapper.CustomerMoneyMapper; +import com.bms.system.domain.BmsExchangeRate; /** * 客户资金公共服务实现:客户账户余额/授信额度变动与流水落库的唯一收口。 * 加锁顺序统一为「业务单据(调用方持锁)-> 客户账户(本服务行锁)」。 * - * @author ruoyi + * @author bms * @date 2026-09-17 */ @Service @@ -62,7 +62,7 @@ public class CustomerAccountApiImpl implements ICustomerAccountApi /** 角色额度池台账:授信到期释放角色池 */ @Autowired - private com.ruoyi.customer.customermoney.service.ICreditQuotaService creditQuotaService; + private com.bms.customer.customermoney.service.ICreditQuotaService creditQuotaService; @Autowired private PlatformTransactionManager transactionManager; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerAccount.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerAccount.java index a908588c..26a9cc61 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerAccount.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; /** * 客户余额账户 ctr_customer_account * - * @author ruoyi + * @author bms * @date 2026-09-11 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerBalanceFlow.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerBalanceFlow.java index 9d58439b..8503ea5f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerBalanceFlow.java @@ -1,14 +1,14 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; /** * 客户余额流水 ctr_customer_balance_flow * - * @author ruoyi + * @author bms * @date 2026-09-11 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java index 8c03fe8d..3d7f5ae8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditApply.java @@ -1,8 +1,8 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; * 客户额度调整申请审批 ctr_customer_credit_apply * 信用额度/额外额度(临时额度)调整先申请,审批通过后才真正调整账户额度 * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditFlow.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditFlow.java index b9cd4b9c..fffe6f07 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditFlow.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; /** * 客户额度流水 ctr_customer_credit_flow * - * @author ruoyi + * @author bms * @date 2026-09-16 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditGrant.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditGrant.java index 017aeceb..96ea0fb2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerCreditGrant.java @@ -1,9 +1,9 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; * 审批通过的净增额度占一行(占用角色额度池);调减/到期按 FIFO 核销行余额。 * 角色池已用 = SUM(remaining WHERE role_id=? AND status='0') * - * @author ruoyi + * @author bms * @date 2026-09-20 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerReceipt.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerReceipt.java index 133af749..f21b8496 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/CustomerReceipt.java @@ -1,18 +1,18 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.common.core.domain.BaseEntity; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import lombok.Data; import lombok.EqualsAndHashCode; /** * 客户收款 ctr_customer_receipt * - * @author ruoyi + * @author bms * @date 2026-09-11 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/SysRoleCreditQuota.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/SysRoleCreditQuota.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/SysRoleCreditQuota.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/SysRoleCreditQuota.java index f25b996c..0ff434ec 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/SysRoleCreditQuota.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/domain/SysRoleCreditQuota.java @@ -1,7 +1,7 @@ -package com.ruoyi.customer.customermoney.domain; +package com.bms.customer.customermoney.domain; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; * 角色可分配授信额度池 sys_role_credit_quota * 一个角色一行;没有记录视为额度0(该角色用户不能审批任何增量授信) * - * @author ruoyi + * @author bms * @date 2026-09-20 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CreditQuotaMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CreditQuotaMapper.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CreditQuotaMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CreditQuotaMapper.java index 3e99d497..64fcb470 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CreditQuotaMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CreditQuotaMapper.java @@ -1,17 +1,17 @@ -package com.ruoyi.customer.customermoney.mapper; +package com.bms.customer.customermoney.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.customer.customermoney.domain.CustomerCreditGrant; -import com.ruoyi.customer.customermoney.domain.SysRoleCreditQuota; -import com.ruoyi.customer.customermoney.vo.RoleCreditQuotaVo; +import com.bms.customer.customermoney.domain.CustomerCreditGrant; +import com.bms.customer.customermoney.domain.SysRoleCreditQuota; +import com.bms.customer.customermoney.vo.RoleCreditQuotaVo; import java.math.BigDecimal; /** * 角色额度池 / 授信分配台账 Mapper * - * @author ruoyi + * @author bms * @date 2026-09-20 */ public interface CreditQuotaMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerCreditApplyMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerCreditApplyMapper.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerCreditApplyMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerCreditApplyMapper.java index 964b91dc..d10b54db 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerCreditApplyMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerCreditApplyMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.customer.customermoney.mapper; +package com.bms.customer.customermoney.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.customer.customermoney.domain.CustomerCreditApply; +import com.bms.customer.customermoney.domain.CustomerCreditApply; /** * 客户额度调整申请审批 Mapper * - * @author ruoyi + * @author bms * @date 2026-09-16 */ public interface CustomerCreditApplyMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerMoneyMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerMoneyMapper.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerMoneyMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerMoneyMapper.java index 3c8dc298..46f1c80c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/mapper/CustomerMoneyMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/mapper/CustomerMoneyMapper.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.mapper; +package com.bms.customer.customermoney.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.domain.CustomerReceipt; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.domain.CustomerReceipt; /** * 客户余额/收款/流水 Mapper * - * @author ruoyi + * @author bms * @date 2026-09-11 */ public interface CustomerMoneyMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICreditQuotaService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICreditQuotaService.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICreditQuotaService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICreditQuotaService.java index 7cc6d3ff..1378b245 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICreditQuotaService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICreditQuotaService.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.service; +package com.bms.customer.customermoney.service; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerCreditGrant; -import com.ruoyi.customer.customermoney.vo.RoleCreditQuotaVo; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerCreditGrant; +import com.bms.customer.customermoney.vo.RoleCreditQuotaVo; /** * 角色额度池 Service * - * @author ruoyi + * @author bms * @date 2026-09-20 */ public interface ICreditQuotaService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICustomerMoneyService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICustomerMoneyService.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICustomerMoneyService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICustomerMoneyService.java index 31079364..14453d6e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/ICustomerMoneyService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/ICustomerMoneyService.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.service; +package com.bms.customer.customermoney.service; import java.util.List; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.domain.CustomerCreditApply; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.domain.CustomerReceipt; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.domain.CustomerCreditApply; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.domain.CustomerReceipt; /** * 客户余额/收款/流水 Service接口 * - * @author ruoyi + * @author bms * @date 2026-09-11 */ public interface ICustomerMoneyService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CreditQuotaServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CreditQuotaServiceImpl.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CreditQuotaServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CreditQuotaServiceImpl.java index ad8dd1f6..3d0a775c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CreditQuotaServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CreditQuotaServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.service.impl; +package com.bms.customer.customermoney.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -10,21 +10,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerCreditGrant; -import com.ruoyi.customer.customermoney.domain.SysRoleCreditQuota; -import com.ruoyi.customer.customermoney.mapper.CreditQuotaMapper; -import com.ruoyi.customer.customermoney.service.ICreditQuotaService; -import com.ruoyi.customer.customermoney.vo.RoleCreditQuotaVo; -import com.ruoyi.system.mapper.SysRoleMapper; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerCreditGrant; +import com.bms.customer.customermoney.domain.SysRoleCreditQuota; +import com.bms.customer.customermoney.mapper.CreditQuotaMapper; +import com.bms.customer.customermoney.service.ICreditQuotaService; +import com.bms.customer.customermoney.vo.RoleCreditQuotaVo; +import com.bms.system.mapper.SysRoleMapper; /** * 角色额度池 Service实现 * - * @author ruoyi + * @author bms * @date 2026-09-20 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java index e9044fca..43caeb1e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.service.impl; +package com.bms.customer.customermoney.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -13,33 +13,33 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.ar.domain.ArBankAccount; -import com.ruoyi.ar.mapper.ArBankAccountMapper; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper; -import com.ruoyi.customer.customermoney.api.BalanceChangeCommand; -import com.ruoyi.customer.customermoney.api.CustomerFundBizType; -import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; -import com.ruoyi.customer.customermoney.domain.CustomerAccount; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; -import com.ruoyi.customer.customermoney.domain.CustomerCreditApply; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; -import com.ruoyi.customer.customermoney.domain.CustomerReceipt; -import com.ruoyi.customer.customermoney.mapper.CustomerCreditApplyMapper; -import com.ruoyi.customer.customermoney.mapper.CustomerMoneyMapper; -import com.ruoyi.customer.customermoney.service.ICreditQuotaService; -import com.ruoyi.customer.customermoney.service.ICustomerMoneyService; -import com.ruoyi.price.service.IPrcOrderBillService; -import com.ruoyi.system.domain.BmsExchangeRate; -import com.ruoyi.system.service.IBmsExchangeRateService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.ar.domain.ArBankAccount; +import com.bms.ar.mapper.ArBankAccountMapper; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; +import com.bms.customer.customermoney.api.BalanceChangeCommand; +import com.bms.customer.customermoney.api.CustomerFundBizType; +import com.bms.customer.customermoney.api.ICustomerAccountApi; +import com.bms.customer.customermoney.domain.CustomerAccount; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.customer.customermoney.domain.CustomerCreditApply; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.customer.customermoney.domain.CustomerReceipt; +import com.bms.customer.customermoney.mapper.CustomerCreditApplyMapper; +import com.bms.customer.customermoney.mapper.CustomerMoneyMapper; +import com.bms.customer.customermoney.service.ICreditQuotaService; +import com.bms.customer.customermoney.service.ICustomerMoneyService; +import com.bms.price.service.IPrcOrderBillService; +import com.bms.system.domain.BmsExchangeRate; +import com.bms.system.service.IBmsExchangeRateService; /** * 客户余额/收款/流水 Service实现 * - * @author ruoyi + * @author bms * @date 2026-09-11 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/task/TempCreditExpireTask.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/task/TempCreditExpireTask.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/task/TempCreditExpireTask.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/task/TempCreditExpireTask.java index a46b6567..acc587c8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/task/TempCreditExpireTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/task/TempCreditExpireTask.java @@ -1,10 +1,10 @@ -package com.ruoyi.customer.customermoney.task; +package com.bms.customer.customermoney.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; +import com.bms.customer.customermoney.api.ICustomerAccountApi; /** * 客户授信(信用额度/临时额度)到期自动失效任务。 @@ -13,7 +13,7 @@ import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; * 逐户独立事务物化失效:额度清零 -> 释放角色额度池 -> 回写客户档案 -> 写 EXPIRE 额度流水。 * 失效日当天额度仍有效,故严格按「早于今天」判断。

    * - *

    本任务纳入 RuoYi 定时任务菜单(Quartz / sys_job)统一管理: + *

    本任务纳入 Bms 定时任务菜单(Quartz / sys_job)统一管理: * 调用目标为 {@code customerCreditTask.expireCredits()},cron、启停均在 * 「系统监控 - 定时任务」中配置,不再使用 @Scheduled 硬编码。 * 除定时调度外,资金接口访问时仍有惰性失效(即查即失效)兜底。

    @@ -21,7 +21,7 @@ import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; *

    到期不影响已用额度:已确认账单形成的授信占用仍然有效,客户回款核销后 * used_credit 自然下降;可用额度可能短暂为负,新计费开单会被额度校验拦截。

    * - * @author ruoyi + * @author bms * @date 2026-09-17 */ @Component("customerCreditTask") diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerAccountStatusVO.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerAccountStatusVO.java index 7eaafe98..91c4a9ba 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerAccountStatusVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.vo; +package com.bms.customer.customermoney.vo; import java.io.Serializable; import java.math.BigDecimal; @@ -11,7 +11,7 @@ import java.math.BigDecimal; * *

    欠费定义:availableCredit < 0(可用额度 = 账户余额 + 信用额度 + 有效临时额度)。

    * - * @author ruoyi + * @author bms * @date 2026-09-17 */ public class CustomerAccountStatusVO implements Serializable diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerBalanceFlowExportVO.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerBalanceFlowExportVO.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerBalanceFlowExportVO.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerBalanceFlowExportVO.java index c30e7ab3..8009afb7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerBalanceFlowExportVO.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerBalanceFlowExportVO.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.vo; +package com.bms.customer.customermoney.vo; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow; +import com.bms.common.annotation.Excel; +import com.bms.customer.customermoney.domain.CustomerBalanceFlow; import lombok.Data; /** * 客户余额流水导出 VO(列与页面余额流水 tab 对齐,枚举导出为中文文案) * - * @author ruoyi + * @author bms * @date 2026-09-21 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerCreditFlowExportVO.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerCreditFlowExportVO.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerCreditFlowExportVO.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerCreditFlowExportVO.java index 630787e8..cb77497a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerCreditFlowExportVO.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerCreditFlowExportVO.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.vo; +package com.bms.customer.customermoney.vo; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow; +import com.bms.common.annotation.Excel; +import com.bms.customer.customermoney.domain.CustomerCreditFlow; import lombok.Data; /** * 客户额度流水导出 VO(列与页面额度流水 tab 对齐,枚举导出为中文文案) * - * @author ruoyi + * @author bms * @date 2026-09-21 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerReceiptExportVO.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerReceiptExportVO.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerReceiptExportVO.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerReceiptExportVO.java index 47c19f27..9644a66f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerReceiptExportVO.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/CustomerReceiptExportVO.java @@ -1,16 +1,16 @@ -package com.ruoyi.customer.customermoney.vo; +package com.bms.customer.customermoney.vo; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.customer.customermoney.domain.CustomerReceipt; +import com.bms.common.annotation.Excel; +import com.bms.customer.customermoney.domain.CustomerReceipt; import lombok.Data; /** * 客户收款记录导出 VO(列与页面收款记录 tab 对齐,枚举导出为中文文案) * - * @author ruoyi + * @author bms * @date 2026-09-21 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/RoleCreditQuotaVo.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/RoleCreditQuotaVo.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/RoleCreditQuotaVo.java rename to bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/RoleCreditQuotaVo.java index 70fbff97..80d33bda 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/RoleCreditQuotaVo.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/vo/RoleCreditQuotaVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.customermoney.vo; +package com.bms.customer.customermoney.vo; import java.math.BigDecimal; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; /** * 角色额度池视图(角色管理/审批选池用) * - * @author ruoyi + * @author bms * @date 2026-09-20 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java index bf447f69..5567ed6c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java @@ -1,4 +1,4 @@ -package com.ruoyi.customer.supplierinfo.domain; +package com.bms.customer.supplierinfo.domain; import java.math.BigDecimal; import java.util.Date; @@ -8,16 +8,16 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; +import com.bms.customer.supplierinfo.domain.BmsSupplierAttachment; +import com.bms.customer.supplierinfo.domain.BmsSupplierCompany; +import com.bms.customer.supplierinfo.domain.BmsSupplierContact; /** * 供应商主对象 sup_supplier * - * @author ruoyi + * @author bms * @date 2026-09-09 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierAttachment.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierAttachment.java index 911012ce..b68fc325 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierAttachment.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.supplierinfo.domain; +package com.bms.customer.supplierinfo.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 供应商附件对象 sup_supplier_attachment * - * @author ruoyi + * @author bms * @date 2026-09-10 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierCompany.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierCompany.java index aed97662..1ab9cb88 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierCompany.java @@ -1,17 +1,17 @@ -package com.ruoyi.customer.supplierinfo.domain; +package com.bms.customer.supplierinfo.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 供应商公司主体(工商信息)对象 sup_supplier_company * - * @author ruoyi + * @author bms * @date 2026-09-10 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierContact.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierContact.java index 8809596d..9ea306d8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplierContact.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.supplierinfo.domain; +package com.bms.customer.supplierinfo.domain; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 供应商联系人对象 sup_supplier_contact * - * @author ruoyi + * @author bms * @date 2026-09-10 */ @Data diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/mapper/BmsSupplierMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/mapper/BmsSupplierMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/mapper/BmsSupplierMapper.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/mapper/BmsSupplierMapper.java index 7e5d2827..2ab75f5c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/mapper/BmsSupplierMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/mapper/BmsSupplierMapper.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.supplierinfo.mapper; +package com.bms.customer.supplierinfo.mapper; import java.util.List; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplier; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact; +import com.bms.customer.supplierinfo.domain.BmsSupplier; +import com.bms.customer.supplierinfo.domain.BmsSupplierAttachment; +import com.bms.customer.supplierinfo.domain.BmsSupplierCompany; +import com.bms.customer.supplierinfo.domain.BmsSupplierContact; /** * 供应商主Mapper接口 * - * @author ruoyi + * @author bms * @date 2026-09-09 */ public interface BmsSupplierMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/IBmsSupplierService.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/IBmsSupplierService.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/IBmsSupplierService.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/IBmsSupplierService.java index a8646cc7..d4cfd3e2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/IBmsSupplierService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/IBmsSupplierService.java @@ -1,15 +1,15 @@ -package com.ruoyi.customer.supplierinfo.service; +package com.bms.customer.supplierinfo.service; import java.util.List; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplier; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact; +import com.bms.customer.supplierinfo.domain.BmsSupplier; +import com.bms.customer.supplierinfo.domain.BmsSupplierAttachment; +import com.bms.customer.supplierinfo.domain.BmsSupplierCompany; +import com.bms.customer.supplierinfo.domain.BmsSupplierContact; /** * 供应商主Service接口 * - * @author ruoyi + * @author bms * @date 2026-09-09 */ public interface IBmsSupplierService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java index fe3dae45..5004f4a7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/service/impl/BmsSupplierServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.customer.supplierinfo.service.impl; +package com.bms.customer.supplierinfo.service.impl; import java.util.List; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplier; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; -import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact; -import com.ruoyi.customer.supplierinfo.mapper.BmsSupplierMapper; -import com.ruoyi.customer.supplierinfo.service.IBmsSupplierService; +import com.bms.common.annotation.DataScope; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.customer.supplierinfo.domain.BmsSupplier; +import com.bms.customer.supplierinfo.domain.BmsSupplierAttachment; +import com.bms.customer.supplierinfo.domain.BmsSupplierCompany; +import com.bms.customer.supplierinfo.domain.BmsSupplierContact; +import com.bms.customer.supplierinfo.mapper.BmsSupplierMapper; +import com.bms.customer.supplierinfo.service.IBmsSupplierService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional; /** * 供应商主Service业务层处理 * - * @author ruoyi + * @author bms * @date 2026-09-09 */ @Service diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/config/BillingProperties.java b/bms-back/bms-system/src/main/java/com/bms/price/config/BillingProperties.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/config/BillingProperties.java rename to bms-back/bms-system/src/main/java/com/bms/price/config/BillingProperties.java index e464ab07..7436d6c2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/config/BillingProperties.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/config/BillingProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.config; +package com.bms.price.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProduct.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProduct.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProduct.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProduct.java index 289bbc56..d2c6097b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProduct.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProduct.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProductCountry.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProductCountry.java index 551abc29..b21931b3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/BmsProductCountry.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/BmsProductCountry.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillingTask.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcBillingTask.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillingTask.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcBillingTask.java index e6fb3b12..bdb023a4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcBillingTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcBillingTask.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcCustomerPriceSet.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcCustomerPriceSet.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcCustomerPriceSet.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcCustomerPriceSet.java index e2cad164..778a450a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcCustomerPriceSet.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcCustomerPriceSet.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBill.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBill.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBill.java index 2d65e77f..927b4516 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBill.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBillFee.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBillFee.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBillFee.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBillFee.java index 7b71dfa3..506bb6df 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcIncomeBillFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcIncomeBillFee.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java index 3dc97cd0..06500635 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java @@ -1,10 +1,10 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBillExt.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBillExt.java similarity index 99% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBillExt.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBillExt.java index 95594fab..a78c61ae 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBillExt.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBillExt.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBill.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java index 723156fa..1140f401 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBillFee.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBillFee.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java index 40f6b275..f44b52a7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPayBillFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSet.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSet.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java index 54f9ddba..e5d4bd43 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSet.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java @@ -1,10 +1,10 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetCheckItem.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetCheckItem.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetCheckItem.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetCheckItem.java index c33794ea..fc499a7c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetCheckItem.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetCheckItem.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetDetail.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetDetail.java index 15ef17f5..e9869ad1 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetDetail.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetSaveTask.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetSaveTask.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetSaveTask.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetSaveTask.java index 5b916e5f..f6de443c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetSaveTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetSaveTask.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersion.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersion.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersion.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersion.java index 8a8b965e..47af59c0 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersion.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersion.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersionSurcharge.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersionSurcharge.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersionSurcharge.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersionSurcharge.java index 5922099d..1d8106b9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcPriceSetVersionSurcharge.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSetVersionSurcharge.java @@ -1,7 +1,7 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuote.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuote.java index b5a94050..fb10d023 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuote.java @@ -1,10 +1,10 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuoteFee.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuoteFee.java index e302644c..4ff2620f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuoteFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcQuoteFee.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurcharge.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurcharge.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurcharge.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurcharge.java index fb348e30..c29d5c47 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurcharge.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurcharge.java @@ -1,7 +1,7 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurchargeRel.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurchargeRel.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurchargeRel.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurchargeRel.java index 533dd255..bd538233 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcSurchargeRel.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcSurchargeRel.java @@ -1,7 +1,7 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionDetail.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionDetail.java index 1a8561e3..89f98b7c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionDetail.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionTemplate.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionTemplate.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionTemplate.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionTemplate.java index c7d7d141..f5a16cfc 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcWeightSectionTemplate.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcWeightSectionTemplate.java @@ -1,6 +1,6 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZone.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZone.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZone.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZone.java index e5a21d36..7446db88 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZone.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZone.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneDetail.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneDetail.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneDetail.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneDetail.java index 5b610f49..548b7387 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneDetail.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneRegion.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneRegion.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneRegion.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneRegion.java index d1597d6b..ccd0a48b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcZoneRegion.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcZoneRegion.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain; +package com.bms.price.domain; import java.io.Serializable; import lombok.Data; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/AddIncomeBillFeeRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/AddIncomeBillFeeRequest.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/AddIncomeBillFeeRequest.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/AddIncomeBillFeeRequest.java index 5ba76606..74afbeed 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/AddIncomeBillFeeRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/AddIncomeBillFeeRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/BillingTaskSubmitRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/BillingTaskSubmitRequest.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/BillingTaskSubmitRequest.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/BillingTaskSubmitRequest.java index 8086e000..3eff5aff 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/BillingTaskSubmitRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/BillingTaskSubmitRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsOrderBillStatusResult.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsOrderBillStatusResult.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsOrderBillStatusResult.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsOrderBillStatusResult.java index 2b9d54a8..751b440a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsOrderBillStatusResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsOrderBillStatusResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import lombok.Data; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceBillRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceBillRequest.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java index a6e71bcb..b3bd347c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceBillRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteFeeLine.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteFeeLine.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteFeeLine.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteFeeLine.java index 3c08b432..4fe5bd58 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteFeeLine.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteFeeLine.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteRequest.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteRequest.java index b1fc26f1..9ac09599 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteResult.java similarity index 99% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteResult.java index 61885349..70cab17f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/UpdateIncomeBillFeeRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/UpdateIncomeBillFeeRequest.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/UpdateIncomeBillFeeRequest.java rename to bms-back/bms-system/src/main/java/com/bms/price/domain/vo/UpdateIncomeBillFeeRequest.java index 73a51b8d..7b0f1b44 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/UpdateIncomeBillFeeRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/UpdateIncomeBillFeeRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.domain.vo; +package com.bms.price.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCreditArrearsStatus.java b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillCreditArrearsStatus.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCreditArrearsStatus.java rename to bms-back/bms-system/src/main/java/com/bms/price/enums/BillCreditArrearsStatus.java index cb2851ff..02863826 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCreditArrearsStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillCreditArrearsStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.enums; +package com.bms.price.enums; /** * Credit arrears status snapshot on prc_order_bill when billing. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCustomerActiveStatus.java b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillCustomerActiveStatus.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCustomerActiveStatus.java rename to bms-back/bms-system/src/main/java/com/bms/price/enums/BillCustomerActiveStatus.java index aa68f813..95fcc8d1 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillCustomerActiveStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillCustomerActiveStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.enums; +package com.bms.price.enums; /** * Customer effective status snapshot on prc_order_bill when billing. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskSuccessStatus.java b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskSuccessStatus.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskSuccessStatus.java rename to bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskSuccessStatus.java index ba8b7e49..63058c17 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskSuccessStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskSuccessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.enums; +package com.bms.price.enums; /** Billing task success flag on prc_billing_task.success_status */ public enum BillTaskSuccessStatus diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskType.java b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskType.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskType.java rename to bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskType.java index 7867e5f0..8bfb13ae 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/BillTaskType.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/enums/BillTaskType.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.enums; +package com.bms.price.enums; /** Billing task type on prc_billing_task.bill_type */ public enum BillTaskType diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/TmsOrderBillMatchType.java b/bms-back/bms-system/src/main/java/com/bms/price/enums/TmsOrderBillMatchType.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/TmsOrderBillMatchType.java rename to bms-back/bms-system/src/main/java/com/bms/price/enums/TmsOrderBillMatchType.java index a22b1c36..d4cf7b24 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/enums/TmsOrderBillMatchType.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/enums/TmsOrderBillMatchType.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.enums; +package com.bms.price.enums; /** * TMS 查询订单计费数据时的标识匹配类型。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductCountryMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductCountryMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductCountryMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductCountryMapper.java index f7cabdf5..ecc07d95 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductCountryMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductCountryMapper.java @@ -1,15 +1,15 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.math.BigDecimal; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.BmsProductCountry; +import com.bms.price.domain.BmsProductCountry; /** * 产品国家明细 数据层 * - * @author ruoyi + * @author bms */ public interface BmsProductCountryMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductMapper.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductMapper.java index 1601668e..72512f7e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/BmsProductMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/BmsProductMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.BmsProduct; +import com.bms.price.domain.BmsProduct; /** * 产品主表 数据层 * - * @author ruoyi + * @author bms */ public interface BmsProductMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/OracleUpstreamOrderMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/OracleUpstreamOrderMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/OracleUpstreamOrderMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/OracleUpstreamOrderMapper.java index 96871b97..9ec7231e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/OracleUpstreamOrderMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/OracleUpstreamOrderMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.Map; import org.apache.ibatis.annotations.Param; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcBillingTaskMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcBillingTaskMapper.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcBillingTaskMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcBillingTaskMapper.java index 94a8a1a8..140cc161 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcBillingTaskMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcBillingTaskMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; -import com.ruoyi.price.domain.PrcBillingTask; +import com.bms.price.domain.PrcBillingTask; public interface PrcBillingTaskMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcCustomerPriceSetMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcCustomerPriceSetMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcCustomerPriceSetMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcCustomerPriceSetMapper.java index e4f1f229..71e73c68 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcCustomerPriceSetMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcCustomerPriceSetMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcCustomerPriceSet; +import com.bms.price.domain.PrcCustomerPriceSet; /** * 客户套餐 数据层 * - * @author ruoyi + * @author bms */ public interface PrcCustomerPriceSetMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillFeeMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillFeeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillFeeMapper.java index 80dd1e13..e94f7809 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillFeeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcIncomeBillFee; +import com.bms.price.domain.PrcIncomeBillFee; /** receivable bill fee mapper */ public interface PrcIncomeBillFeeMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillMapper.java similarity index 82% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillMapper.java index 5fa7baad..ad0436c8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcIncomeBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcIncomeBillMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; -import com.ruoyi.price.domain.PrcIncomeBill; +import com.bms.price.domain.PrcIncomeBill; /** prc_income_bill mapper */ public interface PrcIncomeBillMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillExtMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillExtMapper.java similarity index 80% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillExtMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillExtMapper.java index ea90e8a2..8e4a195d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillExtMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillExtMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; -import com.ruoyi.price.domain.PrcOrderBillExt; +import com.bms.price.domain.PrcOrderBillExt; /** prc_order_bill_ext mapper */ public interface PrcOrderBillExtMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java index c0d57d8d..a3c34aa4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.math.BigDecimal; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcOrderBill; +import com.bms.price.domain.PrcOrderBill; /** order bill header mapper */ public interface PrcOrderBillMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java similarity index 83% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillFeeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java index fc283fdf..bde00531 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcPayBillFee; +import com.bms.price.domain.PrcPayBillFee; /** payable bill fee mapper */ public interface PrcPayBillFeeMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java similarity index 81% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java index 5a2cccab..7ea27530 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPayBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; -import com.ruoyi.price.domain.PrcPayBill; +import com.bms.price.domain.PrcPayBill; /** prc_pay_bill mapper */ public interface PrcPayBillMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetDetailMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetDetailMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetDetailMapper.java index 8430594e..aa7df259 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetDetailMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetDetail; /** * 价格套餐明细 数据层 * - * @author ruoyi + * @author bms */ public interface PrcPriceSetDetailMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java index 7ba25c59..23819032 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; -import com.ruoyi.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSet; /** * 价格套餐 数据层 * - * @author ruoyi + * @author bms */ public interface PrcPriceSetMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionMapper.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionMapper.java index 28fda9ef..f521e181 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcPriceSetVersion; +import com.bms.price.domain.PrcPriceSetVersion; /** * Price set version diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionSurchargeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionSurchargeMapper.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionSurchargeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionSurchargeMapper.java index b8c0cee9..1347df87 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcPriceSetVersionSurchargeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetVersionSurchargeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcPriceSetVersionSurcharge; +import com.bms.price.domain.PrcPriceSetVersionSurcharge; /** * Price set version surcharge snapshot diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteFeeMapper.java similarity index 83% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteFeeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteFeeMapper.java index 2b13d4f5..c59fad03 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteFeeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcQuoteFee; +import com.bms.price.domain.PrcQuoteFee; /** billing quote fee detail mapper */ public interface PrcQuoteFeeMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteMapper.java index 63c18966..e8f3e2f3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcQuoteMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.math.BigDecimal; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcQuote; +import com.bms.price.domain.PrcQuote; /** billing quote header mapper */ public interface PrcQuoteMapper diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeMapper.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeMapper.java index 52c301c4..5f8f7b73 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeMapper.java @@ -1,15 +1,15 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcSurcharge; +import com.bms.price.domain.PrcSurcharge; /** * 附加费配置 数据层 * * 附加费为计费主数据:不做物理修改/删除,编辑=作废旧记录插入新记录,删除=仅作废。 * - * @author ruoyi + * @author bms */ public interface PrcSurchargeMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeRelMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeRelMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeRelMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeRelMapper.java index a3fc8383..e7505f60 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcSurchargeRelMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcSurchargeRelMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcSurchargeRel; +import com.bms.price.domain.PrcSurchargeRel; /** * 附加费与产品/明细关联 数据层 * - * @author ruoyi + * @author bms */ public interface PrcSurchargeRelMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionDetailMapper.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionDetailMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionDetailMapper.java index 85d41c00..a89c0962 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionDetailMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; -import com.ruoyi.price.domain.PrcWeightSectionDetail; +import com.bms.price.domain.PrcWeightSectionDetail; /** * 重量段明细 数据层 * - * @author ruoyi + * @author bms */ public interface PrcWeightSectionDetailMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionTemplateMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionTemplateMapper.java similarity index 83% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionTemplateMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionTemplateMapper.java index 32050f22..449fff3d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcWeightSectionTemplateMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcWeightSectionTemplateMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; -import com.ruoyi.price.domain.PrcWeightSectionTemplate; +import com.bms.price.domain.PrcWeightSectionTemplate; /** * 重量段模板 数据层 * - * @author ruoyi + * @author bms */ public interface PrcWeightSectionTemplateMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneDetailMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneDetailMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneDetailMapper.java index a3d6dab9..57d522f5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneDetailMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.domain.PrcZoneDetail; +import com.bms.price.domain.PrcZone; +import com.bms.price.domain.PrcZoneDetail; public interface PrcZoneDetailMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneMapper.java similarity index 85% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneMapper.java index b68cd05a..ee118d12 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcZoneMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcZoneMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.mapper; +package com.bms.price.mapper; import java.util.List; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.domain.PrcZoneRegion; +import com.bms.price.domain.PrcZone; +import com.bms.price.domain.PrcZoneRegion; public interface PrcZoneMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMessage.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMessage.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMessage.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMessage.java index d9f855c2..9e319b8b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMessage.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMessage.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; import java.io.Serializable; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqConsumer.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqConsumer.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqConsumer.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqConsumer.java index 12906486..d3805978 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqConsumer.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqConsumer.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; @@ -16,9 +16,9 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.config.BillingProperties; -import com.ruoyi.price.service.IPrcBillingTaskService; +import com.bms.common.utils.StringUtils; +import com.bms.price.config.BillingProperties; +import com.bms.price.service.IPrcBillingTaskService; /** * Consume billing task MQ messages and call billing interface. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqEvent.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqEvent.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqEvent.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqEvent.java index 07b23f8e..7efce302 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/BillingTaskMqEvent.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/BillingTaskMqEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; import org.springframework.context.ApplicationEvent; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/IBillingTaskMqPublisher.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/IBillingTaskMqPublisher.java similarity index 85% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/IBillingTaskMqPublisher.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/IBillingTaskMqPublisher.java index 2c9be146..260ddc3d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/IBillingTaskMqPublisher.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/IBillingTaskMqPublisher.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; /** Publish billing task id to MQ after warehouse inbound insert. */ public interface IBillingTaskMqPublisher diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/LocalBillingTaskMqPublisher.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/LocalBillingTaskMqPublisher.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/LocalBillingTaskMqPublisher.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/LocalBillingTaskMqPublisher.java index 468d7752..c7db7a0e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/LocalBillingTaskMqPublisher.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/LocalBillingTaskMqPublisher.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationEventPublisher; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/RedisBillingTaskMqPublisher.java b/bms-back/bms-system/src/main/java/com/bms/price/mq/RedisBillingTaskMqPublisher.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/RedisBillingTaskMqPublisher.java rename to bms-back/bms-system/src/main/java/com/bms/price/mq/RedisBillingTaskMqPublisher.java index 3ad0f1fb..8062384f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mq/RedisBillingTaskMqPublisher.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mq/RedisBillingTaskMqPublisher.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.mq; +package com.bms.price.mq; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.price.config.BillingProperties; +import com.bms.price.config.BillingProperties; /** * Redis list as MQ queue (default). LPUSH on publish; consumer BRPOP/RPOP. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillExtFiller.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillExtFiller.java similarity index 99% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillExtFiller.java rename to bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillExtFiller.java index 132310da..6a098021 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillExtFiller.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillExtFiller.java @@ -1,11 +1,11 @@ -package com.ruoyi.price.oracle; +package com.bms.price.oracle; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import java.util.Map; -import com.ruoyi.price.domain.PrcOrderBillExt; +import com.bms.price.domain.PrcOrderBillExt; /** * 从 Oracle TAB_ORDER 行填充 prc_order_bill_ext(仅包含未落在 prc_order_bill 的字段)。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java index 6ce46550..2cd89704 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleOrderBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.oracle; +package com.bms.price.oracle; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -6,8 +6,8 @@ import java.util.Date; import java.util.Locale; import java.util.Map; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.vo.TmsPriceBillRequest; /** * Map Oracle main-order row (FIELD_MAP style columns) to TmsPriceBillRequest. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleUpstreamOrderService.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleUpstreamOrderService.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleUpstreamOrderService.java rename to bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleUpstreamOrderService.java index 0b433869..a105515f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/oracle/OracleUpstreamOrderService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleUpstreamOrderService.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.oracle; +package com.bms.price.oracle; import java.util.Map; import java.util.function.Supplier; @@ -7,12 +7,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.config.BillingProperties; -import com.ruoyi.price.mapper.OracleUpstreamOrderMapper; +import com.bms.common.annotation.DataSource; +import com.bms.common.enums.DataSourceType; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.price.config.BillingProperties; +import com.bms.price.mapper.OracleUpstreamOrderMapper; /** * Query Oracle main order via SLAVE datasource. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchConfiguration.java b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchConfiguration.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchConfiguration.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchConfiguration.java index 1d397ccc..f6fa8c25 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchConfiguration.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchPage.java b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchPage.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchPage.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchPage.java index b3c210fa..13991ce3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSearchPage.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSearchPage.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import java.util.ArrayList; import java.util.List; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSyncSnapshot.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/BillSyncSnapshot.java index 868a6b1f..3841d79a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/BillSyncSnapshot.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/BillSyncSnapshot.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; /** Generic Elasticsearch business log. Distinguished by logType + bizId. */ public class BillSyncSnapshot diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/ElasticsearchProperties.java b/bms-back/bms-system/src/main/java/com/bms/price/search/ElasticsearchProperties.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/ElasticsearchProperties.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/ElasticsearchProperties.java index a0eaddd4..d1a498d6 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/ElasticsearchProperties.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/ElasticsearchProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java b/bms-back/bms-system/src/main/java/com/bms/price/search/EsBillSearchStore.java similarity index 99% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/EsBillSearchStore.java index 60be52c2..420b3888 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBillSearchStore.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/EsBillSearchStore.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -17,7 +17,7 @@ import org.springframework.web.client.RestTemplate; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * Persist / load generic business logs via Elasticsearch REST API. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBizLogSupport.java b/bms-back/bms-system/src/main/java/com/bms/price/search/EsBizLogSupport.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBizLogSupport.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/EsBizLogSupport.java index df503e28..5a9cf335 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsBizLogSupport.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/EsBizLogSupport.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import java.util.UUID; import jakarta.servlet.http.HttpServletRequest; @@ -6,11 +6,11 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.common.utils.sign.Md5Utils; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.http.HttpHelper; +import com.bms.common.utils.sign.Md5Utils; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteRequest; /** Helpers for ES business logs (success / fail). */ public final class EsBizLogSupport diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsLogType.java b/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsLogType.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java index 4a1522ff..e3752496 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/EsLogType.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/IBillSearchStore.java b/bms-back/bms-system/src/main/java/com/bms/price/search/IBillSearchStore.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/IBillSearchStore.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/IBillSearchStore.java index f9367b05..fae9bf8e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/IBillSearchStore.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/IBillSearchStore.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; /** * Generic Elasticsearch store for business request/response logs. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/NoopBillSearchStore.java b/bms-back/bms-system/src/main/java/com/bms/price/search/NoopBillSearchStore.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/NoopBillSearchStore.java rename to bms-back/bms-system/src/main/java/com/bms/price/search/NoopBillSearchStore.java index 6ed78866..24c233fe 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/search/NoopBillSearchStore.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/NoopBillSearchStore.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.search; +package com.bms.price.search; /** * No-op when Elasticsearch is disabled. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IBmsProductService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IBmsProductService.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IBmsProductService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IBmsProductService.java index 4eef65f6..2eafcf21 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IBmsProductService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IBmsProductService.java @@ -1,15 +1,15 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.Date; import java.util.List; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.price.domain.BmsProduct; -import com.ruoyi.price.domain.BmsProductCountry; +import com.bms.price.domain.BmsProduct; +import com.bms.price.domain.BmsProductCountry; /** * 产品列表 服务层 * - * @author ruoyi + * @author bms */ public interface IBmsProductService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcBillingTaskService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java similarity index 81% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcBillingTaskService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java index 92e7a273..4492a569 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcBillingTaskService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.List; -import com.ruoyi.price.domain.PrcBillingTask; -import com.ruoyi.price.domain.vo.BillingTaskSubmitRequest; +import com.bms.price.domain.PrcBillingTask; +import com.bms.price.domain.vo.BillingTaskSubmitRequest; public interface IPrcBillingTaskService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcOrderBillService.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcOrderBillService.java index abc6cd75..74b74860 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcOrderBillService.java @@ -1,13 +1,13 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.math.BigDecimal; import java.util.List; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.domain.vo.AddIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.UpdateIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.domain.vo.TmsOrderBillStatusResult; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.domain.vo.AddIncomeBillFeeRequest; +import com.bms.price.domain.vo.UpdateIncomeBillFeeRequest; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.domain.vo.TmsOrderBillStatusResult; /** 订单计费:落库 prc_order_bill + prc_income_bill/+fee + prc_pay_bill/+fee。 */ public interface IPrcOrderBillService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java index 28c79545..d71ae487 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java @@ -1,18 +1,18 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.Date; import java.util.List; import java.util.Map; -import com.ruoyi.price.domain.PrcCustomerPriceSet; -import com.ruoyi.price.domain.PrcPriceSet; -import com.ruoyi.price.domain.PrcPriceSetCheckItem; -import com.ruoyi.price.domain.PrcPriceSetDetail; -import com.ruoyi.price.domain.PrcPriceSetSaveTask; +import com.bms.price.domain.PrcCustomerPriceSet; +import com.bms.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSetCheckItem; +import com.bms.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetSaveTask; /** * 价格套餐 服务层 * - * @author ruoyi + * @author bms */ public interface IPrcPriceSetService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeRelService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeRelService.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeRelService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeRelService.java index f889184d..67803851 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeRelService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeRelService.java @@ -1,12 +1,12 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.List; -import com.ruoyi.price.domain.PrcSurchargeRel; +import com.bms.price.domain.PrcSurchargeRel; /** * 附加费与产品/明细关联 服务层 * - * @author ruoyi + * @author bms */ public interface IPrcSurchargeRelService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeService.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeService.java index f42b7b6c..c4cb91ff 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcSurchargeService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcSurchargeService.java @@ -1,14 +1,14 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.List; -import com.ruoyi.price.domain.PrcSurcharge; +import com.bms.price.domain.PrcSurcharge; /** * 附加费配置 服务层 * * 附加费为计费主数据:编辑=原记录作废+插入新记录(版本化),删除=仅作废不物理删除。 * - * @author ruoyi + * @author bms */ public interface IPrcSurchargeService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcWeightService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcWeightService.java similarity index 85% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcWeightService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcWeightService.java index d4b6221e..aa63aee7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcWeightService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcWeightService.java @@ -1,13 +1,13 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.List; -import com.ruoyi.price.domain.PrcWeightSectionDetail; -import com.ruoyi.price.domain.PrcWeightSectionTemplate; +import com.bms.price.domain.PrcWeightSectionDetail; +import com.bms.price.domain.PrcWeightSectionTemplate; /** * 重量段管理 服务层 * - * @author ruoyi + * @author bms */ public interface IPrcWeightService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcZoneService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcZoneService.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcZoneService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/IPrcZoneService.java index 98ee208e..2ee8f319 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcZoneService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcZoneService.java @@ -1,10 +1,10 @@ -package com.ruoyi.price.service; +package com.bms.price.service; import java.util.List; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.domain.PrcZoneDetail; -import com.ruoyi.price.domain.PrcZoneRegion; +import com.bms.price.domain.PrcZone; +import com.bms.price.domain.PrcZoneDetail; +import com.bms.price.domain.PrcZoneRegion; public interface IPrcZoneService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/ITmsPriceQuoteService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/ITmsPriceQuoteService.java similarity index 80% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/ITmsPriceQuoteService.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/ITmsPriceQuoteService.java index caf1e639..726ab391 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/ITmsPriceQuoteService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/ITmsPriceQuoteService.java @@ -1,8 +1,8 @@ -package com.ruoyi.price.service; +package com.bms.price.service; -import com.ruoyi.price.domain.PrcQuote; -import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.domain.PrcQuote; +import com.bms.price.domain.vo.TmsPriceQuoteRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; import java.util.List; /** @@ -15,7 +15,7 @@ import java.util.List; * 4) Else bms_product_country default * Package hit uses version surcharge snapshot when present; else product library. * - * @author ruoyi + * @author bms */ public interface ITmsPriceQuoteService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/BmsProductServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/BmsProductServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java index 80bc1dd5..c74382db 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/BmsProductServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.io.InputStream; import java.math.BigDecimal; @@ -29,25 +29,25 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.BmsProduct; -import com.ruoyi.price.domain.BmsProductCountry; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.mapper.BmsProductCountryMapper; -import com.ruoyi.price.mapper.BmsProductMapper; -import com.ruoyi.price.mapper.PrcZoneMapper; -import com.ruoyi.price.service.IBmsProductService; -import com.ruoyi.price.service.IPrcSurchargeRelService; -import com.ruoyi.price.util.ZoneCodeAbbrevs; -import com.ruoyi.system.domain.BmsRegion; -import com.ruoyi.system.mapper.BmsRegionMapper; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.BmsProduct; +import com.bms.price.domain.BmsProductCountry; +import com.bms.price.domain.PrcZone; +import com.bms.price.mapper.BmsProductCountryMapper; +import com.bms.price.mapper.BmsProductMapper; +import com.bms.price.mapper.PrcZoneMapper; +import com.bms.price.service.IBmsProductService; +import com.bms.price.service.IPrcSurchargeRelService; +import com.bms.price.util.ZoneCodeAbbrevs; +import com.bms.system.domain.BmsRegion; +import com.bms.system.mapper.BmsRegionMapper; /** * Product service with Weishi Excel import (catalog + country weight bands) * - * @author ruoyi + * @author bms */ @Service public class BmsProductServiceImpl implements IBmsProductService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java index cbce7128..5f46f177 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.text.SimpleDateFormat; import java.util.Date; @@ -9,24 +9,24 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.config.BillingProperties; -import com.ruoyi.price.domain.PrcBillingTask; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.domain.vo.BillingTaskSubmitRequest; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.enums.BillTaskSuccessStatus; -import com.ruoyi.price.enums.BillTaskType; -import com.ruoyi.price.mapper.PrcBillingTaskMapper; -import com.ruoyi.price.mapper.PrcOrderBillMapper; -import com.ruoyi.price.mq.BillingTaskMessage; -import com.ruoyi.price.mq.IBillingTaskMqPublisher; -import com.ruoyi.price.oracle.OracleOrderBillMapper; -import com.ruoyi.price.oracle.OracleUpstreamOrderService; -import com.ruoyi.price.service.IPrcBillingTaskService; -import com.ruoyi.price.service.IPrcOrderBillService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.price.config.BillingProperties; +import com.bms.price.domain.PrcBillingTask; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.domain.vo.BillingTaskSubmitRequest; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.enums.BillTaskSuccessStatus; +import com.bms.price.enums.BillTaskType; +import com.bms.price.mapper.PrcBillingTaskMapper; +import com.bms.price.mapper.PrcOrderBillMapper; +import com.bms.price.mq.BillingTaskMessage; +import com.bms.price.mq.IBillingTaskMqPublisher; +import com.bms.price.oracle.OracleOrderBillMapper; +import com.bms.price.oracle.OracleUpstreamOrderService; +import com.bms.price.service.IPrcBillingTaskService; +import com.bms.price.service.IPrcOrderBillService; @Service public class PrcBillingTaskServiceImpl implements IPrcBillingTaskService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index 3af0d884..ff036422 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -19,50 +19,50 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.ar.enums.ArIncomeBillFeeStatus; -import com.ruoyi.ar.enums.ArOrderBillStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sign.Md5Utils; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper; -import com.ruoyi.price.domain.PrcIncomeBill; -import com.ruoyi.price.domain.PrcIncomeBillFee; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.domain.PrcOrderBillExt; -import com.ruoyi.price.domain.PrcPayBill; -import com.ruoyi.price.domain.PrcPayBillFee; -import com.ruoyi.price.domain.PrcSurcharge; -import com.ruoyi.price.domain.vo.AddIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.UpdateIncomeBillFeeRequest; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsOrderBillStatusResult; -import com.ruoyi.price.domain.vo.TmsPriceQuoteFeeLine; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.enums.BillCreditArrearsStatus; -import com.ruoyi.price.enums.BillCustomerActiveStatus; -import com.ruoyi.price.enums.TmsOrderBillMatchType; -import com.ruoyi.price.mapper.PrcIncomeBillFeeMapper; -import com.ruoyi.price.mapper.PrcIncomeBillMapper; -import com.ruoyi.price.mapper.PrcOrderBillExtMapper; -import com.ruoyi.price.mapper.PrcOrderBillMapper; -import com.ruoyi.price.mapper.PrcPayBillFeeMapper; -import com.ruoyi.price.mapper.PrcPayBillMapper; -import com.ruoyi.price.oracle.OracleOrderBillExtFiller; -import com.ruoyi.price.search.EsBizLogSupport; -import com.ruoyi.price.search.EsLogType; -import com.ruoyi.price.search.IBillSearchStore; -import com.ruoyi.customer.customermoney.api.CreditUsageCommand; -import com.ruoyi.customer.customermoney.api.CustomerFundBizType; -import com.ruoyi.customer.customermoney.api.ICustomerAccountApi; -import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; -import com.ruoyi.price.service.IPrcOrderBillService; -import com.ruoyi.price.service.IPrcSurchargeService; -import com.ruoyi.price.service.ITmsPriceQuoteService; -import com.ruoyi.price.task.PrcCreditArrearsClearAsyncRunner; +import com.bms.ar.enums.ArIncomeBillFeeStatus; +import com.bms.ar.enums.ArOrderBillStatus; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.DictUtils; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.sign.Md5Utils; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; +import com.bms.price.domain.PrcIncomeBill; +import com.bms.price.domain.PrcIncomeBillFee; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.domain.PrcOrderBillExt; +import com.bms.price.domain.PrcPayBill; +import com.bms.price.domain.PrcPayBillFee; +import com.bms.price.domain.PrcSurcharge; +import com.bms.price.domain.vo.AddIncomeBillFeeRequest; +import com.bms.price.domain.vo.UpdateIncomeBillFeeRequest; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsOrderBillStatusResult; +import com.bms.price.domain.vo.TmsPriceQuoteFeeLine; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.enums.BillCreditArrearsStatus; +import com.bms.price.enums.BillCustomerActiveStatus; +import com.bms.price.enums.TmsOrderBillMatchType; +import com.bms.price.mapper.PrcIncomeBillFeeMapper; +import com.bms.price.mapper.PrcIncomeBillMapper; +import com.bms.price.mapper.PrcOrderBillExtMapper; +import com.bms.price.mapper.PrcOrderBillMapper; +import com.bms.price.mapper.PrcPayBillFeeMapper; +import com.bms.price.mapper.PrcPayBillMapper; +import com.bms.price.oracle.OracleOrderBillExtFiller; +import com.bms.price.search.EsBizLogSupport; +import com.bms.price.search.EsLogType; +import com.bms.price.search.IBillSearchStore; +import com.bms.customer.customermoney.api.CreditUsageCommand; +import com.bms.customer.customermoney.api.CustomerFundBizType; +import com.bms.customer.customermoney.api.ICustomerAccountApi; +import com.bms.customer.customermoney.vo.CustomerAccountStatusVO; +import com.bms.price.service.IPrcOrderBillService; +import com.bms.price.service.IPrcSurchargeService; +import com.bms.price.service.ITmsPriceQuoteService; +import com.bms.price.task.PrcCreditArrearsClearAsyncRunner; @Service public class PrcOrderBillServiceImpl implements IPrcOrderBillService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java index b01a8216..8b025ea5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; @@ -15,36 +15,36 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.price.domain.BmsProductCountry; -import com.ruoyi.price.domain.PrcCustomerPriceSet; -import com.ruoyi.price.domain.PrcPriceSet; -import com.ruoyi.price.domain.PrcPriceSetCheckItem; -import com.ruoyi.price.domain.PrcPriceSetDetail; -import com.ruoyi.price.domain.PrcPriceSetSaveTask; -import com.ruoyi.price.domain.PrcPriceSetVersion; -import com.ruoyi.price.domain.PrcPriceSetVersionSurcharge; -import com.ruoyi.price.domain.PrcSurcharge; -import com.ruoyi.price.domain.PrcSurchargeRel; -import com.ruoyi.price.mapper.BmsProductCountryMapper; -import com.ruoyi.price.mapper.PrcCustomerPriceSetMapper; -import com.ruoyi.price.mapper.PrcPriceSetDetailMapper; -import com.ruoyi.price.mapper.PrcPriceSetMapper; -import com.ruoyi.price.mapper.PrcPriceSetVersionMapper; -import com.ruoyi.price.mapper.PrcPriceSetVersionSurchargeMapper; -import com.ruoyi.price.mapper.PrcSurchargeMapper; -import com.ruoyi.price.mapper.PrcSurchargeRelMapper; -import com.ruoyi.price.service.IPrcPriceSetService; -import com.ruoyi.price.task.PrcPriceSetSaveAsyncRunner; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.uuid.IdUtils; +import com.bms.price.domain.BmsProductCountry; +import com.bms.price.domain.PrcCustomerPriceSet; +import com.bms.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSetCheckItem; +import com.bms.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetSaveTask; +import com.bms.price.domain.PrcPriceSetVersion; +import com.bms.price.domain.PrcPriceSetVersionSurcharge; +import com.bms.price.domain.PrcSurcharge; +import com.bms.price.domain.PrcSurchargeRel; +import com.bms.price.mapper.BmsProductCountryMapper; +import com.bms.price.mapper.PrcCustomerPriceSetMapper; +import com.bms.price.mapper.PrcPriceSetDetailMapper; +import com.bms.price.mapper.PrcPriceSetMapper; +import com.bms.price.mapper.PrcPriceSetVersionMapper; +import com.bms.price.mapper.PrcPriceSetVersionSurchargeMapper; +import com.bms.price.mapper.PrcSurchargeMapper; +import com.bms.price.mapper.PrcSurchargeRelMapper; +import com.bms.price.service.IPrcPriceSetService; +import com.bms.price.task.PrcPriceSetSaveAsyncRunner; /** * 价格套餐 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class PrcPriceSetServiceImpl implements IPrcPriceSetService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeRelServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeRelServiceImpl.java similarity index 84% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeRelServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeRelServiceImpl.java index 153c6c74..0b352851 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeRelServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeRelServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcSurchargeRel; -import com.ruoyi.price.mapper.PrcSurchargeRelMapper; -import com.ruoyi.price.service.IPrcSurchargeRelService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcSurchargeRel; +import com.bms.price.mapper.PrcSurchargeRelMapper; +import com.bms.price.service.IPrcSurchargeRelService; /** * 附加费与产品/明细关联 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class PrcSurchargeRelServiceImpl implements IPrcSurchargeRelService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeServiceImpl.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeServiceImpl.java index 1be3cf31..98eceeae 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcSurchargeServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcSurchargeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcSurcharge; -import com.ruoyi.price.mapper.PrcSurchargeMapper; -import com.ruoyi.price.mapper.PrcSurchargeRelMapper; -import com.ruoyi.price.service.IPrcSurchargeService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcSurcharge; +import com.bms.price.mapper.PrcSurchargeMapper; +import com.bms.price.mapper.PrcSurchargeRelMapper; +import com.bms.price.service.IPrcSurchargeService; /** * 附加费配置 服务层实现 @@ -19,7 +19,7 @@ import com.ruoyi.price.service.IPrcSurchargeService; * - 编辑 = 原记录作废(ss_code=vd)+ 插入新记录(状态继承),产品关联重指向新记录(保留变更历史) * - 停用 = 原地修改 ss_code=of,不新增数据 * - * @author ruoyi + * @author bms */ @Service public class PrcSurchargeServiceImpl implements IPrcSurchargeService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcWeightServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcWeightServiceImpl.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcWeightServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcWeightServiceImpl.java index 741dc70d..401c409f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcWeightServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcWeightServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcWeightSectionDetail; -import com.ruoyi.price.domain.PrcWeightSectionTemplate; -import com.ruoyi.price.mapper.PrcWeightSectionDetailMapper; -import com.ruoyi.price.mapper.PrcWeightSectionTemplateMapper; -import com.ruoyi.price.service.IPrcWeightService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcWeightSectionDetail; +import com.bms.price.domain.PrcWeightSectionTemplate; +import com.bms.price.mapper.PrcWeightSectionDetailMapper; +import com.bms.price.mapper.PrcWeightSectionTemplateMapper; +import com.bms.price.service.IPrcWeightService; /** * 重量段管理 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class PrcWeightServiceImpl implements IPrcWeightService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcZoneServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcZoneServiceImpl.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcZoneServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcZoneServiceImpl.java index 9e380e9e..7f99b383 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcZoneServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcZoneServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.io.InputStream; import java.util.ArrayList; @@ -22,18 +22,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.domain.PrcZoneDetail; -import com.ruoyi.price.domain.PrcZoneRegion; -import com.ruoyi.price.mapper.PrcZoneDetailMapper; -import com.ruoyi.price.mapper.PrcZoneMapper; -import com.ruoyi.price.service.IPrcZoneService; -import com.ruoyi.price.util.ZoneCodeAbbrevs; -import com.ruoyi.system.domain.BmsRegion; -import com.ruoyi.system.mapper.BmsRegionMapper; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcZone; +import com.bms.price.domain.PrcZoneDetail; +import com.bms.price.domain.PrcZoneRegion; +import com.bms.price.mapper.PrcZoneDetailMapper; +import com.bms.price.mapper.PrcZoneMapper; +import com.bms.price.service.IPrcZoneService; +import com.bms.price.util.ZoneCodeAbbrevs; +import com.bms.system.domain.BmsRegion; +import com.bms.system.mapper.BmsRegionMapper; /** * Zone management: bms_region -> prc_zone -> postcode detail diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/TmsPriceQuoteServiceImpl.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/price/service/impl/TmsPriceQuoteServiceImpl.java index 7659bb3a..1329a6af 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/TmsPriceQuoteServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.service.impl; +package com.bms.price.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -17,50 +17,50 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sign.Md5Utils; -import com.ruoyi.customer.customerinfo.domain.BmsCustomer; -import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper; -import com.ruoyi.price.domain.BmsProduct; -import com.ruoyi.price.domain.BmsProductCountry; -import com.ruoyi.price.domain.PrcCustomerPriceSet; -import com.ruoyi.price.domain.PrcPriceSet; -import com.ruoyi.price.domain.PrcPriceSetDetail; -import com.ruoyi.price.domain.PrcPriceSetVersion; -import com.ruoyi.price.domain.PrcPriceSetVersionSurcharge; -import com.ruoyi.price.domain.PrcQuote; -import com.ruoyi.price.domain.PrcQuoteFee; -import com.ruoyi.price.domain.PrcSurchargeRel; -import com.ruoyi.price.domain.PrcZone; -import com.ruoyi.price.mapper.PrcZoneDetailMapper; -import com.ruoyi.price.domain.vo.TmsPriceBillRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteFeeLine; -import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest; -import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; -import com.ruoyi.price.enums.BillCustomerActiveStatus; -import com.ruoyi.price.mapper.BmsProductCountryMapper; -import com.ruoyi.price.mapper.BmsProductMapper; -import com.ruoyi.price.mapper.PrcCustomerPriceSetMapper; -import com.ruoyi.price.mapper.PrcPriceSetDetailMapper; -import com.ruoyi.price.mapper.PrcPriceSetMapper; -import com.ruoyi.price.mapper.PrcPriceSetVersionMapper; -import com.ruoyi.price.mapper.PrcPriceSetVersionSurchargeMapper; -import com.ruoyi.price.mapper.PrcQuoteFeeMapper; -import com.ruoyi.price.mapper.PrcQuoteMapper; -import com.ruoyi.price.mapper.PrcSurchargeRelMapper; -import com.ruoyi.price.search.EsBizLogSupport; -import com.ruoyi.price.search.EsLogType; -import com.ruoyi.price.search.IBillSearchStore; -import com.ruoyi.price.service.ITmsPriceQuoteService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.MessageUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.sign.Md5Utils; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; +import com.bms.price.domain.BmsProduct; +import com.bms.price.domain.BmsProductCountry; +import com.bms.price.domain.PrcCustomerPriceSet; +import com.bms.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetVersion; +import com.bms.price.domain.PrcPriceSetVersionSurcharge; +import com.bms.price.domain.PrcQuote; +import com.bms.price.domain.PrcQuoteFee; +import com.bms.price.domain.PrcSurchargeRel; +import com.bms.price.domain.PrcZone; +import com.bms.price.mapper.PrcZoneDetailMapper; +import com.bms.price.domain.vo.TmsPriceBillRequest; +import com.bms.price.domain.vo.TmsPriceQuoteFeeLine; +import com.bms.price.domain.vo.TmsPriceQuoteRequest; +import com.bms.price.domain.vo.TmsPriceQuoteResult; +import com.bms.price.enums.BillCustomerActiveStatus; +import com.bms.price.mapper.BmsProductCountryMapper; +import com.bms.price.mapper.BmsProductMapper; +import com.bms.price.mapper.PrcCustomerPriceSetMapper; +import com.bms.price.mapper.PrcPriceSetDetailMapper; +import com.bms.price.mapper.PrcPriceSetMapper; +import com.bms.price.mapper.PrcPriceSetVersionMapper; +import com.bms.price.mapper.PrcPriceSetVersionSurchargeMapper; +import com.bms.price.mapper.PrcQuoteFeeMapper; +import com.bms.price.mapper.PrcQuoteMapper; +import com.bms.price.mapper.PrcSurchargeRelMapper; +import com.bms.price.search.EsBizLogSupport; +import com.bms.price.search.EsLogType; +import com.bms.price.search.IBillSearchStore; +import com.bms.price.service.ITmsPriceQuoteService; /** * Shared quote/bill calc: bound set + active version by bizDate. * No customer package bind: quote and bill both fail hard (no PRODUCT_DEFAULT). * Bill path: no persist; billing task marked FAILED (abnormal order). * - * @author ruoyi + * @author bms */ @Service public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/BmsStatusRefreshTask.java b/bms-back/bms-system/src/main/java/com/bms/price/task/BmsStatusRefreshTask.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/BmsStatusRefreshTask.java rename to bms-back/bms-system/src/main/java/com/bms/price/task/BmsStatusRefreshTask.java index 82d8d668..24952a65 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/BmsStatusRefreshTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/BmsStatusRefreshTask.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.task; +package com.bms.price.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,7 +7,7 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.ruoyi.price.service.IPrcPriceSetService; +import com.bms.price.service.IPrcPriceSetService; /** * Refresh prc_price_set_version status (draft/pending/effect/expired). diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcCreditArrearsClearAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcCreditArrearsClearAsyncRunner.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcCreditArrearsClearAsyncRunner.java rename to bms-back/bms-system/src/main/java/com/bms/price/task/PrcCreditArrearsClearAsyncRunner.java index cf9c7d09..4bf0e3e9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcCreditArrearsClearAsyncRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcCreditArrearsClearAsyncRunner.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.task; +package com.bms.price.task; import java.math.BigDecimal; import java.util.List; @@ -9,13 +9,13 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcOrderBill; -import com.ruoyi.price.enums.BillCreditArrearsStatus; -import com.ruoyi.price.mapper.PrcOrderBillMapper; -import com.ruoyi.price.search.EsBizLogSupport; -import com.ruoyi.price.search.EsLogType; -import com.ruoyi.price.search.IBillSearchStore; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcOrderBill; +import com.bms.price.enums.BillCreditArrearsStatus; +import com.bms.price.mapper.PrcOrderBillMapper; +import com.bms.price.search.EsBizLogSupport; +import com.bms.price.search.EsLogType; +import com.bms.price.search.IBillSearchStore; /** * 异步清除订单额度欠费状态(余额充值等审核入账后)。 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcPriceSetSaveAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcPriceSetSaveAsyncRunner.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcPriceSetSaveAsyncRunner.java rename to bms-back/bms-system/src/main/java/com/bms/price/task/PrcPriceSetSaveAsyncRunner.java index 6a8dfa8c..5bc75eaf 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/task/PrcPriceSetSaveAsyncRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/PrcPriceSetSaveAsyncRunner.java @@ -1,4 +1,4 @@ -package com.ruoyi.price.task; +package com.bms.price.task; import java.util.List; import java.util.concurrent.TimeUnit; @@ -7,12 +7,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.price.domain.PrcPriceSet; -import com.ruoyi.price.domain.PrcPriceSetDetail; -import com.ruoyi.price.domain.PrcPriceSetSaveTask; -import com.ruoyi.price.service.IPrcPriceSetService; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcPriceSet; +import com.bms.price.domain.PrcPriceSetDetail; +import com.bms.price.domain.PrcPriceSetSaveTask; +import com.bms.price.service.IPrcPriceSetService; /** * Async runner for price-set save (avoids HTTP timeout on large detail snapshots). diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/util/ZoneCodeAbbrevs.java b/bms-back/bms-system/src/main/java/com/bms/price/util/ZoneCodeAbbrevs.java similarity index 98% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/price/util/ZoneCodeAbbrevs.java rename to bms-back/bms-system/src/main/java/com/bms/price/util/ZoneCodeAbbrevs.java index a3ab48a1..bc1e68d9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/util/ZoneCodeAbbrevs.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/util/ZoneCodeAbbrevs.java @@ -1,9 +1,9 @@ -package com.ruoyi.price.util; +package com.bms.price.util; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * Parse Excel country cell with optional zone suffix, map labels to English abbreviations. diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRate.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRate.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRate.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRate.java index fdbfca70..743951e7 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRate.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRate.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 汇率管理 sys_exchange_rate * * 汇率定义:1 单位源币种(from_currency) = exchange_rate 单位目标币种(to_currency) * - * @author ruoyi + * @author bms */ public class BmsExchangeRate extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRateConvertResult.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRateConvertResult.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRateConvertResult.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRateConvertResult.java index 561dfbf6..7fc7b41e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsExchangeRateConvertResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsExchangeRateConvertResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import java.io.Serializable; import java.math.BigDecimal; @@ -6,7 +6,7 @@ import java.math.BigDecimal; /** * 汇率换算结果 * - * @author ruoyi + * @author bms */ public class BmsExchangeRateConvertResult implements Serializable { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegion.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegion.java index a57037bb..158db49b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegion.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 国家/区域 bms_region * - * @author ruoyi + * @author bms */ public class BmsRegion extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegionSyncLog.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegionSyncLog.java index bcefc046..d8b3ed1a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/BmsRegionSyncLog.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.core.domain.BaseEntity; /** * 区域数据同步日志 bms_region_sync_log * - * @author ruoyi + * @author bms */ public class BmsRegionSyncLog extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysCache.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysCache.java index 83f0703a..18bfa897 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysCache.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 缓存信息 * - * @author ruoyi + * @author bms */ public class SysCache { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysConfig.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysConfig.java index cae07be7..a5e23732 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author bms */ public class SysConfig extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysLogininfor.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysLogininfor.java index 7fdea307..b5e4948a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysLogininfor.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author bms */ public class SysLogininfor extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysNotice.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysNotice.java index 83e021ce..ab1418ad 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysNotice.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.xss.Xss; +import com.bms.common.core.domain.BaseEntity; +import com.bms.common.xss.Xss; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author bms */ public class SysNotice extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNoticeRead.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysNoticeRead.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNoticeRead.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysNoticeRead.java index 6ebf88cd..83a0ac3b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNoticeRead.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysNoticeRead.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 公告已读记录表 sys_notice_read * - * @author ruoyi + * @author bms */ public class SysNoticeRead { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysOperLog.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysOperLog.java index f6761df1..704e509e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysOperLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author bms */ public class SysOperLog extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysPost.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysPost.java index 62dbd478..449c28ca 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysPost.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bms.common.annotation.Excel; +import com.bms.common.annotation.Excel.ColumnType; +import com.bms.common.core.domain.BaseEntity; /** * 岗位表 sys_post * - * @author ruoyi + * @author bms */ public class SysPost extends BaseEntity { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleDept.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleDept.java index 47b21bf7..9ae6af7d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author bms */ public class SysRoleDept { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleMenu.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleMenu.java index de10a747..b8e78fd3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author bms */ public class SysRoleMenu { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserOnline.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserOnline.java index 2bbd3188..5b4012a8 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; /** * 当前在线会话 * - * @author ruoyi + * @author bms */ public class SysUserOnline { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserPost.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserPost.java index 6e8c416f..5d0d063d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author ruoyi + * @author bms */ public class SysUserPost { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserRole.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserRole.java index 4d158101..eeb045a6 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bms.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author bms */ public class SysUserRole { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/vo/MetaVo.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/vo/MetaVo.java index a5d5fdcc..2a4732a5 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/vo/MetaVo.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain.vo; +package com.bms.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.bms.common.utils.StringUtils; /** * 路由显示信息 * - * @author ruoyi + * @author bms */ public class MetaVo { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/bms-back/bms-system/src/main/java/com/bms/system/domain/vo/RouterVo.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to bms-back/bms-system/src/main/java/com/bms/system/domain/vo/RouterVo.java index afff8c9c..18557fee 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.bms.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author bms */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsExchangeRateMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsExchangeRateMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsExchangeRateMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsExchangeRateMapper.java index 43f5bc47..a24093bf 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsExchangeRateMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsExchangeRateMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.BmsExchangeRate; +import com.bms.system.domain.BmsExchangeRate; /** * 汇率管理 Mapper * - * @author ruoyi + * @author bms */ public interface BmsExchangeRateMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionMapper.java index b4f886bd..9eebc299 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.BmsRegion; +import com.bms.system.domain.BmsRegion; /** * 国家/区域 数据层 * - * @author ruoyi + * @author bms */ public interface BmsRegionMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionSyncLogMapper.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionSyncLogMapper.java index 625e7234..24227d04 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/BmsRegionSyncLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.BmsRegionSyncLog; +import com.bms.system.domain.BmsRegionSyncLog; /** * 区域数据同步日志 数据层 * - * @author ruoyi + * @author bms */ public interface BmsRegionSyncLogMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysConfigMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysConfigMapper.java index 13d49d6f..e0782acd 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysConfigMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.bms.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author bms */ public interface SysConfigMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDeptMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDeptMapper.java index 978c9c19..406fe9e4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDeptMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.entity.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author bms */ public interface SysDeptMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictDataMapper.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictDataMapper.java index a341f1e3..545b45cf 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictDataMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.bms.common.core.domain.entity.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author bms */ public interface SysDictDataMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictTypeMapper.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictTypeMapper.java index 5fb48fb6..5e06a9cb 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysDictTypeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.bms.common.core.domain.entity.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author bms */ public interface SysDictTypeMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysLogininforMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysLogininforMapper.java index 629866f5..8153e600 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysLogininforMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.bms.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author bms */ public interface SysLogininforMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysMenuMapper.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysMenuMapper.java index 750555da..e089cf03 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.bms.common.core.domain.entity.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author bms */ public interface SysMenuMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeMapper.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeMapper.java index c34f0a27..9c834e5c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.bms.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author bms */ public interface SysNoticeMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeReadMapper.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeReadMapper.java index 529b8e14..c7ac0add 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysNoticeReadMapper.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.domain.SysNoticeRead; +import com.bms.system.domain.SysNotice; +import com.bms.system.domain.SysNoticeRead; /** * 公告已读记录 数据层 * - * @author ruoyi + * @author bms */ public interface SysNoticeReadMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysOperLogMapper.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysOperLogMapper.java index 2ae6457f..aa74a7c4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysOperLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.bms.system.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author bms */ public interface SysOperLogMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysPostMapper.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysPostMapper.java index 19be2274..092a581c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.bms.system.domain.SysPost; /** * 岗位信息 数据层 * - * @author ruoyi + * @author bms */ public interface SysPostMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleDeptMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleDeptMapper.java index f9d3a2f3..85e60351 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleDeptMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.bms.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author bms */ public interface SysRoleDeptMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMapper.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMapper.java index cf2bd8c6..b2ad3cd4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author bms */ public interface SysRoleMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMenuMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMenuMapper.java index 6602bee1..a351d4ba 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysRoleMenuMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.bms.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author bms */ public interface SysRoleMenuMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserMapper.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserMapper.java index 98d9f7b2..358028d6 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.entity.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author bms */ public interface SysUserMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserPostMapper.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserPostMapper.java index 2a6a720e..69cca02c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.bms.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 * - * @author ruoyi + * @author bms */ public interface SysUserPostMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserRoleMapper.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserRoleMapper.java index 3143ec82..9556bb9a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/mapper/SysUserRoleMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.bms.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.bms.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author bms */ public interface SysUserRoleMapper { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsExchangeRateService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsExchangeRateService.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsExchangeRateService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/IBmsExchangeRateService.java index ba721653..6e7f1eed 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsExchangeRateService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsExchangeRateService.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.BmsExchangeRate; -import com.ruoyi.system.domain.BmsExchangeRateConvertResult; +import com.bms.system.domain.BmsExchangeRate; +import com.bms.system.domain.BmsExchangeRateConvertResult; /** * 汇率管理 Service * - * @author ruoyi + * @author bms */ public interface IBmsExchangeRateService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionService.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionService.java index 05390d7b..0c65f668 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.BmsRegion; +import com.bms.system.domain.BmsRegion; /** * 国家/区域 服务层 * - * @author ruoyi + * @author bms */ public interface IBmsRegionService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionSyncService.java similarity index 80% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionSyncService.java index ff9e5dc4..507f4d2e 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/IBmsRegionSyncService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.bms.system.service; /** * 区域数据同步 服务层 * - * @author ruoyi + * @author bms */ public interface IBmsRegionSyncService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysConfigService.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysConfigService.java index b3077760..abb1bda2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysConfigService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.bms.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author bms */ public interface ISysConfigService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDeptService.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysDeptService.java index 7f168437..756b9840 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDeptService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.TreeSelect; +import com.bms.common.core.domain.entity.SysDept; /** * 部门管理 服务层 * - * @author ruoyi + * @author bms */ public interface ISysDeptService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictDataService.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictDataService.java index 9bc4f13b..547a417d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictDataService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.bms.common.core.domain.entity.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author bms */ public interface ISysDictDataService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictTypeService.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictTypeService.java index ca67b1a1..b073c9a9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysDictTypeService.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; import java.util.Map; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.bms.common.core.domain.entity.SysDictData; +import com.bms.common.core.domain.entity.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author bms */ public interface ISysDictTypeService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysLogininforService.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysLogininforService.java index ce3151d3..7c03a601 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysLogininforService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.bms.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author bms */ public interface ISysLogininforService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysMenuService.java similarity index 94% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysMenuService.java index aa3a564d..9102b28f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysMenuService.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; +import com.bms.common.core.domain.TreeSelect; +import com.bms.common.core.domain.entity.SysMenu; +import com.bms.system.domain.vo.RouterVo; /** * 菜单 业务层 * - * @author ruoyi + * @author bms */ public interface ISysMenuService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeReadService.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeReadService.java index 56e958a3..2eb4c744 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeReadService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; import java.util.Map; -import com.ruoyi.system.domain.SysNotice; +import com.bms.system.domain.SysNotice; /** * 公告已读记录 服务层 * - * @author ruoyi + * @author bms */ public interface ISysNoticeReadService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeService.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeService.java index 2bb2c658..02593574 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysNoticeService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.bms.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author bms */ public interface ISysNoticeService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysOperLogService.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysOperLogService.java index 4fd8e5a8..57e95d6b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysOperLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.bms.system.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author bms */ public interface ISysOperLogService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysPostService.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysPostService.java index 84779bf8..8a1c19d2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysPostService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.bms.system.domain.SysPost; /** * 岗位信息 服务层 * - * @author ruoyi + * @author bms */ public interface ISysPostService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysRoleService.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysRoleService.java index 9185cce1..fd16dd77 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysRoleService.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.system.domain.SysUserRole; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.system.domain.SysUserRole; /** * 角色业务层 * - * @author ruoyi + * @author bms */ public interface ISysRoleService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserOnlineService.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserOnlineService.java index 8eb5448c..dfdf8181 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserOnlineService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bms.system.service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author bms */ public interface ISysUserOnlineService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserService.java similarity index 97% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserService.java index 75301e5c..cbcaec37 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/ISysUserService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.bms.system.service; import java.util.Date; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.bms.common.core.domain.entity.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author bms */ public interface ISysUserService { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsExchangeRateServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsExchangeRateServiceImpl.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsExchangeRateServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsExchangeRateServiceImpl.java index 6c473ad0..c71b0080 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsExchangeRateServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsExchangeRateServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,18 +6,18 @@ import java.util.Date; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.BmsExchangeRate; -import com.ruoyi.system.domain.BmsExchangeRateConvertResult; -import com.ruoyi.system.mapper.BmsExchangeRateMapper; -import com.ruoyi.system.service.IBmsExchangeRateService; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.DateUtils; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.BmsExchangeRate; +import com.bms.system.domain.BmsExchangeRateConvertResult; +import com.bms.system.mapper.BmsExchangeRateMapper; +import com.bms.system.service.IBmsExchangeRateService; /** * 汇率管理 Service实现 * - * @author ruoyi + * @author bms */ @Service public class BmsExchangeRateServiceImpl implements IBmsExchangeRateService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionServiceImpl.java similarity index 87% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionServiceImpl.java index aab57564..3c5f906a 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.BmsRegion; -import com.ruoyi.system.mapper.BmsRegionMapper; -import com.ruoyi.system.service.IBmsRegionService; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.BmsRegion; +import com.bms.system.mapper.BmsRegionMapper; +import com.bms.system.service.IBmsRegionService; /** * 国家/区域 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class BmsRegionServiceImpl implements IBmsRegionService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionSyncServiceImpl.java similarity index 96% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionSyncServiceImpl.java index ca8c7b3b..dea33e32 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/BmsRegionSyncServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import java.util.Map; @@ -11,18 +11,18 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.BmsRegion; -import com.ruoyi.system.domain.BmsRegionSyncLog; -import com.ruoyi.system.mapper.BmsRegionMapper; -import com.ruoyi.system.mapper.BmsRegionSyncLogMapper; -import com.ruoyi.system.service.IBmsRegionSyncService; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.BmsRegion; +import com.bms.system.domain.BmsRegionSyncLog; +import com.bms.system.mapper.BmsRegionMapper; +import com.bms.system.mapper.BmsRegionSyncLogMapper; +import com.bms.system.service.IBmsRegionSyncService; /** * 区域数据同步 服务层实现 * 通过 jsdelivr + mledoze/countries 同步国家数据(含中文翻译) * - * @author ruoyi + * @author bms */ @Service public class BmsRegionSyncServiceImpl implements IBmsRegionSyncService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysConfigServiceImpl.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysConfigServiceImpl.java index cdfdf423..3d1b0392 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysConfigServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.Collection; import java.util.List; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.bms.common.constant.CacheConstants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.core.text.Convert; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.SysConfig; +import com.bms.system.mapper.SysConfigMapper; +import com.bms.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDeptServiceImpl.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDeptServiceImpl.java index 957a9fa1..6f44cf66 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -7,24 +7,24 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.bms.common.annotation.DataScope; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.TreeSelect; +import com.bms.common.core.domain.entity.SysDept; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.text.Convert; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.system.mapper.SysDeptMapper; +import com.bms.system.mapper.SysRoleMapper; +import com.bms.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author bms */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictDataServiceImpl.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictDataServiceImpl.java index fced5691..4b0a37dd 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.bms.common.core.domain.entity.SysDictData; +import com.bms.common.utils.DictUtils; +import com.bms.system.mapper.SysDictDataMapper; +import com.bms.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictTypeServiceImpl.java similarity index 92% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictTypeServiceImpl.java index 0abaca34..aaf6ee90 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.Comparator; import java.util.HashMap; @@ -9,20 +9,20 @@ import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysDictData; +import com.bms.common.core.domain.entity.SysDictType; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.DictUtils; +import com.bms.common.utils.StringUtils; +import com.bms.system.mapper.SysDictDataMapper; +import com.bms.system.mapper.SysDictTypeMapper; +import com.bms.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysLogininforServiceImpl.java similarity index 86% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysLogininforServiceImpl.java index 216aecb2..4b0ff0e2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.bms.system.domain.SysLogininfor; +import com.bms.system.mapper.SysLogininforMapper; +import com.bms.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysMenuServiceImpl.java index 131861ac..721019ad 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -13,26 +13,26 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.bms.common.constant.Constants; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.TreeSelect; +import com.bms.common.core.domain.entity.SysMenu; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.text.Convert; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.vo.MetaVo; +import com.bms.system.domain.vo.RouterVo; +import com.bms.system.mapper.SysMenuMapper; +import com.bms.system.mapper.SysRoleMapper; +import com.bms.system.mapper.SysRoleMenuMapper; +import com.bms.system.service.ISysMenuService; /** * 菜单 业务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeReadServiceImpl.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeReadServiceImpl.java index f8e63a65..b06412df 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeReadServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.domain.SysNoticeRead; -import com.ruoyi.system.mapper.SysNoticeReadMapper; -import com.ruoyi.system.service.ISysNoticeReadService; +import com.bms.system.domain.SysNotice; +import com.bms.system.domain.SysNoticeRead; +import com.bms.system.mapper.SysNoticeReadMapper; +import com.bms.system.service.ISysNoticeReadService; /** * 公告已读记录 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class SysNoticeReadServiceImpl implements ISysNoticeReadService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeServiceImpl.java index 765438b8..07b6f214 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysNoticeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.bms.system.domain.SysNotice; +import com.bms.system.mapper.SysNoticeMapper; +import com.bms.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author bms */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysOperLogServiceImpl.java similarity index 88% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysOperLogServiceImpl.java index 54898152..f10bb4b2 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysOperLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.bms.system.domain.SysOperLog; +import com.bms.system.mapper.SysOperLogMapper; +import com.bms.system.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysPostServiceImpl.java similarity index 91% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysPostServiceImpl.java index 5e5fe06f..b5324c08 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysPostServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.bms.common.constant.UserConstants; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.SysPost; +import com.bms.system.mapper.SysPostMapper; +import com.bms.system.mapper.SysUserPostMapper; +import com.bms.system.service.ISysPostService; /** * 岗位信息 服务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysRoleServiceImpl.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysRoleServiceImpl.java index 89a84f6d..0df4d197 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,26 +8,26 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.bms.common.annotation.DataScope; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.system.domain.SysRoleDept; +import com.bms.system.domain.SysRoleMenu; +import com.bms.system.domain.SysUserRole; +import com.bms.system.mapper.SysRoleDeptMapper; +import com.bms.system.mapper.SysRoleMapper; +import com.bms.system.mapper.SysRoleMenuMapper; +import com.bms.system.mapper.SysUserRoleMapper; +import com.bms.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserOnlineServiceImpl.java index f80a8771..87d09d30 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bms.common.core.domain.model.LoginUser; +import com.bms.common.utils.StringUtils; +import com.bms.system.domain.SysUserOnline; +import com.bms.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserServiceImpl.java index dad79a14..b28a579f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bms.system.service.impl; import java.util.ArrayList; import java.util.Date; @@ -11,31 +11,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanValidators; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysUserService; +import com.bms.common.annotation.DataScope; +import com.bms.common.constant.UserConstants; +import com.bms.common.core.domain.entity.SysRole; +import com.bms.common.core.domain.entity.SysUser; +import com.bms.common.exception.ServiceException; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; +import com.bms.common.utils.bean.BeanValidators; +import com.bms.common.utils.spring.SpringUtils; +import com.bms.system.domain.SysPost; +import com.bms.system.domain.SysUserPost; +import com.bms.system.domain.SysUserRole; +import com.bms.system.mapper.SysPostMapper; +import com.bms.system.mapper.SysRoleMapper; +import com.bms.system.mapper.SysUserMapper; +import com.bms.system.mapper.SysUserPostMapper; +import com.bms.system.mapper.SysUserRoleMapper; +import com.bms.system.service.ISysConfigService; +import com.bms.system.service.ISysDeptService; +import com.bms.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author bms */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml index c84ad7aa..6aff9eda 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml similarity index 97% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml index 96c2ae6c..0007fee8 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml index f1daee1c..ee78100f 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml index e0743705..bb27940a 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillExportMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillExportMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml index 19d5ff4d..121e8a06 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillExportMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml index e1292f63..a7e7d9ab 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillLogMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillLogMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml index fb35c3ef..a38a271d 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillLogMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml index 5b643707..bb4daae6 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml @@ -2,7 +2,7 @@ - + @@ -65,7 +65,7 @@ from ar_bill - and (generation_status is null or generation_status = 'READY') diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml similarity index 96% rename from bms-back/ruoyi-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml index a627afb6..457d012a 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml similarity index 96% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml index 16e8c459..399a23db 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml @@ -2,7 +2,7 @@ - + @@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = '0' - + @@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select attachment_id, customer_id, biz_type, file_name, file_path, file_size, file_type, file_extension, attachment_type, biz_id, is_logo, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_attachment - and customer_id = #{customerId} @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by sort_order asc - + insert into ctr_customer_attachment customer_id, @@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ctr_customer_attachment customer_id = #{customerId}, @@ -346,7 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -390,7 +390,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select company_id, customer_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_company - and customer_id = #{customerId} @@ -408,7 +408,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where company_id = #{companyId} and del_flag = '0' - + insert into ctr_customer_company customer_id, @@ -484,7 +484,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ctr_customer_company customer_id = #{customerId}, @@ -533,7 +533,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -565,7 +565,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select contact_id, customer_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_contact - and customer_id = #{customerId} @@ -582,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where contact_id = #{contactId} and del_flag = '0' - + insert into ctr_customer_contact customer_id, @@ -634,7 +634,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ctr_customer_contact customer_id = #{customerId}, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml similarity index 90% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml index 32898fe2..26d7219b 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit 1 - insert into prc_customer_price_set ( price_set_id, customer_id, customer_code, customer_name, @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update prc_customer_price_set set price_set_id = #{priceSetId}, customer_code = #{customerCode}, @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + insert into sup_supplier_attachment supplier_id, @@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sup_supplier_attachment supplier_id = #{supplierId}, @@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -330,7 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select company_id, supplier_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_company - and supplier_id = #{supplierId} @@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where company_id = #{companyId} and del_flag = '0' - + insert into sup_supplier_company supplier_id, @@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sup_supplier_company supplier_id = #{supplierId}, @@ -473,7 +473,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -505,7 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select contact_id, supplier_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_contact - and supplier_id = #{supplierId} @@ -523,7 +523,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where contact_id = #{contactId} and del_flag = '0' - + insert into sup_supplier_contact supplier_id, @@ -575,7 +575,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sup_supplier_contact supplier_id = #{supplierId}, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml similarity index 88% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml index 661b204d..ccd4e640 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml @@ -2,11 +2,11 @@ - + - select r.role_id as roleId, r.role_name as roleName, r.role_key as roleKey, @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_role_credit_quota (role_id, total_quota, version, create_by, create_time, remark) values (#{roleId}, #{totalQuota}, 0, #{createBy}, sysdate(), #{remark}) on duplicate key update total_quota = values(total_quota), @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = now() - + update sys_role_credit_quota set total_quota = #{totalQuota}, version = version + 1, @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ctr_customer_credit_grant ( customer_id, account_id, role_id, approve_user_id, apply_id, flow_id, @@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + parameterType="com.bms.customer.customermoney.domain.CustomerCreditGrant"> update ctr_customer_credit_grant set remaining = #{remaining}, status = #{status}, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml similarity index 91% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml index c572713c..ee96e770 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ctr_customer_credit_apply ( apply_no, customer_id, credit_type, adjust_mode, change_amount, @@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + parameterType="com.bms.customer.customermoney.domain.CustomerCreditApply"> update ctr_customer_credit_apply set status = 'APPROVED', account_id = #{accountId}, @@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + parameterType="com.bms.customer.customermoney.domain.CustomerCreditApply"> update ctr_customer_credit_apply set status = 'REJECTED', approve_by = #{approveBy}, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml similarity index 95% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml index 88f606cf..66769861 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml @@ -2,10 +2,10 @@ - + - + @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - insert into ctr_customer_account @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ctr_customer_credit_flow - - insert into ctr_customer_credit_flow @@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -280,7 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ctr_customer_receipt r - - insert into ctr_customer_receipt @@ -373,7 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ctr_customer_receipt set status = 'CONFIRMED', confirmed_at = #{confirmedAt}, @@ -393,7 +393,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -427,7 +427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ctr_customer_balance_flow - - insert into ctr_customer_balance_flow diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml similarity index 93% rename from bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml index b21f2466..b793af55 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml b/bms-back/bms-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml index 1063087b..76b219ac 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/data/BmsExchangeRateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionMapper.xml b/bms-back/bms-system/src/main/resources/mapper/data/BmsRegionMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/data/BmsRegionMapper.xml index a68a7ad5..fccfc5be 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/data/BmsRegionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml b/bms-back/bms-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml index 7505fe7b..9ce93a7d 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/data/BmsRegionSyncLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml index 654f6a0a..3f641671 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/BmsProductMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/BmsProductMapper.xml index 5aec79ee..2f8bde78 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/BmsProductMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml similarity index 95% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml index e7b6bba9..dc8cd5f4 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml similarity index 97% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml index 0a2396e5..5ba00782 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml index a006f92e..6902c4b6 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPayBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml index 2e520e4f..e205448f 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml index 2a95edda..c6670646 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml index bfb5efe0..d4c0da0f 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml index bd25b3fd..65acb22e 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionSurchargeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml similarity index 97% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml index 485e4769..bc72a6f1 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteMapper.xml index 3bf96283..f0000cae 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcQuoteMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml index 17f6d3fd..4fa82926 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml index 5cc4ba21..09666969 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeRelMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml index ff538977..50ab8ca8 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionDetailMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml index e7173915..ce61541a 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcWeightSectionTemplateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml similarity index 96% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml index 8885ebc8..dfc24ae5 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcZoneDetailMapper.xml @@ -2,7 +2,7 @@ - + @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where z.region_id = #{regionId} - select z.zone_id as zoneId, z.region_id as regionId, z.country_code as countryCode, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcZoneMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/price/PrcZoneMapper.xml index 51c5d6a6..0ba5eb48 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcZoneMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcZoneMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysConfigMapper.xml index a5ff114a..efabad9b 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysDeptMapper.xml index aa6a10f7..3d3e292b 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 3b94b7fb..8571a9a0 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 438d4845..0137188b 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 97% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 822d6658..e00ec2a8 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysMenuMapper.xml index 03412922..9369d0bf 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 1fccd780..110ca07e 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml index 86e5136d..babd9f8c 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 201db079..4b1dbbc7 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c4595..2e87f2d8 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 94% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139bc..2b4af367 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysRoleMapper.xml index 955d4eeb..5b8da99e 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 94% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a852..4bb404f0 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysUserMapper.xml index 0ebf9763..a2302cd7 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 94% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc40..833af5f8 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/bms-back/bms-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd726891..67be2759 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bms-back/ruoyi-system/src/main/resources/templates/ar/ar_bill_template.xlsx b/bms-back/bms-system/src/main/resources/templates/ar/ar_bill_template.xlsx similarity index 100% rename from bms-back/ruoyi-system/src/main/resources/templates/ar/ar_bill_template.xlsx rename to bms-back/bms-system/src/main/resources/templates/ar/ar_bill_template.xlsx diff --git a/bms-back/ry.bat b/bms-back/bms.bat similarity index 73% rename from bms-back/ry.bat rename to bms-back/bms.bat index ac1e4373..9dbf8fa8 100644 --- a/bms-back/ry.bat +++ b/bms-back/bms.bat @@ -1,21 +1,21 @@ @echo off -rem jarƽ¼¶Ŀ¼ -set AppName=ruoyi-admin.jar +rem jarƽ��Ŀ¼ +set AppName=bms-admin.jar -rem JVM²ÎÊý +rem JVM���� set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" ECHO. - ECHO. [1] Æô¶¯%AppName% - ECHO. [2] ¹رÕ%AppName% - ECHO. [3] ÖØÆô%AppName% - ECHO. [4] Æô¶¯״̬ %AppName% - ECHO. [5] ÍË ³ö + ECHO. [1] ����%AppName% + ECHO. [2] �ر�%AppName% + ECHO. [3] ����%AppName% + ECHO. [4] ����״̬ %AppName% + ECHO. [5] �� �� ECHO. -ECHO.ÇëÊäÈëѡÔñÏîĿµÄÐòºÅ: +ECHO.������ѡ����Ŀ�����: set /p ID= IF "%id%"=="1" GOTO start IF "%id%"=="2" GOTO stop @@ -35,11 +35,11 @@ PAUSE start javaw %JVM_OPTS% -jar %AppName% -echo starting¡­¡­ +echo starting���� echo Start %AppName% success... goto:eof -rem º¯Êýstopͨ¹ýjpsÃüÁî²éÕÒpid²¢½áÊø½ø³Ì +rem ����stopͨ��jps�������pid���������� :stop for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( set pid=%%a @@ -48,7 +48,7 @@ rem if not defined pid (echo process %AppName% does not exists) else ( echo prepare to kill %image_name% echo start kill %pid% ... - rem ¸ù¾ݽø³ÌID£¬kill½ø³Ì + rem ���ݽ���ID��kill���� taskkill /f /pid %pid% ) goto:eof diff --git a/bms-back/ry.sh b/bms-back/bms.sh similarity index 98% rename from bms-back/ry.sh rename to bms-back/bms.sh index 8824e133..5d725012 100644 --- a/bms-back/ry.sh +++ b/bms-back/bms.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=ruoyi-admin.jar +AppName=bms-admin.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" diff --git a/bms-back/pom.xml b/bms-back/pom.xml index b3fe15ea..beb1efad 100644 --- a/bms-back/pom.xml +++ b/bms-back/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.bms + bms 3.9.2 - ruoyi - http://www.ruoyi.vip - 若依管理系统 + bms + http://git.lionquexpress.com/wuweihua/BMS.git + BMS 管理系统 - 3.9.2 + 3.9.2 UTF-8 UTF-8 17 @@ -137,49 +137,49 @@ - com.ruoyi - ruoyi-quartz - ${ruoyi.version} + com.bms + bms-quartz + ${bms.version} - com.ruoyi - ruoyi-generator - ${ruoyi.version} + com.bms + bms-generator + ${bms.version} - com.ruoyi - ruoyi-framework - ${ruoyi.version} + com.bms + bms-framework + ${bms.version} - com.ruoyi - ruoyi-system - ${ruoyi.version} + com.bms + bms-system + ${bms.version} - com.ruoyi - ruoyi-common - ${ruoyi.version} + com.bms + bms-common + ${bms.version} - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common + bms-admin + bms-framework + bms-system + bms-quartz + bms-generator + bms-common pom diff --git a/bms-back/sql/customer+supplier/sys_job_oracle_customer_sync.sql b/bms-back/sql/customer+supplier/sys_job_oracle_customer_sync.sql index fae10b02..efb108c2 100644 --- a/bms-back/sql/customer+supplier/sys_job_oracle_customer_sync.sql +++ b/bms-back/sql/customer+supplier/sys_job_oracle_customer_sync.sql @@ -1,6 +1,6 @@ -- ---------------------------- -- 定时任务:老系统 Oracle TAB_CUSTOMER -> ctr_customer 客户资料每日同步 --- 调用目标对应 Bean:com.ruoyi.customer.customerinfo.task.CustomerSyncTask#syncFromOracle +-- 调用目标对应 Bean:com.bms.customer.customerinfo.task.CustomerSyncTask#syncFromOracle -- cron 0 0 0 * * ? = 每天 00:00:00;concurrent=1 禁止并发;misfire=3 放弃错过的执行 -- 幂等:按 customer_code 新增/更新,可重复执行 -- ---------------------------- diff --git a/bms-front/.github/FUNDING.yml b/bms-front/.github/FUNDING.yml index fbcab775..8c492033 100644 --- a/bms-front/.github/FUNDING.yml +++ b/bms-front/.github/FUNDING.yml @@ -1 +1 @@ -custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html +# BMS 暂未配置外部赞助链接。 diff --git a/bms-front/README.md b/bms-front/README.md index 1d5b66de..b8ac9228 100644 --- a/bms-front/README.md +++ b/bms-front/README.md @@ -3,32 +3,12 @@

    BMS

    基于SpringBoot+Vue3前后端分离的Java快速开发框架

    -

    - - - -

    +

    BMS 前端应用

    ## 平台简介 * 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 -* 配套后端代码仓库地址[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) 或 [RuoYi-Vue-fast](https://gitcode.com/yangzongzhuan/RuoYi-Vue-fast) 版本。 -* 阿里云折扣场:[点我进入](http://aly.ruoyi.vip),腾讯云秒杀场:[点我进入](http://txy.ruoyi.vip)   - -# 版本对比 - -RuoYi-Vue 前端项目的三个主要演进版本,方便你直观对比其技术栈差异(并行开发维护)。 - -| 项目名称 | **RuoYi-Vue2** | **RuoYi-Vue3** | **RuoYi-Vue3-TypeScript** | -| :--- | :--- | :--- | :--- | -| **前端框架** | Vue 2 | Vue 3 | Vue 3 | -| **脚本语言** | JavaScript | JavaScript | TypeScript | -| **构建工具** | Vue CLI | Vite | Vite | -| **UI 组件库** | Element UI | Element Plus | Element Plus | -| **状态管理** | Vuex | Pinia | Pinia | -| **路由管理** | Vue Router 3 | Vue Router 4 | Vue Router 4 | -| **核心特点** | 1. 技术栈经典稳定
    2. 社区资料丰富
    3. 当前维护重心已转移 | 1. 现代前端技术栈
    2. 开发体验与性能更优
    3. 官方主推的活跃版本 | 1. 类型加持,减少沟通成本
    2. 开发时有提示,效率更高
    3. 多人协作企业级开发项目 | -| **仓库地址** | [RuoYi-Vue2](https://gitcode.com/yangzongzhuan/RuoYi-Vue2) | [RuoYi-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Vue3) | [RuoYi-Vue3-TypeScript](https://gitcode.com/yangzongzhuan/RuoYi-Vue3/tree/typescript) | +* 配套后端代码仓库地址:[BMS](http://git.lionquexpress.com/wuweihua/BMS)。 ## 前端运行 diff --git a/bms-front/package.json b/bms-front/package.json index bb1f1ae6..0be3efd5 100644 --- a/bms-front/package.json +++ b/bms-front/package.json @@ -1,8 +1,8 @@ { - "name": "ruoyi", + "name": "bms", "version": "3.9.2", "description": "BMS", - "author": "若依", + "author": "BMS", "license": "MIT", "type": "module", "scripts": { @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "http://git.lionquexpress.com/wuweihua/BMS.git" }, "dependencies": { "@element-plus/icons-vue": "2.3.2", diff --git a/bms-front/src/api/price/set.js b/bms-front/src/api/price/set.js index 71dfefe8..666f2495 100644 --- a/bms-front/src/api/price/set.js +++ b/bms-front/src/api/price/set.js @@ -61,7 +61,7 @@ export async function savePriceSetAsync(data, onProgress) { throw new Error('save timeout') } -/** Accept data.taskId / data string / legacy msg UUID (RuoYi String overload). */ +/** Accept data.taskId / data string / legacy msg UUID (Bms String overload). */ function pickSaveTaskId(res) { if (!res) return null const d = res.data diff --git a/bms-front/src/api/system/user.js b/bms-front/src/api/system/user.js index afc58b32..99f20d50 100644 --- a/bms-front/src/api/system/user.js +++ b/bms-front/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; +import { parseStrEmpty } from "@/utils/bms"; // 查询用户列表 export function listUser(query) { diff --git a/bms-front/src/assets/styles/ruoyi.scss b/bms-front/src/assets/styles/bms.scss similarity index 99% rename from bms-front/src/assets/styles/ruoyi.scss rename to bms-front/src/assets/styles/bms.scss index 40334b3f..c6a914bb 100644 --- a/bms-front/src/assets/styles/ruoyi.scss +++ b/bms-front/src/assets/styles/bms.scss @@ -1,6 +1,6 @@ /** * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi + * Copyright (c) 2019 bms */ /** 基础通用 **/ diff --git a/bms-front/src/assets/styles/index.scss b/bms-front/src/assets/styles/index.scss index 87898e62..cd0fe5d1 100644 --- a/bms-front/src/assets/styles/index.scss +++ b/bms-front/src/assets/styles/index.scss @@ -3,7 +3,7 @@ @use './element-ui.scss'; @use './sidebar.scss'; @use './btn.scss'; -@use './ruoyi.scss'; +@use './bms.scss'; body { height: 100%; diff --git a/bms-front/src/components/RuoYi/Doc/index.vue b/bms-front/src/components/Bms/Doc/index.vue similarity index 65% rename from bms-front/src/components/RuoYi/Doc/index.vue rename to bms-front/src/components/Bms/Doc/index.vue index 8355592a..c7554c07 100644 --- a/bms-front/src/components/RuoYi/Doc/index.vue +++ b/bms-front/src/components/Bms/Doc/index.vue @@ -5,9 +5,9 @@ \ No newline at end of file + diff --git a/bms-front/src/components/RuoYi/Git/index.vue b/bms-front/src/components/Bms/Git/index.vue similarity index 72% rename from bms-front/src/components/RuoYi/Git/index.vue rename to bms-front/src/components/Bms/Git/index.vue index 648dde1a..82a20db5 100644 --- a/bms-front/src/components/RuoYi/Git/index.vue +++ b/bms-front/src/components/Bms/Git/index.vue @@ -5,7 +5,7 @@